feat(crm): 添加订单定金相关字段支持
- 在CrmOrder实体类中新增unitPriceRemark、depositPayable、depositPaid、depositRatio字段 - 在CrmOrderBo业务对象中同步添加对应字段以支持查询条件 - 更新CrmOrderMapper.xml映射文件中的结果集和SQL查询语句 - 在CrmOrderServiceImpl服务实现中添加字段的查询条件处理逻辑 - 在CrmOrderVo视图对象中添加Excel导出注解配置 - 实现定金相关的业务查询功能包括应付定金、已付定金、定金比例等字段的检索
This commit is contained in:
@@ -185,6 +185,26 @@ public class CrmOrder extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String productionSchedule;
|
private String productionSchedule;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 算单价备注
|
||||||
|
*/
|
||||||
|
private String unitPriceRemark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应付定金(万元)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositPayable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 已付定金(万元)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositPaid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 定金比例(%)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositRatio;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -200,6 +200,26 @@ public class CrmOrderBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String productionSchedule;
|
private String productionSchedule;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 算单价备注
|
||||||
|
*/
|
||||||
|
private String unitPriceRemark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应付定金(万元)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositPayable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 已付定金(万元)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositPaid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 定金比例(%)
|
||||||
|
*/
|
||||||
|
private BigDecimal depositRatio;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -234,6 +234,30 @@ public class CrmOrderVo extends BaseEntity {
|
|||||||
@ExcelProperty(value = "排产函")
|
@ExcelProperty(value = "排产函")
|
||||||
private String productionSchedule;
|
private String productionSchedule;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 算单价备注
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "算单价备注")
|
||||||
|
private String unitPriceRemark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应付定金(万元)
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "应付定金(万元)")
|
||||||
|
private BigDecimal depositPayable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 已付定金(万元)
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "已付定金(万元)")
|
||||||
|
private BigDecimal depositPaid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 定金比例(%)
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "定金比例(%)")
|
||||||
|
private BigDecimal depositRatio;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -127,6 +127,10 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
|||||||
qw.like(StringUtils.isNotBlank(bo.getTechAnnex()), "co.tech_annex", bo.getTechAnnex());
|
qw.like(StringUtils.isNotBlank(bo.getTechAnnex()), "co.tech_annex", bo.getTechAnnex());
|
||||||
qw.like(StringUtils.isNotBlank(bo.getBusinessAnnex()), "co.business_annex", bo.getBusinessAnnex());
|
qw.like(StringUtils.isNotBlank(bo.getBusinessAnnex()), "co.business_annex", bo.getBusinessAnnex());
|
||||||
qw.like(StringUtils.isNotBlank(bo.getProductionSchedule()), "co.production_schedule", bo.getProductionSchedule());
|
qw.like(StringUtils.isNotBlank(bo.getProductionSchedule()), "co.production_schedule", bo.getProductionSchedule());
|
||||||
|
qw.like(StringUtils.isNotBlank(bo.getUnitPriceRemark()), "co.unit_price_remark", bo.getUnitPriceRemark());
|
||||||
|
qw.eq(bo.getDepositPayable() != null, "co.deposit_payable", bo.getDepositPayable());
|
||||||
|
qw.eq(bo.getDepositPaid() != null, "co.deposit_paid", bo.getDepositPaid());
|
||||||
|
qw.eq(bo.getDepositRatio() != null, "co.deposit_ratio", bo.getDepositRatio());
|
||||||
qw.eq(bo.getStatus() != null, "co.status", bo.getStatus());
|
qw.eq(bo.getStatus() != null, "co.status", bo.getStatus());
|
||||||
qw.eq(bo.getContractId() != null, "co.contract_id", bo.getContractId());
|
qw.eq(bo.getContractId() != null, "co.contract_id", bo.getContractId());
|
||||||
qw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), "co.annex_files", bo.getAnnexFiles());
|
qw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), "co.annex_files", bo.getAnnexFiles());
|
||||||
@@ -183,6 +187,10 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getTechAnnex()), CrmOrder::getTechAnnex, bo.getTechAnnex());
|
lqw.like(StringUtils.isNotBlank(bo.getTechAnnex()), CrmOrder::getTechAnnex, bo.getTechAnnex());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getBusinessAnnex()), CrmOrder::getBusinessAnnex, bo.getBusinessAnnex());
|
lqw.like(StringUtils.isNotBlank(bo.getBusinessAnnex()), CrmOrder::getBusinessAnnex, bo.getBusinessAnnex());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getProductionSchedule()), CrmOrder::getProductionSchedule, bo.getProductionSchedule());
|
lqw.like(StringUtils.isNotBlank(bo.getProductionSchedule()), CrmOrder::getProductionSchedule, bo.getProductionSchedule());
|
||||||
|
lqw.like(StringUtils.isNotBlank(bo.getUnitPriceRemark()), CrmOrder::getUnitPriceRemark, bo.getUnitPriceRemark());
|
||||||
|
lqw.eq(bo.getDepositPayable() != null, CrmOrder::getDepositPayable, bo.getDepositPayable());
|
||||||
|
lqw.eq(bo.getDepositPaid() != null, CrmOrder::getDepositPaid, bo.getDepositPaid());
|
||||||
|
lqw.eq(bo.getDepositRatio() != null, CrmOrder::getDepositRatio, bo.getDepositRatio());
|
||||||
lqw.eq(bo.getStatus() != null, CrmOrder::getStatus, bo.getStatus());
|
lqw.eq(bo.getStatus() != null, CrmOrder::getStatus, bo.getStatus());
|
||||||
lqw.eq(bo.getContractId() != null, CrmOrder::getContractId, bo.getContractId());
|
lqw.eq(bo.getContractId() != null, CrmOrder::getContractId, bo.getContractId());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), CrmOrder::getAnnexFiles, bo.getAnnexFiles());
|
lqw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), CrmOrder::getAnnexFiles, bo.getAnnexFiles());
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="techAnnex" column="tech_annex"/>
|
<result property="techAnnex" column="tech_annex"/>
|
||||||
<result property="businessAnnex" column="business_annex"/>
|
<result property="businessAnnex" column="business_annex"/>
|
||||||
<result property="productionSchedule" column="production_schedule"/>
|
<result property="productionSchedule" column="production_schedule"/>
|
||||||
|
<result property="unitPriceRemark" column="unit_price_remark"/>
|
||||||
|
<result property="depositPayable" column="deposit_payable"/>
|
||||||
|
<result property="depositPaid" column="deposit_paid"/>
|
||||||
|
<result property="depositRatio" column="deposit_ratio"/>
|
||||||
<result property="status" column="status"/>
|
<result property="status" column="status"/>
|
||||||
<result property="contractId" column="contract_id"/>
|
<result property="contractId" column="contract_id"/>
|
||||||
<result property="annexFiles" column="annex_files"/>
|
<result property="annexFiles" column="annex_files"/>
|
||||||
@@ -86,6 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
co.tech_annex AS techAnnex,
|
co.tech_annex AS techAnnex,
|
||||||
co.business_annex AS businessAnnex,
|
co.business_annex AS businessAnnex,
|
||||||
co.production_schedule AS productionSchedule,
|
co.production_schedule AS productionSchedule,
|
||||||
|
co.unit_price_remark AS unitPriceRemark,
|
||||||
|
co.deposit_payable AS depositPayable,
|
||||||
|
co.deposit_paid AS depositPaid,
|
||||||
|
co.deposit_ratio AS depositRatio,
|
||||||
co.status,
|
co.status,
|
||||||
co.contract_id AS contractId,
|
co.contract_id AS contractId,
|
||||||
co.annex_files AS annexFiles,
|
co.annex_files AS annexFiles,
|
||||||
@@ -141,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
co.tech_annex AS techAnnex,
|
co.tech_annex AS techAnnex,
|
||||||
co.business_annex AS businessAnnex,
|
co.business_annex AS businessAnnex,
|
||||||
co.production_schedule AS productionSchedule,
|
co.production_schedule AS productionSchedule,
|
||||||
|
co.unit_price_remark AS unitPriceRemark,
|
||||||
|
co.deposit_payable AS depositPayable,
|
||||||
|
co.deposit_paid AS depositPaid,
|
||||||
|
co.deposit_ratio AS depositRatio,
|
||||||
co.status,
|
co.status,
|
||||||
co.contract_id AS contractId,
|
co.contract_id AS contractId,
|
||||||
co.annex_files AS annexFiles,
|
co.annex_files AS annexFiles,
|
||||||
|
|||||||
Reference in New Issue
Block a user