1.0.38 合同信息添加客户合同编号

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;
+
     /**
      * 合同名称
      */

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;
+
     /**
      * 合同名称
      */

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;
+
     /**
      * 合同名称
      */

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

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

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,