项目管理

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2,8 +2,9 @@ package com.ozs.pm.service.impl;
 
 import java.util.*;
 
-import com.ozs.common.enums.ProjectTypes;
+import com.ozs.common.enums.*;
 import com.ozs.common.utils.DateUtils;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.pm.doman.*;
 import com.ozs.pm.doman.vo.requestVo.PmRequestVo;
@@ -12,7 +13,7 @@ import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.service.ISysDeptService;
-import com.ozs.system.service.ISysDictTypeService;
+import com.ozs.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +41,7 @@ public class PmDemandServiceImpl implements IPmDemandService
     private ISysDeptService deptService;
 
     @Autowired
-    private ISysDictTypeService dictTypeService;
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询采购需求
@@ -61,6 +62,11 @@ public class PmDemandServiceImpl implements IPmDemandService
                 vo.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
             }
 
+            String purchaseServicesName = dictDataService.selectDictLabel("purchase_services",vo.getPurchaseServices());
+            if(StringUtils.isNotEmpty(purchaseServicesName)){
+                vo.setPurchaseServicesName(purchaseServicesName);
+            }
+
             //项目类型
             for (ProjectTypes value : ProjectTypes.values()) {
                 if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
@@ -68,6 +74,43 @@ public class PmDemandServiceImpl implements IPmDemandService
                     break;
                 }
             }
+            //是否为超限额计划
+            for (IsExcess value : IsExcess.values()) {
+                if (vo.getIsExcess() != null && vo.getIsExcess().equals(value.getCode())) {
+                    vo.setIsExcessName(value.getInfo());
+                    break;
+                }
+            }
+
+            //采购方式
+            for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
+                if (vo.getPurchaseMode() != null && vo.getPurchaseMode().equals(value.getCode())) {
+                    vo.setPurchaseModeName(value.getInfo());
+                    break;
+                }
+            }
+            //项目属性
+            for (ProjectAttribute value : ProjectAttribute.values()) {
+                if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
+                    vo.setProjectAttrName(value.getInfo());
+                    break;
+                }
+            }
+            //预警状态
+            for (WarnStatus value : WarnStatus.values()) {
+                if (vo.getWarnStatus() != null && vo.getWarnStatus().equals(value.getCode())) {
+                    vo.setWarnStatusName(value.getInfo());
+                    break;
+                }
+            }
+
+            //项目状态
+            for (PmProjectStatus value : PmProjectStatus.values()) {
+                if (vo.getProjectStatus() != null && vo.getProjectStatus().equals(value.getCode())) {
+                    vo.setProjectStatusName(value.getInfo());
+                    break;
+                }
+            }
 
 
             if(ProjectTypes.EQUIPMENTTYPE.getCode().equals(vo.getProjectType())){//装备类