项目属性返回赋值

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

@@ -150,6 +150,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Autowired
     private ISysDictDataService dictDataService;
     @Autowired
+    private ISysDictTypeService dictTypeService;
+    @Autowired
     private SysFileService fileService;
     @Autowired
     private SysFileRefService sysFileRefService;
@@ -3664,6 +3666,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     //字段转换and赋值
     public List<PmDemandResVo> demandChangeTo(List<PmDemand> pmDemandList) {
         List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
+        //获取字典数据
+        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
+        //项目属性
+        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
         for (PmDemand pmDemand1 : pmDemandList) {
             PmDemandResVo vo = new PmDemandResVo();
             BeanUtils.copyProperties(pmDemand1, vo);
@@ -3676,7 +3682,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     }
                 }
             }
-
             String purchaseServicesName = dictDataService.selectDictLabel("purchase_services", vo.getPurchaseServices());
             if (StringUtils.isNotEmpty(purchaseServicesName)) {
                 vo.setPurchaseServicesName(purchaseServicesName);
@@ -3704,11 +3709,31 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     break;
                 }
             }
-            //项目属性
-            for (ProjectAttribute value : ProjectAttribute.values()) {
-                if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
-                    vo.setProjectAttrName(value.getInfo());
-                    break;
+            //项目属性为value拼接
+            if (!ObjectUtils.isEmpty(vo.getProjectAttr())) {
+                if (vo.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = vo.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                if (!vo.getProjectAttr().endsWith(s)) {
+                                    builder.append(entry.getKey() + ",");
+                                } else {
+                                    builder.append(entry.getKey());
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    vo.setProjectAttrName(builder.toString());
+                } else {
+                    for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                        if (vo.getProjectAttr().equals(entry.getValue())) {
+                            vo.setProjectAttrName(entry.getKey());
+                            break;
+                        }
+                    }
                 }
             }
             //预警状态