项目属性拼接

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -142,7 +142,7 @@ public class ProvisionalPlanController extends BaseController {
         return success(provisionalPlan);
     }
 
-    @ApiOperation(value = "导入年临时计划")
+    @ApiOperation(value = "导入临时计划")
     @PostMapping("/importProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('base:provisionalPlan:importProvisionalPlan')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -239,7 +239,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanPracticalId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
@@ -271,7 +271,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", quarters.getPlanPracticalId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
         sysFileRefMapper.deleteByMap(map);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -413,6 +413,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
             BeanUtils.copyProperties(vo, ofYears);
+            ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
         }
@@ -542,25 +543,27 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 }
             }
             //项目属性是拼接的
-            if (planYear.getProjectAttr().length() > 1) {
-                StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split(",");
-                for (String s : split) {
+            if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
+                if (planYear.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = planYear.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                builder.append(entry.getKey() + ",");
+                                break;
+                            }
+                        }
+                    }
+                    planYear.setProjectAttrStr(builder.toString());
+                } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                        if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + ",");
+                        if (planYear.getProjectAttr().equals(entry.getValue())) {
+                            planYear.setProjectAttrStr(entry.getKey());
                             break;
                         }
                     }
                 }
-                planYear.setProjectAttrStr(builder.toString());
-            } else {
-                for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                    if (planYear.getProjectAttr().equals(entry.getValue())) {
-                        planYear.setProjectAttrStr(entry.getKey());
-                        break;
-                    }
-                }
             }
             for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
                 if (planYear.getPurchaseServices().equals(entry.getValue())) {

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -273,7 +273,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanYearId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_YEAR.getType());
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
@@ -842,25 +842,27 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             }
             //项目属性是拼接的
-            if (planYear.getProjectAttr().length() > 1) {
-                StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split(",");
-                for (String s : split) {
+            if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
+                if (planYear.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = planYear.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                builder.append(entry.getKey() + ",");
+                                break;
+                            }
+                        }
+                    }
+                    planYear.setProjectAttrStr(builder.toString());
+                } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                        if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + ",");
+                        if (planYear.getProjectAttr().equals(entry.getValue())) {
+                            planYear.setProjectAttrStr(entry.getKey());
                             break;
                         }
                     }
                 }
-                planYear.setProjectAttrStr(builder.toString());
-            } else {
-                for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                    if (planYear.getProjectAttr().equals(entry.getValue())) {
-                        planYear.setProjectAttrStr(entry.getKey());
-                        break;
-                    }
-                }
             }
             for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
                 if (planYear.getPurchaseServices().equals(entry.getValue())) {

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -93,10 +93,10 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     ofProvisionalPlan.setPurchaseMode(planPurchaseModesMap.get(ofProvisionalPlan.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofProvisionalPlan.getProjectAttr().contains("，")) {
-                        String[] split = ofProvisionalPlan.getProjectAttr().split("，");
+                    if (ofProvisionalPlan.getProjectAttr().contains(",")) {
+                        String[] split = ofProvisionalPlan.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));