From e14308686efec5f304930cb5c13af570bf1d9f26 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 20 Nov 2025 17:37:11 +0800 Subject: [PATCH] =?UTF-8?q?1.0.38=20=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E5=90=88=E5=90=8C=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/oa/erp/domain/ErpContractInfo.java | 5 +++++ .../dromara/oa/erp/domain/bo/ErpContractInfoBo.java | 5 +++++ .../dromara/oa/erp/domain/vo/ErpContractInfoVo.java | 6 ++++++ .../erp/service/impl/ErpContractInfoServiceImpl.java | 11 +++++++++-- .../erp/service/impl/ErpProjectInfoServiceImpl.java | 10 ++++++++-- .../resources/mapper/oa/erp/ErpContractInfoMapper.xml | 1 + 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java index 82884eda..d083541f 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java @@ -42,6 +42,11 @@ public class ErpContractInfo extends TenantEntity { */ private String contractCode; + /** + * 客户合同编号 + */ + private String customerContractCode; + /** * 合同名称 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java index a41afda7..1b09ea0b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java @@ -44,6 +44,11 @@ public class ErpContractInfoBo extends BaseEntity { */ private String contractCode; + /** + * 客户合同编号 + */ + private String customerContractCode; + /** * 合同名称 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java index e8dcf729..d34534b1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java @@ -51,6 +51,12 @@ public class ErpContractInfoVo implements Serializable { @ExcelProperty(value = "合同编号") private String contractCode; + /** + * 客户合同编号 + */ + @ExcelProperty(value = "客户合同编号") + private String customerContractCode; + /** * 合同名称 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java index 95dedf68..3cdf70a3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -103,6 +103,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { .selectAll(ErpContractInfo.class) .eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractInfo::getContractFlag, bo.getContractFlag()) .eq(StringUtils.isNotBlank(bo.getContractCode()), ErpContractInfo::getContractCode, bo.getContractCode()) + .eq(StringUtils.isNotBlank(bo.getCustomerContractCode()), ErpContractInfo::getCustomerContractCode, bo.getCustomerContractCode()) .like(StringUtils.isNotBlank(bo.getContractName()), ErpContractInfo::getContractName, bo.getContractName()) .eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractInfo::getContractCategory, bo.getContractCategory()) .eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractInfo::getContractType, bo.getContractType()) @@ -250,10 +251,16 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { // 办理人 String handler = Convert.toStr(params.get("handler")); } - if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { + if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.WAITING.getStatus())) { + contractInfo.setContractStatus(OAStatusEnum.APPROVING.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { contractInfo.setContractStatus(OAStatusEnum.COMPLETED.getStatus()); - } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())){ + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { contractInfo.setContractStatus(OAStatusEnum.INVALID.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.CANCEL.getStatus())) { + contractInfo.setContractStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(contractInfo); }); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index 86fcb05c..caf5f6da 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -212,10 +212,16 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { // 办理人 String handler = Convert.toStr(params.get("handler")); } - if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { + if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.WAITING.getStatus())) { + projectInfo.setProjectStatus(OAStatusEnum.APPROVING.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { projectInfo.setProjectStatus(OAStatusEnum.COMPLETED.getStatus()); - } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())) { + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { projectInfo.setProjectStatus(OAStatusEnum.INVALID.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.CANCEL.getStatus())) { + projectInfo.setProjectStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(projectInfo); }); diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml index 2a7ad67d..ec7a3e37 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml @@ -11,6 +11,7 @@ t.tenant_id, t.contract_flag, t.contract_code, + t.customer_contract_code, t.contract_name, t.contract_category, t.contract_type,