新需求变更

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

@@ -67,7 +67,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "查询年度计划")
     @PostMapping("/list")
-    //@PreAuthorize("@ss.hasPermi('plan:planYears:list')")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:list')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -186,11 +186,9 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
                     vo.setPurchaseServicesName(purchaseServicesName);
                 }
                 //项目类型
-                for (ProjectTypes value : ProjectTypes.values()) {
-                    if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
-                        vo.setProjectTypeName(value.getInfo());
-                        break;
-                    }
+                String projectTypeName = dictDataService.selectDictLabel("sys_project_type", vo.getProjectType());
+                if (StringUtils.isNotEmpty(projectTypeName)) {
+                    vo.setProjectTypeName(projectTypeName);
                 }
                 //是否为超限额计划
                 for (IsExcess value : IsExcess.values()) {

purchase-system/src/main/java/com/ozs/plan/doman/PlanQuarter.java

@@ -77,11 +77,14 @@ public class PlanQuarter {
      * 机关业务指导处(科)
      */
     private String organDivision;
+    @TableField(exist = false)
+    private String organDivisionStr;
     /**
      * 预算科目
      */
     private String budgetAccount;
-
+    @TableField(exist = false)
+    private String budgetAccountStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
@@ -131,6 +134,8 @@ public class PlanQuarter {
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
     private String projectStatus;
+    @TableField(exist = false)
+    private String projectStatusStr;
     /**
      * 处理申请撤销
      * 请求根据字段 appDelete 判断，值是true就是已申请

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -69,10 +69,14 @@ public class PlanYears {
      * 机关业务指导处(科)
      */
     private String organDivision;
+    @TableField(exist = false)
+    private String organDivisionStr;
     /**
      * 预算科目
      */
     private String budgetAccount;
+    @TableField(exist = false)
+    private String budgetAccountStr;
 
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
@@ -123,6 +127,8 @@ public class PlanYears {
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
     private String projectStatus;
+    @TableField(exist = false)
+    private String projectStatusStr;
     /**
      * 处理申请撤销
      * 请求根据字段 appDelete 判断，值是true就是已申请

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -71,14 +71,20 @@ public class ProvisionalPlan {
 
     @TableField(exist = false)
     private String purchaseServicesStr;
-
-    @Excel(name = "采购方式")
-    @ApiModelProperty(value = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
-    @TableField("purchase_mode")
-    private String purchaseMode;
+    /**
+     * 机关业务指导处(科)
+     */
+    @TableField("organ_division")
+    private String organDivision;
     @TableField(exist = false)
-    private String purchaseModeStr;
-
+    private String organDivisionStr;
+    /**
+     * 预算科目
+     */
+    @TableField("budget_account")
+    private String budgetAccount;
+    @TableField(exist = false)
+    private String budgetAccountStr;
     @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
@@ -118,7 +124,8 @@ public class ProvisionalPlan {
     @ApiModelProperty(value = "项目状态(0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)")
     @TableField("project_status")
     private String projectStatus;
-
+    @TableField(exist = false)
+    private String projectStatusStr;
     @ApiModelProperty(value = "退回原因")
     @TableField("refuse_reason")
     private String refuseReason;

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

@@ -56,17 +56,21 @@ public class PlanQuarterResponseVo implements Serializable {
     /**
      * 采购服务站
      */
-    @Excel(name = "采购服务站")
     private String purchaseServices;
+    @Excel(name = "采购服务站")
     private String purchaseServicesStr;
     /**
      * 机关业务指导处(科)
      */
     private String organDivision;
+    @Excel(name = "机关业务指导处(科)")
+    private String organDivisionStr;
     /**
      * 预算科目
      */
     private String budgetAccount;
+    @Excel(name = "预算科目")
+    private String budgetAccountStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

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

@@ -55,9 +55,8 @@ public class PlanYearsResponseVo implements Serializable {
     /**
      * 采购服务站
      */
-    @Excel(name = "采购服务站")
     private String purchaseServices;
-
+    @Excel(name = "采购服务站")
     private String purchaseServicesStr;
     /**
      * 机关业务指导处(科)
@@ -116,8 +115,9 @@ public class PlanYearsResponseVo implements Serializable {
      * 项目状态--->包括计划待提交、计划待审核、计划已退回、计划已审核
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
-    @Excel(name = "项目状态")
     private String projectStatus;
+    @Excel(name = "项目状态")
+    private String projectStatusStr;
     /**
      * 处理申请撤销
      * 请求根据字段 appDelete 判断，值是true就是已申请

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

@@ -36,6 +36,7 @@ import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.ISysUserService;
 import com.ozs.system.service.SysFileService;
@@ -46,8 +47,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Validator;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -78,6 +77,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Autowired
     private ISysDictTypeService dictTypeService;
     @Autowired
+    private ISysDictDataService dictDataService;
+    @Autowired
     private ISysDeptService deptService;
     @Autowired
     SysFileRefMapper sysFileRefMapper;
@@ -686,21 +687,52 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         }
         //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //项目属性
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
+        //项目审核状态
+        HashMap<String, String> projectStatusMap = planEnums.get("projectStatus");
+        //项目类型
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
+
         List<PlanQuarterResponseVo> list = new ArrayList<PlanQuarterResponseVo>();
         for (PlanQuarter planQuarter : planQuarters) {
             PlanQuarterResponseVo responseVo = new PlanQuarterResponseVo();
             SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(planQuarter.getPurchaseDeptId())).get("sysDept");
             planQuarter.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
 
+            //预算科目
+            for (Map.Entry<String, String> entry : budgetAccountMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planQuarter.getBudgetAccount()) && planQuarter.getBudgetAccount().equals(entry.getValue())) {
+                    planQuarter.setBudgetAccountStr(entry.getKey());
+                    break;
+                }
+            }
+            //采购服务站
+            for (Map.Entry<String, String> entry : purchaseServicesMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planQuarter.getPurchaseServices()) && planQuarter.getPurchaseServices().equals(entry.getValue())) {
+                    planQuarter.setPurchaseServicesStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目审核状态
+            for (Map.Entry<String, String> entry : projectStatusMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planQuarter.getProjectStatus()) && planQuarter.getProjectStatus().equals(entry.getValue())) {
+                    planQuarter.setProjectStatusStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目类型
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
-                if (planQuarter.getProjectType().equals(entry.getValue())) {
+                if (!ObjectUtils.isEmpty(planQuarter.getProjectType()) && planQuarter.getProjectType().equals(entry.getValue())) {
                     planQuarter.setProjectTypeStr(entry.getKey());
                     break;
                 }
             }
-            //项目属性是拼接的
+            //项目属性为value拼接
             if (!ObjectUtils.isEmpty(planQuarter.getProjectAttr())) {
                 if (planQuarter.getProjectAttr().length() > 1) {
                     StringBuilder builder = new StringBuilder();
@@ -727,6 +759,33 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     }
                 }
             }
+            //机关业务指导处(科)为id拼接
+            String organDivision = planQuarter.getOrganDivision();
+            if (!ObjectUtils.isEmpty(organDivision)) {
+                int length = organDivision.split(",").length;
+                SysDept sysDept = new SysDept();
+                if (length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = organDivision.split(",");
+                    for (String s : split) {
+                        sysDept = deptService.selectById(Long.valueOf(s));
+                        if (!ObjectUtils.isEmpty(sysDept)) {
+                            if (!organDivision.endsWith(s)) {
+                                builder.append(sysDept.getDeptName() + ",");
+                            } else {
+                                builder.append(sysDept.getDeptName());
+                            }
+                        }
+                    }
+                    planQuarter.setOrganDivisionStr(builder.toString());
+                } else if (length == 1) {
+                    sysDept = deptService.selectById(Long.valueOf(organDivision));
+                    if (!ObjectUtils.isEmpty(sysDept)) {
+                        planQuarter.setOrganDivisionStr(sysDept.getDeptName());
+                        break;
+                    }
+                }
+            }
             BeanUtils.copyProperties(planQuarter, responseVo);
 
             try {

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

@@ -1288,22 +1288,52 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
+        //项目属性
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
+        //项目审核状态
+        HashMap<String, String> projectStatusMap = planEnums.get("projectStatus");
+        //项目类型
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
+
         List<PlanYearsResponseVo> list = new ArrayList<PlanYearsResponseVo>();
         for (PlanYears planYear : planYears) {
             PlanYearsResponseVo responseVo = new PlanYearsResponseVo();
             SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(planYear.getPurchaseDeptId())).get("sysDept");
             planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
 
+            //预算科目
+            for (Map.Entry<String, String> entry : budgetAccountMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planYear.getBudgetAccount()) && planYear.getBudgetAccount().equals(entry.getValue())) {
+                    planYear.setBudgetAccountStr(entry.getKey());
+                    break;
+                }
+            }
+            //采购服务站
+            for (Map.Entry<String, String> entry : purchaseServicesMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planYear.getPurchaseServices()) && planYear.getPurchaseServices().equals(entry.getValue())) {
+                    planYear.setPurchaseServicesStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目审核状态
+            for (Map.Entry<String, String> entry : projectStatusMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(planYear.getProjectStatus()) && planYear.getProjectStatus().equals(entry.getValue())) {
+                    planYear.setProjectStatusStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目类型
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
-                if (planYear.getProjectType().equals(entry.getValue())) {
+                if (!ObjectUtils.isEmpty(planYear.getProjectType()) && planYear.getProjectType().equals(entry.getValue())) {
                     planYear.setProjectTypeStr(entry.getKey());
                     break;
                 }
             }
-            //项目属性是拼接的
+            //项目属性为value拼接
             if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
                 if (planYear.getProjectAttr().length() > 1) {
                     StringBuilder builder = new StringBuilder();
@@ -1330,6 +1360,33 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                 }
             }
+            //机关业务指导处(科)为id拼接
+            String organDivision = planYear.getOrganDivision();
+            if (!ObjectUtils.isEmpty(organDivision)) {
+                int length = organDivision.split(",").length;
+                SysDept sysDept = new SysDept();
+                if (length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = organDivision.split(",");
+                    for (String s : split) {
+                        sysDept = deptService.selectById(Long.valueOf(s));
+                        if (!ObjectUtils.isEmpty(sysDept)) {
+                            if (!organDivision.endsWith(s)) {
+                                builder.append(sysDept.getDeptName() + ",");
+                            } else {
+                                builder.append(sysDept.getDeptName());
+                            }
+                        }
+                    }
+                    planYear.setOrganDivisionStr(builder.toString());
+                } else if (length == 1) {
+                    sysDept = deptService.selectById(Long.valueOf(organDivision));
+                    if (!ObjectUtils.isEmpty(sysDept)) {
+                        planYear.setOrganDivisionStr(sysDept.getDeptName());
+                        break;
+                    }
+                }
+            }
             BeanUtils.copyProperties(planYear, responseVo);
             try {
                 responseVo.setTipsMessage(planYearsGetTips(responseVo, thresholdMap, alertTimeMap));

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

@@ -581,17 +581,47 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
 
     //字段赋值对应的名称
     public List<ProvisionalPlan> changeTo(List<ProvisionalPlan> provisionalPlans) {
+        //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        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");
+        //项目审核状态
+        HashMap<String, String> projectStatusMap = planEnums.get("projectStatus");
+        //项目类型
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
+
         List<ProvisionalPlan> list = new ArrayList<ProvisionalPlan>();
         for (ProvisionalPlan provisionalPlan : provisionalPlans) {
             if (provisionalPlan.getPurchaseDeptId() != null) {
                 SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(provisionalPlan.getPurchaseDeptId())).get("sysDept");
                 provisionalPlan.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
             }
+            //预算科目
+            for (Map.Entry<String, String> entry : budgetAccountMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(provisionalPlan.getBudgetAccount()) && provisionalPlan.getBudgetAccount().equals(entry.getValue())) {
+                    provisionalPlan.setBudgetAccountStr(entry.getKey());
+                    break;
+                }
+            }
+            //采购服务站
+            for (Map.Entry<String, String> entry : purchaseServicesMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(provisionalPlan.getPurchaseServices()) && provisionalPlan.getPurchaseServices().equals(entry.getValue())) {
+                    provisionalPlan.setPurchaseServicesStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目审核状态
+            for (Map.Entry<String, String> entry : projectStatusMap.entrySet()) {
+                if (!ObjectUtils.isEmpty(provisionalPlan.getProjectStatus()) && provisionalPlan.getProjectStatus().equals(entry.getValue())) {
+                    provisionalPlan.setProjectStatusStr(entry.getKey());
+                    break;
+                }
+            }
+            //项目类型
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
                 if (provisionalPlan.getProjectType() != null && provisionalPlan.getProjectType().equals(entry.getValue())) {
                     provisionalPlan.setProjectTypeStr(entry.getKey());
@@ -605,7 +635,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + ",");
+                            if (!provisionalPlan.getProjectAttr().endsWith(s)) {
+                                builder.append(entry.getKey() + ",");
+                            } else {
+                                builder.append(entry.getKey());
+                            }
                             break;
                         }
                     }
@@ -619,13 +653,33 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
             }
-            // 采购服务站
-//            for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
-//                if (provisionalPlan.getPurchaseServices() != null && provisionalPlan.getPurchaseServices().equals(entry.getValue())) {
-//                    provisionalPlan.setPurchaseServicesStr(entry.getKey());
-//                    break;
-//                }
-//            }
+            //机关业务指导处(科)为id拼接
+            String organDivision = provisionalPlan.getOrganDivision();
+            if (!ObjectUtils.isEmpty(organDivision)) {
+                int length = organDivision.split(",").length;
+                SysDept sysDept = new SysDept();
+                if (length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = organDivision.split(",");
+                    for (String s : split) {
+                        sysDept = deptService.selectById(Long.valueOf(s));
+                        if (!ObjectUtils.isEmpty(sysDept)) {
+                            if (!organDivision.endsWith(s)) {
+                                builder.append(sysDept.getDeptName() + ",");
+                            } else {
+                                builder.append(sysDept.getDeptName());
+                            }
+                        }
+                    }
+                    provisionalPlan.setOrganDivisionStr(builder.toString());
+                } else if (length == 1) {
+                    sysDept = deptService.selectById(Long.valueOf(organDivision));
+                    if (!ObjectUtils.isEmpty(sysDept)) {
+                        provisionalPlan.setOrganDivisionStr(sysDept.getDeptName());
+                        break;
+                    }
+                }
+            }
             list.add(provisionalPlan);
         }
         return list;