计划信息中的枚举数据公用

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

@@ -2,11 +2,6 @@ package com.ozs.web.controller.plan;
 
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.enums.PlanPurchaseMode;
-import com.ozs.common.enums.ProjectAttribute;
-import com.ozs.common.enums.ProjectStatus;
-import com.ozs.common.enums.ProjectTypes;
 import com.ozs.system.service.ISysDictTypeService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,10 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-
 /**
  * 年度计划信息中的枚举类信息
  *
@@ -30,42 +21,15 @@ public class EnumsOfPlanController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @ApiOperation(value = "年度计划信息中的枚举类信息(下拉框)")
+    /**
+     * 获取年度计划信息中的枚举类信息(下拉框数据)
+     *
+     * @return 年度计划信息中的枚举类信息(下拉框数据)
+     */
+    @ApiOperation(value = "年度计划信息中的枚举类信息(下拉框数据)")
     @PostMapping("/getAboutEnums")
     public AjaxResult getAboutEnums() {
-        HashMap<String, HashMap<String, String>> hashMap = new HashMap<>();
-        HashMap<String, String> projectTypesMap = new LinkedHashMap<>();
-        HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
-        HashMap<String, String> planPurchaseModesMap = new LinkedHashMap<>();
-        HashMap<String, String> projectAttributes = new LinkedHashMap<>();
-        HashMap<String, String> purchaseServices = new LinkedHashMap<>();
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            projectTypesMap.put(value.getInfo(), value.getCode());
-        }
-        //项目审核状态
-        for (ProjectStatus value : ProjectStatus.values()) {
-            projectStatusMap.put(value.getInfo(), value.getCode());
-        }
-        //采购方式
-        for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
-            planPurchaseModesMap.put(value.getInfo(), value.getCode());
-        }
-        //项目属性
-        for (ProjectAttribute value : ProjectAttribute.values()) {
-            projectAttributes.put(value.getInfo(), value.getCode());
-        }
-        List<SysDictData> data = dictTypeService.selectDictDataByType("purchase_services");
-        //采购服务站
-        for (SysDictData dictData : data) {
-            purchaseServices.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        hashMap.put("ProjectTypes", projectTypesMap);
-        hashMap.put("ProjectStatus", projectStatusMap);
-        hashMap.put("PlanPurchaseModes", planPurchaseModesMap);
-        hashMap.put("ProjectAttributes", projectAttributes);
-        hashMap.put("purchaseServices", purchaseServices);
-        return AjaxResult.success(hashMap);
+        return dictTypeService.getAboutEnums();
     }
 
 }

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

@@ -53,7 +53,6 @@ public class PlanOfYears extends BaseEntity {
     /**
      * 是否为超限额计划(0:未超额，1:超额)
      */
-    @Excel(name = "是否为超限额计划")
     @NotNull(message = "是否为超限额计划不能为空")
     private String isExcess;
     /**
@@ -111,13 +110,15 @@ public class PlanOfYears extends BaseEntity {
      * 项目状态--->包括计划待提交、计划待审核、计划已退回、计划已审核
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
-    @Excel(name = "项目状态")
     private String projectStatus;
     /**
      * 退回原因--->审核不通过就是退回
      */
-    @Excel(name = "退回原因")
     private String reasonOfReturn;
+    /**
+     * 项目附件
+     */
+    private String projectFiles;
     /**
      * 创建者
      */

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanOfYearsStandardVo.java

@@ -107,7 +107,11 @@ public class PlanOfYearsStandardVo extends BaseEntity {
      */
     @ApiModelProperty(value = "备注")
     private String remarks;
-
+    /**
+     * 项目附件
+     */
+    @ApiModelProperty(value = "项目附件")
+    private String projectFiles;
     /**
      * 退回原因--->审核不通过就是退回
      */

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

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -98,5 +97,9 @@ public class PlanOfYearsResponseVo {
      */
     @Excel(name = "项目状态")
     private String projectStatus;
+    /**
+     * 项目附件
+     */
+    private String projectFiles;
 
 }

purchase-system/src/main/java/com/ozs/system/service/ISysDictTypeService.java

@@ -1,6 +1,8 @@
 package com.ozs.system.service;
 
 import java.util.List;
+
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.entity.SysDictType;
 
@@ -9,8 +11,7 @@ import com.ozs.common.core.domain.entity.SysDictType;
  *
  * @author ruoyi
  */
-public interface ISysDictTypeService
-{
+public interface ISysDictTypeService {
     /**
      * 根据条件分页查询字典类型
      *
@@ -95,4 +96,11 @@ public interface ISysDictTypeService
      * @return 结果
      */
     public String checkDictTypeUnique(SysDictType dictType);
+
+    /**
+     * 获取年度计划信息中的枚举类信息(下拉框数据)
+     *
+     * @return 年度计划信息中的枚举类信息(下拉框数据)
+     */
+    public AjaxResult getAboutEnums();
 }

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

@@ -1,11 +1,18 @@
 package com.ozs.system.service.impl;
 
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.PlanPurchaseMode;
+import com.ozs.common.enums.ProjectAttribute;
+import com.ozs.common.enums.ProjectStatus;
+import com.ozs.common.enums.ProjectTypes;
 import com.ozs.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -211,14 +218,49 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 结果
      */
     @Override
-    public String checkDictTypeUnique(SysDictType dict)
-    {
+    public String checkDictTypeUnique(SysDictType dict) {
         Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
-        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
-        {
+        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
     }
+
+    @Override
+    public AjaxResult getAboutEnums() {
+        HashMap<String, HashMap<String, String>> hashMap = new HashMap<>();
+        HashMap<String, String> projectTypesMap = new LinkedHashMap<>();
+        HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
+        HashMap<String, String> planPurchaseModesMap = new LinkedHashMap<>();
+        HashMap<String, String> projectAttributes = new LinkedHashMap<>();
+        HashMap<String, String> purchaseServices = new LinkedHashMap<>();
+        //项目类型
+        for (ProjectTypes value : ProjectTypes.values()) {
+            projectTypesMap.put(value.getInfo(), value.getCode());
+        }
+        //项目审核状态
+        for (ProjectStatus value : ProjectStatus.values()) {
+            projectStatusMap.put(value.getInfo(), value.getCode());
+        }
+        //采购方式
+        for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
+            planPurchaseModesMap.put(value.getInfo(), value.getCode());
+        }
+        //项目属性
+        for (ProjectAttribute value : ProjectAttribute.values()) {
+            projectAttributes.put(value.getInfo(), value.getCode());
+        }
+        List<SysDictData> data = dictDataMapper.selectDictDataByType("purchase_services");
+        //采购服务站
+        for (SysDictData dictData : data) {
+            purchaseServices.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
+        hashMap.put("ProjectTypes", projectTypesMap);
+        hashMap.put("ProjectStatus", projectStatusMap);
+        hashMap.put("PlanPurchaseModes", planPurchaseModesMap);
+        hashMap.put("ProjectAttributes", projectAttributes);
+        hashMap.put("purchaseServices", purchaseServices);
+        return AjaxResult.success(hashMap);
+    }
 }