采购服务站名称字段

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanQuarterResponseVo.java

@@ -60,8 +60,8 @@ public class PlanQuarterResponseVo implements Serializable {
     /**
      * 采购服务站
      */
-    private String purchaseServices;
     @Excel(name = "采购服务站")
+    private String purchaseServices;
     private String purchaseServicesStr;
     /**
      * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -59,8 +59,9 @@ public class PlanYearsResponseVo implements Serializable {
     /**
      * 采购服务站
      */
-    private String purchaseServices;
     @Excel(name = "采购服务站")
+    private String purchaseServices;
+
     private String purchaseServicesStr;
     /**
      * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)

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

@@ -315,7 +315,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
 
         int successNum = 0;
         int failureNum = 0;
@@ -353,7 +352,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                         builder.append(projectAttributes.get(planQuarter.getProjectAttr()));
                     }
                     planQuarter.setProjectAttr(builder.toString());
-                    planQuarter.setPurchaseServices(purchaseServices.get(planQuarter.getPurchaseServices()));
                     planQuarter.setIsExcess(deptService.isExcessOrNo(planQuarter.getProjectType(), planQuarter.getEvaluation(), Long.valueOf(planQuarter.getPurchaseDeptId())));
                     planQuarter.setCreated(String.valueOf(loginUser.getUserId()));
                     planQuarter.setCreateTime(new Date());
@@ -649,7 +647,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         List<PlanQuarterResponseVo> list = new ArrayList<PlanQuarterResponseVo>();
         for (PlanQuarter planQuarter : planQuarters) {
             PlanQuarterResponseVo responseVo = new PlanQuarterResponseVo();
@@ -695,12 +692,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     }
                 }
             }
-            for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
-                if (planQuarter.getPurchaseServices().equals(entry.getValue())) {
-                    planQuarter.setPurchaseServicesStr(entry.getKey());
-                    break;
-                }
-            }
             BeanUtils.copyProperties(planQuarter, responseVo);
 
             try {

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

@@ -375,7 +375,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
 
         int successNum = 0;
         int failureNum = 0;
@@ -413,7 +412,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
                     }
                     ofYear.setProjectAttr(builder.toString());
-                    ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
                     ofYear.setIsExcess(deptService.isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation(), Long.valueOf(ofYear.getPurchaseDeptId())));
                     ofYear.setCreated(String.valueOf(loginUser.getUserId()));
                     ofYear.setCreateTime(new Date());
@@ -1378,7 +1376,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         List<PlanYearsResponseVo> list = new ArrayList<PlanYearsResponseVo>();
         for (PlanYears planYear : planYears) {
             PlanYearsResponseVo responseVo = new PlanYearsResponseVo();
@@ -1424,12 +1421,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                 }
             }
-            for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
-                if (planYear.getPurchaseServices().equals(entry.getValue())) {
-                    planYear.setPurchaseServicesStr(entry.getKey());
-                    break;
-                }
-            }
             BeanUtils.copyProperties(planYear, responseVo);
             try {
                 responseVo.setTipsMessage(planYearsGetTips(responseVo, thresholdMap, alertTimeMap));