[fix] 枚举优化

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO;
 import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO;
 import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper;
+import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
 import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
@@ -49,6 +50,8 @@ public class ContractServiceImpl implements ContractService {
      */
     public static String VERSION = "1";
 
+
+
     @Resource
     private ContractMapper contractMapper;
 
@@ -231,6 +234,9 @@ public class ContractServiceImpl implements ContractService {
 
         // TODO 枚举优化
         contractRespVO.setType(ContractTypeEnum.getNoByCode(contractRespVO.getType()));
+        contractRespVO.setStatus(ContractStatusEnum.getNoByCode(contractRespVO.getStatus()));
+        contractRespVO.setCountType(ContractStatusEnum.getNoByCode(contractRespVO.getCountType()));
+        contractRespVO.setSource(ContractStatusEnum.getNoByCode(contractRespVO.getSource()));
         //分包合同商议提示 TODO 待优化
 //        ExtContractDO extContractDO = extContractMapper.selectOne("project_id", projectId);
 //        LocalDateTime reminderTime = extContractDO.getReminderTime();

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.cms.service.contractHistory;
 import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
 import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO;
+import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
+import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
 import cn.iocoder.yudao.module.cms.service.contract.ContractService;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
@@ -104,6 +106,11 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
         contractHistoryRespVO.setTrackingDep(projectDetail.getTrackingDepName());
         contractHistoryRespVO.setProjectManager(projectDetail.getProjectManagerName());
 
+        contractHistoryRespVO.setType(ContractTypeEnum.getNoByCode(contractHistoryRespVO.getType()));
+        contractHistoryRespVO.setStatus(ContractStatusEnum.getNoByCode(contractHistoryRespVO.getStatus()));
+        contractHistoryRespVO.setCountType(ContractStatusEnum.getNoByCode(contractHistoryRespVO.getCountType()));
+        contractHistoryRespVO.setSource(ContractStatusEnum.getNoByCode(contractHistoryRespVO.getSource()));
+
         //分包合同商议提示 TODO 待优化
 //        ExtContractDO extContractDO = extContractMapper.selectOne("project_id", projectId);
 //        LocalDateTime reminderTime = extContractDO.getReminderTime();

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java

@@ -11,6 +11,9 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.extcontracthistory.ExtContract
 import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.extcontract.ExtContractMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.extcontracthistory.ExtContractHistoryMapper;
+import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum;
+import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
+import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
@@ -111,6 +114,8 @@ public class ExtContractServiceImpl implements ExtContractService {
         BigDecimal amount = createReqVO.getAmount();
 
 
+
+
         if (!project.getCode().equals(code)){
             throw exception(PARAM_ERROR);
         }
@@ -258,6 +263,13 @@ public class ExtContractServiceImpl implements ExtContractService {
         //合同商议提示 // TODO 待优化
         extContractRespVO.setExReminderTime(null);
 
+        extContractRespVO.setType(ContractTypeEnum.getNoByCode(extContractRespVO.getType()));
+        extContractRespVO.setStatus(ContractStatusEnum.getNoByCode(extContractRespVO.getStatus()));
+        extContractRespVO.setCountType(ContractStatusEnum.getNoByCode(extContractRespVO.getCountType()));
+        extContractRespVO.setSource(ContractStatusEnum.getNoByCode(extContractRespVO.getSource()));
+        extContractRespVO.setChargingStandard(ChargingStandardEnum.getNoByCode(extContractRespVO.getChargingStandard()));
+
+
         return extContractRespVO;
     }
 

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java

@@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.cms.service.extcontracthistory;
 
 import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
 import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
+import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum;
+import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum;
+import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
 import cn.iocoder.yudao.module.cms.service.extContract.ExtContractService;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
@@ -114,6 +117,13 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
         //合同商议提示 // TODO 待优化
         HistoryResp.setExReminderTime(null);
 
+        HistoryResp.setType(ContractTypeEnum.getNoByCode(HistoryResp.getType()));
+        HistoryResp.setStatus(ContractStatusEnum.getNoByCode(HistoryResp.getStatus()));
+        HistoryResp.setCountType(ContractStatusEnum.getNoByCode(HistoryResp.getCountType()));
+        HistoryResp.setSource(ContractStatusEnum.getNoByCode(HistoryResp.getSource()));
+        HistoryResp.setChargingStandard(ChargingStandardEnum.getNoByCode(HistoryResp.getChargingStandard()));
+
+
         return HistoryResp;
     }
 

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
 import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
 import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
+import cn.iocoder.yudao.module.cms.enums.*;
 import cn.iocoder.yudao.module.cms.service.contract.ContractService;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
@@ -219,6 +220,9 @@ public class OutsContractServiceImpl implements OutsContractService {
         outsContractRespVO.setProjectManager(contract.getProjectManager());
         outsContractRespVO.setOutsAmount(contract.getAmount());
 
+        outsContractRespVO.setMajor(OutsContractMajorEnum.getNoByCode(outsContractRespVO.getMajor()));
+        outsContractRespVO.setCountType(CountTypeEnum.getNoByCode(outsContractRespVO.getCountType()));
+
         return outsContractRespVO;
     }
 

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java

@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsC
 import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
 import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
 import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
+import cn.iocoder.yudao.module.cms.enums.CountTypeEnum;
+import cn.iocoder.yudao.module.cms.enums.OutsContractMajorEnum;
 import cn.iocoder.yudao.module.cms.service.contract.ContractService;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
@@ -65,12 +67,15 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
         OutsContractHistoryRespVO outsContractHistoryResp = BeanUtils.toBean(outsContractHistoryDO, OutsContractHistoryRespVO.class);
         Long contractId = outsContractHistoryResp.getContractId();
         ContractRespVO contract = contractService.getContract(contractId);
-        // TODO 枚举优化
+
         outsContractHistoryResp.setName(contract.getName());
         outsContractHistoryResp.setTrackingDep(contract.getTrackingDep());
         outsContractHistoryResp.setProjectManager(contract.getProjectManager());
         outsContractHistoryResp.setOutsAmount(contract.getAmount());
 
+        outsContractHistoryResp.setMajor(OutsContractMajorEnum.getNoByCode(outsContractHistoryResp.getMajor()));
+        outsContractHistoryResp.setCountType(CountTypeEnum.getNoByCode(outsContractHistoryResp.getCountType()));
+
         return outsContractHistoryResp;
     }