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 230acebf..e63f89db 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
@@ -85,6 +85,16 @@ public class CrmOrder extends BaseEntity {
*/
private String contractCode;
+ /**
+ * 关联合同ID(wms_contract.contract_id)
+ */
+ private Long contractId;
+
+ /**
+ * 附件(多个文件URL用逗号分隔)
+ */
+ private String annexFiles;
+
/**
* 删除标识 0正常 2删除
*/
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 4a92bf88..beee8ea8 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
@@ -95,5 +95,15 @@ public class CrmOrderBo extends BaseEntity {
*/
private String contractCode;
+ /**
+ * 关联合同ID(wms_contract.contract_id)
+ */
+ private Long contractId;
+
+ /**
+ * 附件(多个文件URL用逗号分隔)
+ */
+ private String annexFiles;
+
}
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 86e22111..3441237d 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
@@ -114,6 +114,18 @@ public class CrmOrderVo extends BaseEntity {
@ExcelProperty(value = "合同号")
private String contractCode;
+ /**
+ * 关联合同ID(wms_contract.contract_id)
+ */
+ @ExcelProperty(value = "关联合同ID")
+ private Long contractId;
+
+ /**
+ * 附件(多个文件URL用逗号分隔)
+ */
+ @ExcelProperty(value = "附件")
+ private String annexFiles;
+
// @ExcelProperty(value = "客户编号")
private String customerCode;
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 c092ce81..85bd8186 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
@@ -95,6 +95,8 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
qw.eq(bo.getFinanceStatus() != null, "co.finance_status", bo.getFinanceStatus());
qw.eq(bo.getUnpaidAmount() != null, "co.unpaid_amount", bo.getUnpaidAmount());
qw.like(StringUtils.isNotBlank(bo.getContractCode()), "co.contract_code", bo.getContractCode());
+ qw.eq(bo.getContractId() != null, "co.contract_id", bo.getContractId());
+ qw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), "co.annex_files", bo.getAnnexFiles());
//逻辑删除
qw.eq("co.del_flag", 0);
//根据orderType排序预订单是0 正是订单是1 0排在前面 1排在后面 升序
@@ -128,6 +130,8 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
lqw.eq(bo.getFinanceStatus() != null, CrmOrder::getFinanceStatus, bo.getFinanceStatus());
lqw.eq(bo.getUnpaidAmount() != null, CrmOrder::getUnpaidAmount, bo.getUnpaidAmount());
lqw.like(StringUtils.isNotBlank(bo.getContractCode()), CrmOrder::getContractCode, bo.getContractCode());
+ lqw.eq(bo.getContractId() != null, CrmOrder::getContractId, bo.getContractId());
+ lqw.like(StringUtils.isNotBlank(bo.getAnnexFiles()), CrmOrder::getAnnexFiles, bo.getAnnexFiles());
return lqw;
}
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
index 3d89ce6d..ffc1b182 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -43,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
co.unpaid_amount AS unpaidAmount,
co.remark,
co.contract_code AS contractCode,
+ co.contract_id AS contractId,
+ co.annex_files AS annexFiles,
co.create_by AS createBy,
co.create_time AS createTime,
co.update_by AS updateBy,
@@ -75,6 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
co.unpaid_amount AS unpaidAmount,
co.remark,
co.contract_code AS contractCode,
+ co.contract_id AS contractId,
+ co.annex_files AS annexFiles,
co.create_by AS createBy,
co.create_time AS createTime,
co.update_by AS updateBy,