新需求变更

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

@@ -234,6 +234,14 @@ public class PlanYearsController extends BaseController {
         return planYearsService.appUpdate(yearsStandardVo);
     }
 
+    @ApiOperation(value = "申请撤销年度计划")
+    @PostMapping("/appUpdate")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:appDelete')")
+    @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
+    public AjaxResult appDelete(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.appDelete(yearsStandardVo);
+    }
+
     @ApiOperation(value = "发函催告")
     @PostMapping("/sendLetter")
 //    @PreAuthorize("@ss.hasPermi('plan:planYears:sendLetter')")   首页调用注释

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

@@ -266,4 +266,12 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @return
      */
     AjaxResult adPurchaseServices(PlanYearsStandardVo yearsStandardVo);
+
+    /**
+     * 申请撤销年度计划
+     *
+     * @param yearsStandardVo
+     * @return
+     */
+    AjaxResult appDelete(PlanYearsStandardVo yearsStandardVo);
 }

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

@@ -1354,6 +1354,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success("成功");
     }
 
+    @Override
+    public AjaxResult appDelete(PlanYearsStandardVo yearsStandardVo) {
+        return null;
+    }
+
     /**
      * 根据年度计划提报时间的阈值进行提示
      *

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

@@ -208,11 +208,18 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
     @Override
     public HashMap<String, HashMap<String, String>> getAboutEnums() {
         HashMap<String, HashMap<String, String>> hashMap = new HashMap<>();
+        //项目类型(计划审核)
         HashMap<String, String> projectTypesMap = new LinkedHashMap<>();
+        //项目类型(计划添加)
         HashMap<String, String> projectTypesAdMap = new LinkedHashMap<>();
+        //项目审核状态
         HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
+        //项目属性
         HashMap<String, String> projectAttributes = new LinkedHashMap<>();
+        //预算科目
         HashMap<String, String> budgetAccountMap = new LinkedHashMap<>();
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = new LinkedHashMap<>();
 
         //项目审核状态
         for (ProjectStatus value : ProjectStatus.values()) {
@@ -238,12 +245,18 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         for (SysDictData dictData : data4) {
             budgetAccountMap.put(dictData.getDictLabel(), dictData.getDictValue());
         }
+        //采购服务站
+        List<SysDictData> data5 = dictDataMapper.selectDictDataByType(Constants.PURCHASE_SERVICES);
+        for (SysDictData dictData : data5) {
+            purchaseServicesMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
 
         hashMap.put("projectTypes", projectTypesMap);
         hashMap.put("projectTypesAds", projectTypesAdMap);
         hashMap.put("projectStatus", projectStatusMap);
         hashMap.put("projectAttributes", projectAttributes);
         hashMap.put("budgetAccount", budgetAccountMap);
+        hashMap.put("purchaseServices", purchaseServicesMap);
         return hashMap;
     }
 }