DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(crm): 添加订单关联合同ID和附件字段支持

Browse Source 
- 在CrmOrder实体类中新增contractId和annexFiles字段
- 在CrmOrderBo业务对象中同步添加对应字段
- 更新CrmOrderMapper.xml映射文件中的结果映射和查询字段
- 在CrmOrderServiceImpl服务实现中添加字段查询条件支持
- 在CrmOrderVo视图对象中增加Excel导出注解配置
This commit is contained in:
Joshi
2026-03-30 13:39:27 +08:00
parent ca176de4ef
commit 8a5f2bc4df
5 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java
View File

@@ -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删除
*/

10
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
View File

@@ -95,5 +95,15 @@ public class CrmOrderBo extends BaseEntity {
*/
private String contractCode;
/**
* 关联合同ID（wms_contract.contract_id）
*/
private Long contractId;
/**
* 附件（多个文件URL用逗号分隔）
*/
private String annexFiles;
}

12
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
View File

@@ -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;

4
klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
View File

@@ -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;
}

6
klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
View File

@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unpaidAmount" column="unpaid_amount"/>
<result property="remark" column="remark"/>
<result property="contractCode" column="contract_code"/>
<result property="contractId" column="contract_id"/>
<result property="annexFiles" column="annex_files"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -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,