diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java index c9484cee..d41ff19a 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java @@ -185,6 +185,26 @@ public class CrmOrder extends BaseEntity { */ private String productionSchedule; + /** + * 算单价备注 + */ + private String unitPriceRemark; + + /** + * 应付定金(万元) + */ + private BigDecimal depositPayable; + + /** + * 已付定金(万元) + */ + private BigDecimal depositPaid; + + /** + * 定金比例(%) + */ + private BigDecimal depositRatio; + /** * 合同状态 0=草稿 1=生效 2=作废 3=已完成 */ diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java index 74761c4d..b07e18a1 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java @@ -200,6 +200,26 @@ public class CrmOrderBo extends BaseEntity { */ private String productionSchedule; + /** + * 算单价备注 + */ + private String unitPriceRemark; + + /** + * 应付定金(万元) + */ + private BigDecimal depositPayable; + + /** + * 已付定金(万元) + */ + private BigDecimal depositPaid; + + /** + * 定金比例(%) + */ + private BigDecimal depositRatio; + /** * 合同状态 0=草稿 1=生效 2=作废 3=已完成 */ diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java index 3502e00b..5a8c67ed 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java @@ -234,6 +234,30 @@ public class CrmOrderVo extends BaseEntity { @ExcelProperty(value = "排产函") 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=已完成 */ diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java index 8f0d19f8..a5e42939 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java @@ -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.getBusinessAnnex()), "co.business_annex", bo.getBusinessAnnex()); 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.getContractId() != null, "co.contract_id", bo.getContractId()); 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.getBusinessAnnex()), CrmOrder::getBusinessAnnex, bo.getBusinessAnnex()); 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.getContractId() != null, CrmOrder::getContractId, bo.getContractId()); lqw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), CrmOrder::getAnnexFiles, bo.getAnnexFiles()); diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml index 1ad9fe7d..ae849e39 100644 --- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml +++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml @@ -40,6 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -86,6 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" co.tech_annex AS techAnnex, co.business_annex AS businessAnnex, 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.contract_id AS contractId, co.annex_files AS annexFiles, @@ -141,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" co.tech_annex AS techAnnex, co.business_annex AS businessAnnex, 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.contract_id AS contractId, co.annex_files AS annexFiles,