年度计划重命名

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/plan/about")
-public class EnumsOfPlanController extends BaseController {
+public class PlanEnumsController extends BaseController {
 
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -29,7 +29,7 @@ public class EnumsOfPlanController extends BaseController {
     @ApiOperation(value = "年度计划信息中的枚举类信息(下拉框数据)")
     @PostMapping("/getAboutEnums")
     public AjaxResult getAboutEnums() {
-        return dictTypeService.getAboutEnums();
+        return AjaxResult.success(dictTypeService.getAboutEnums());
     }
 
 }

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

@@ -2,14 +2,13 @@ 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.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
-import com.ozs.plan.doman.PlanOfYears;
-import com.ozs.plan.doman.vo.requestVo.PlanOfYearsStandardVo;
-import com.ozs.plan.service.PlanOfYearsService;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+import com.ozs.plan.service.PlanYearsService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,73 +27,73 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/plan/planOfYears")
-public class PlanOfYearsController extends BaseController {
+public class PlanYearsController extends BaseController {
     @Autowired
-    private PlanOfYearsService planOfYearsService;
+    private PlanYearsService planYearsService;
     @Autowired
     private TokenService tokenService;
 
     @ApiOperation(value = "查询年度计划")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
+    public TableDataInfo list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         startPage();
-        List<PlanOfYears> list = planOfYearsService.selectPlanOfYearsList(yearsStandardVo);
+        List<PlanYears> list = planYearsService.selectPlanOfYearsList(yearsStandardVo);
         return getDataTable(list);
     }
 
     @ApiOperation(value = "创建年度计划")
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody PlanOfYearsStandardVo yearsStandardVo, HttpServletRequest request) {
+    public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         //获取采购单位-
         LoginUser loginUser = tokenService.getLoginUser(request);
         yearsStandardVo.setPurchaseUnit(loginUser.getDeptId());
         yearsStandardVo.setCreateBy(String.valueOf(loginUser.getUserId()));
-        return planOfYearsService.insertPlanOfYears(yearsStandardVo);
+        return planYearsService.insertPlanOfYears(yearsStandardVo);
     }
 
     @ApiOperation(value = "修改年度计划")
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.update(yearsStandardVo);
+    public AjaxResult update(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.update(yearsStandardVo);
     }
 
     @ApiOperation(value = "提交年度计划")
     @PostMapping("/commit")
-    public AjaxResult commit(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.commit(yearsStandardVo);
+    public AjaxResult commit(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.commit(yearsStandardVo);
     }
 
     @ApiOperation(value = "删除年度计划")
     @PostMapping("/delete")
-    public AjaxResult delete(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.deletePlanOfYearsById(yearsStandardVo.getPlanYearId());
+    public AjaxResult delete(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.deletePlanOfYearsById(yearsStandardVo.getPlanYearId());
     }
 
     @ApiOperation(value = "根据id获取年度计划信息")
     @PostMapping("/view")
-    public AjaxResult view(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.view(yearsStandardVo);
+    public AjaxResult view(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.view(yearsStandardVo);
     }
 
     @ApiOperation(value = "审核年度计划通过")
     @PostMapping("/reviewTo")
-    public AjaxResult reviewTo(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.reviewTo(yearsStandardVo);
+    public AjaxResult reviewTo(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.reviewTo(yearsStandardVo);
     }
 
     @ApiOperation(value = "审核年度计划退回")
     @PostMapping("/reviewReturn")
-    public AjaxResult reviewReturn(@RequestBody PlanOfYearsStandardVo yearsStandardVo) {
-        return planOfYearsService.reviewReturn(yearsStandardVo);
+    public AjaxResult reviewReturn(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.reviewReturn(yearsStandardVo);
     }
 
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<PlanOfYears> util = new ExcelUtil<>(PlanOfYears.class);
-        List<PlanOfYears> planOfYears = util.importExcel(file.getInputStream());
+        ExcelUtil<PlanYears> util = new ExcelUtil<>(PlanYears.class);
+        List<PlanYears> planYears = util.importExcel(file.getInputStream());
         String operName = getUsername();
-        String message = planOfYearsService.importPlanOfYears(planOfYears, updateSupport, operName);
+        String message = planYearsService.importPlanOfYears(planYears, updateSupport, operName);
         return success(message);
     }
 

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

@@ -14,7 +14,7 @@ import java.util.Date;
  * @author buzhanyi
  */
 @Data
-public class PlanOfYears extends BaseEntity {
+public class PlanYears extends BaseEntity {
 
     /**
      * 主键编号

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * @author buzhanyi
  */
 @Data
-public class PlanOfYearsStandardVo extends BaseEntity {
+public class PlanYearsStandardVo extends BaseEntity {
 
     /**
      * 主键编号

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

@@ -12,7 +12,7 @@ import java.util.Date;
  * @author buzhanyi
  */
 @Data
-public class PlanOfYearsResponseVo {
+public class PlanYearsResponseVo {
 
     /**
      * 主键编号

purchase-system/src/main/java/com/ozs/plan/mapper/PlanOfYearsMapper.java

@@ -1,8 +1,7 @@
 package com.ozs.plan.mapper;
 
 
-import com.ozs.base.mapper.BaseSupplierMapper;
-import com.ozs.plan.doman.PlanOfYears;
+import com.ozs.plan.doman.PlanYears;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,22 +13,22 @@ import java.util.List;
  * @author bu
  */
 @Mapper
-public interface PlanOfYearsMapper {
+public interface PlanYearsMapper {
 
     /**
      * 查询年度计划记录集合
      *
-     * @param planOfYears 年度计划请求对象
+     * @param planYears 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanOfYears> selectPlanOfYearsList(PlanOfYears planOfYears);
+    public List<PlanYears> selectPlanYearsList(PlanYears planYears);
 
     /**
      * 创建年度计划
      *
-     * @param planOfYears 年度计划请求对象
+     * @param planYears 年度计划请求对象
      */
-    public int insertPlanOfYears(PlanOfYears planOfYears);
+    public int insertPlanYears(PlanYears planYears);
 
     /**
      * 批量删除年度计划
@@ -37,7 +36,7 @@ public interface PlanOfYearsMapper {
      * @param planIds 需要删除的年度计划ID
      * @return 结果
      */
-    public int deletePlanOfYearsByIds(Long[] planIds);
+    public int deletePlanYearsByIds(Long[] planIds);
 
     /**
      * 查询项目名称是否存在
@@ -45,7 +44,7 @@ public interface PlanOfYearsMapper {
      * @param projectName 项目名称
      * @return 结果
      */
-    public List<PlanOfYears> countProjectName(String projectName);
+    public List<PlanYears> countProjectName(String projectName);
 
     /**
      * 查询年度计划
@@ -53,7 +52,7 @@ public interface PlanOfYearsMapper {
      * @param planYearId 年度计划ID
      * @return 结果
      */
-    public PlanOfYears getById(Long planYearId);
+    public PlanYears getById(Long planYearId);
 
     /**
      * 查询项目名称是否存在(除自己以外)
@@ -69,11 +68,11 @@ public interface PlanOfYearsMapper {
      * @param ofYears 年度计划
      * @return 结果
      */
-    public int updateById(PlanOfYears ofYears);
+    public int updateById(PlanYears ofYears);
 
-    public int deletePlanOfYearsById(Long planId);
+    public int deletePlanYearsById(Long planId);
 
     public int commit(Long planYearId);
 
-    public int review(PlanOfYears ofYears);
+    public int review(PlanYears ofYears);
 }

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

@@ -2,9 +2,8 @@ package com.ozs.plan.service;
 
 
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.plan.doman.PlanOfYears;
-import com.ozs.plan.doman.vo.requestVo.PlanOfYearsStandardVo;
-import com.ozs.plan.doman.vo.responseVo.PlanOfYearsResponseVo;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 
 import java.util.List;
 
@@ -13,7 +12,7 @@ import java.util.List;
  *
  * @author bu
  */
-public interface PlanOfYearsService {
+public interface PlanYearsService {
 
     /**
      * 查询年度计划记录集合
@@ -21,14 +20,14 @@ public interface PlanOfYearsService {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanOfYears> selectPlanOfYearsList(PlanOfYearsStandardVo vo);
+    public List<PlanYears> selectPlanOfYearsList(PlanYearsStandardVo vo);
 
     /**
      * 创建年度计划
      *
      * @param yearsStandardVo 年度计划请求对象
      */
-    public AjaxResult insertPlanOfYears(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult insertPlanOfYears(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 批量删除年度计划
@@ -52,7 +51,7 @@ public interface PlanOfYearsService {
      * @param yearsStandardVo 年度计划请求对象
      * @return 结果
      */
-    public AjaxResult view(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult view(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 修改年度计划
@@ -60,14 +59,14 @@ public interface PlanOfYearsService {
      * @param yearsStandardVo 修改年度计划请求对象
      * @return 结果
      */
-    public AjaxResult update(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult update(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 导入年度计划数据
      *
      * @return 结果
      */
-    public String importPlanOfYears(List<PlanOfYears> planOfYears, boolean isUpdateSupport, String operName);
+    public String importPlanOfYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName);
 
     /**
      * 提交年度计划
@@ -75,7 +74,7 @@ public interface PlanOfYearsService {
      * @param yearsStandardVo 提交年度计划请求对象
      * @return 结果
      */
-    public AjaxResult commit(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult commit(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 审核年度计划
@@ -83,7 +82,7 @@ public interface PlanOfYearsService {
      * @param yearsStandardVo 需要审核的年度计划
      * @return 结果
      */
-    public AjaxResult reviewTo(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult reviewTo(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 审核年度计划退回
@@ -91,5 +90,5 @@ public interface PlanOfYearsService {
      * @param yearsStandardVo 需要审核的年度计划
      * @return 结果
      */
-    public AjaxResult reviewReturn(PlanOfYearsStandardVo yearsStandardVo);
+    public AjaxResult reviewReturn(PlanYearsStandardVo yearsStandardVo);
 }

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

@@ -8,11 +8,11 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
-import com.ozs.plan.doman.PlanOfYears;
-import com.ozs.plan.doman.vo.requestVo.PlanOfYearsStandardVo;
-import com.ozs.plan.doman.vo.responseVo.PlanOfYearsResponseVo;
-import com.ozs.plan.mapper.PlanOfYearsMapper;
-import com.ozs.plan.service.PlanOfYearsService;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
+import com.ozs.plan.mapper.PlanYearsMapper;
+import com.ozs.plan.service.PlanYearsService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.impl.SysUserServiceImpl;
 import org.slf4j.Logger;
@@ -32,35 +32,35 @@ import java.util.List;
  * @author buzhanyi
  */
 @Service
-public class PlanOfYearsServiceImpl implements PlanOfYearsService {
+public class PlanYearsServiceImpl implements PlanYearsService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
-    PlanOfYearsMapper planOfYearsMapper;
+    PlanYearsMapper planYearsMapper;
     @Autowired
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
 
     @Override
-    public List<PlanOfYears> selectPlanOfYearsList(PlanOfYearsStandardVo vo) {
-        PlanOfYears ofYears = new PlanOfYears();
-        List<PlanOfYears> planOfYears = new ArrayList<>();
+    public List<PlanYears> selectPlanOfYearsList(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
+        List<PlanYears> planYears = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
-            planOfYears = planOfYearsMapper.selectPlanOfYearsList(ofYears);
+            planYears = planYearsMapper.selectPlanOfYearsList(ofYears);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return planOfYears;
+        return planYears;
     }
 
     @Override
-    public AjaxResult insertPlanOfYears(PlanOfYearsStandardVo yearsStandardVo) {
-        if (planOfYearsMapper.countProjectName(yearsStandardVo.getProjectName()).size() > 0) {
+    public AjaxResult insertPlanOfYears(PlanYearsStandardVo yearsStandardVo) {
+        if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()).size() > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        PlanOfYears ofYears = new PlanOfYears();
+        PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
         } catch (Exception e) {
@@ -92,39 +92,39 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
         }
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
-        planOfYearsMapper.insertPlanOfYears(ofYears);
+        planYearsMapper.insertPlanOfYears(ofYears);
         return AjaxResult.success();
     }
 
     @Override
     public AjaxResult deletePlanOfYearsByIds(Long[] planIds) {
-        planOfYearsMapper.deletePlanOfYearsByIds(planIds);
+        planYearsMapper.deletePlanOfYearsByIds(planIds);
         return AjaxResult.success();
     }
 
     @Override
     public AjaxResult deletePlanOfYearsById(Long planId) {
-        planOfYearsMapper.deletePlanOfYearsById(planId);
+        planYearsMapper.deletePlanOfYearsById(planId);
         return AjaxResult.success();
     }
 
     @Override
-    public AjaxResult view(PlanOfYearsStandardVo yearsStandardVo) {
-        PlanOfYearsResponseVo planOfYearsResponseVo = new PlanOfYearsResponseVo();
-        PlanOfYears byId = planOfYearsMapper.getById(yearsStandardVo.getPlanYearId());
+    public AjaxResult view(PlanYearsStandardVo yearsStandardVo) {
+        PlanYearsResponseVo planYearsResponseVo = new PlanYearsResponseVo();
+        PlanYears byId = planYearsMapper.getById(yearsStandardVo.getPlanYearId());
         if (byId == null) {
             return AjaxResult.error("数据查询失败");
         }
-        BeanUtils.copyProperties(byId, planOfYearsResponseVo);
-        return AjaxResult.success(planOfYearsResponseVo);
+        BeanUtils.copyProperties(byId, planYearsResponseVo);
+        return AjaxResult.success(planYearsResponseVo);
     }
 
     @Override
-    public AjaxResult update(PlanOfYearsStandardVo yearsStandardVo) {
-        if (planOfYearsMapper.countProjectNameOther(yearsStandardVo.getProjectName(), String.valueOf(yearsStandardVo.getPlanYearId())) > 0) {
+    public AjaxResult update(PlanYearsStandardVo yearsStandardVo) {
+        if (planYearsMapper.countProjectNameOther(yearsStandardVo.getProjectName(), String.valueOf(yearsStandardVo.getPlanYearId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        PlanOfYears ofYears = new PlanOfYears();
+        PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
         } catch (Exception e) {
@@ -155,34 +155,42 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
             ofYears.setIsExcess("0");
         }
 
-        planOfYearsMapper.updateById(ofYears);
+        planYearsMapper.updateById(ofYears);
         return AjaxResult.success();
     }
 
     @Override
-    public String importPlanOfYears(List<PlanOfYears> planOfYears, boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(planOfYears) || planOfYears.size() == 0) {
+    public String importPlanOfYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(planYears) || planYears.size() == 0) {
             throw new ServiceException("导入年度计划数据不能为空！");
         }
+        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
+        HashMap<String, String> projectTypesMap = planEnums.get("ProjectTypes");
+        HashMap<String, String> projectStatusMap = planEnums.get("ProjectStatus");
+        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;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        for (PlanOfYears ofYear : planOfYears) {
+        for (PlanYears ofYear : planYears) {
             try {
                 //验证项目名称是否重复导入
-                List<PlanOfYears> plan = planOfYearsMapper.countProjectName(ofYear.getProjectName());
+                List<PlanYears> plan = planYearsMapper.countProjectName(ofYear.getProjectName());
                 if (plan.size() == 0) {
-                    planOfYearsMapper.insertPlanOfYears(ofYear);
+                    //将录入信息中的值更改为要保存的数据
+
+                    planYearsMapper.insertPlanOfYears(ofYear);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 导入成功");
                 } else if (isUpdateSupport) {
-                    PlanOfYears years = plan.get(0);
+                    PlanYears years = plan.get(0);
                     BeanValidators.validateWithException(validator, ofYear);
                     years.setCreateBy(operName);
                     years.setCreateTime(new Date());
                     years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    planOfYearsMapper.updateById(years);
+                    planYearsMapper.updateById(years);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
@@ -206,7 +214,7 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
     }
 
     @Override
-    public AjaxResult commit(PlanOfYearsStandardVo yearsStandardVo) {
+    public AjaxResult commit(PlanYearsStandardVo yearsStandardVo) {
         //PlanOfYears byId = planOfYearsMapper.getById(yearsStandardVo.getPlanYearId());
         //BigDecimal evaluation = byId.getEvaluation();
         //BigDecimal threshold = new BigDecimal(0);
@@ -230,7 +238,7 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
         //    //是超额项目
         //}
 
-        int commit = planOfYearsMapper.commit(yearsStandardVo.getPlanYearId());
+        int commit = planYearsMapper.commit(yearsStandardVo.getPlanYearId());
         if (commit != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -238,11 +246,11 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
     }
 
     @Override
-    public AjaxResult reviewTo(PlanOfYearsStandardVo vo) {
-        PlanOfYears ofYears = new PlanOfYears();
+    public AjaxResult reviewTo(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
         ofYears.setPlanYearId(vo.getPlanYearId());
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        int review = planOfYearsMapper.review(ofYears);
+        int review = planYearsMapper.review(ofYears);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -250,11 +258,11 @@ public class PlanOfYearsServiceImpl implements PlanOfYearsService {
     }
 
     @Override
-    public AjaxResult reviewReturn(PlanOfYearsStandardVo vo) {
-        PlanOfYears ofYears = new PlanOfYears();
+    public AjaxResult reviewReturn(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
         BeanUtils.copyProperties(vo, ofYears);
         ofYears.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        int review = planOfYearsMapper.review(ofYears);
+        int review = planYearsMapper.review(ofYears);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

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

@@ -1,5 +1,6 @@
 package com.ozs.system.service;
 
+import java.util.HashMap;
 import java.util.List;
 
 import com.ozs.common.core.domain.AjaxResult;
@@ -102,5 +103,5 @@ public interface ISysDictTypeService {
      *
      * @return 年度计划信息中的枚举类信息(下拉框数据)
      */
-    public AjaxResult getAboutEnums();
+    public HashMap<String, HashMap<String, String>> getAboutEnums();
 }

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

@@ -32,8 +32,7 @@ import com.ozs.system.mapper.SysDictTypeMapper;
  * @author ruoyi
  */
 @Service
-public class SysDictTypeServiceImpl implements ISysDictTypeService
-{
+public class SysDictTypeServiceImpl implements ISysDictTypeService {
     @Autowired
     private SysDictTypeMapper dictTypeMapper;
 
@@ -44,8 +43,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 项目启动时，初始化字典到缓存
      */
     @PostConstruct
-    public void init()
-    {
+    public void init() {
         loadingDictCache();
     }
 
@@ -56,8 +54,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictType> selectDictTypeList(SysDictType dictType)
-    {
+    public List<SysDictType> selectDictTypeList(SysDictType dictType) {
         return dictTypeMapper.selectDictTypeList(dictType);
     }
 
@@ -67,8 +64,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictType> selectDictTypeAll()
-    {
+    public List<SysDictType> selectDictTypeAll() {
         return dictTypeMapper.selectDictTypeAll();
     }
 
@@ -79,16 +75,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictData> selectDictDataByType(String dictType)
-    {
+    public List<SysDictData> selectDictDataByType(String dictType) {
         List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
+        if (StringUtils.isNotEmpty(dictDatas)) {
             return dictDatas;
         }
         dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
+        if (StringUtils.isNotEmpty(dictDatas)) {
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
@@ -102,8 +95,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeById(Long dictId)
-    {
+    public SysDictType selectDictTypeById(Long dictId) {
         return dictTypeMapper.selectDictTypeById(dictId);
     }
 
@@ -114,8 +106,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeByType(String dictType)
-    {
+    public SysDictType selectDictTypeByType(String dictType) {
         return dictTypeMapper.selectDictTypeByType(dictType);
     }
 
@@ -125,13 +116,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @param dictIds 需要删除的字典ID
      */
     @Override
-    public void deleteDictTypeByIds(Long[] dictIds)
-    {
-        for (Long dictId : dictIds)
-        {
+    public void deleteDictTypeByIds(Long[] dictIds) {
+        for (Long dictId : dictIds) {
             SysDictType dictType = selectDictTypeById(dictId);
-            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
-            {
+            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
             dictTypeMapper.deleteDictTypeById(dictId);
@@ -143,13 +131,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 加载字典缓存数据
      */
     @Override
-    public void loadingDictCache()
-    {
+    public void loadingDictCache() {
         SysDictData dictData = new SysDictData();
         dictData.setStatus("0");
         Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
-        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet())
-        {
+        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet()) {
             DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
         }
     }
@@ -158,8 +144,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 清空字典缓存数据
      */
     @Override
-    public void clearDictCache()
-    {
+    public void clearDictCache() {
         DictUtils.clearDictCache();
     }
 
@@ -167,8 +152,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 重置字典缓存数据
      */
     @Override
-    public void resetDictCache()
-    {
+    public void resetDictCache() {
         clearDictCache();
         loadingDictCache();
     }
@@ -180,11 +164,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 结果
      */
     @Override
-    public int insertDictType(SysDictType dict)
-    {
+    public int insertDictType(SysDictType dict) {
         int row = dictTypeMapper.insertDictType(dict);
-        if (row > 0)
-        {
+        if (row > 0) {
             DictUtils.setDictCache(dict.getDictType(), null);
         }
         return row;
@@ -198,13 +180,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      */
     @Override
     @Transactional
-    public int updateDictType(SysDictType dict)
-    {
+    public int updateDictType(SysDictType dict) {
         SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
         int row = dictTypeMapper.updateDictType(dict);
-        if (row > 0)
-        {
+        if (row > 0) {
             List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
             DictUtils.setDictCache(dict.getDictType(), dictDatas);
         }
@@ -228,7 +208,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     }
 
     @Override
-    public AjaxResult getAboutEnums() {
+    public HashMap<String, HashMap<String, String>> getAboutEnums() {
         HashMap<String, HashMap<String, String>> hashMap = new HashMap<>();
         HashMap<String, String> projectTypesMap = new LinkedHashMap<>();
         HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
@@ -256,11 +236,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         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("projectTypes", projectTypesMap);
+        hashMap.put("projectStatus", projectStatusMap);
+        hashMap.put("planPurchaseModes", planPurchaseModesMap);
+        hashMap.put("projectAttributes", projectAttributes);
         hashMap.put("purchaseServices", purchaseServices);
-        return AjaxResult.success(hashMap);
+        return hashMap;
     }
 }

purchase-system/src/main/resources/mapper/plan/PlanOfYearsMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.plan.mapper.PlanOfYearsMapper">
+<mapper namespace="com.ozs.plan.mapper.PlanYearsMapper">
 
-	<resultMap type="com.ozs.plan.doman.PlanOfYears" id="PlanOfYearsResult">
+	<resultMap type="com.ozs.plan.doman.PlanYears" id="PlanYearsResult">
 		<id property="plan_year_id" column="planYearId"/>
 		<result property="purchase_unit" column="purchaseUnit"/>
 		<result property="project_name" column="projectName"/>
@@ -27,8 +27,8 @@
 		<result property="is_delete" column="isDelete"/>
 	</resultMap>
 
-	<update id="updateById" parameterType="com.ozs.plan.doman.PlanOfYears">
-		update plan_of_years
+	<update id="updateById" parameterType="com.ozs.plan.doman.PlanYears">
+		update plan_years
 		set purchase_unit=#{purchaseUnit},
 			project_name=#{projectName},
 			project_type=#{projectType},
@@ -47,8 +47,8 @@
 		where plan_year_id = #{planYearId}
 	</update>
 
-	<select id="selectPlanOfYearsList" parameterType="com.ozs.plan.doman.PlanOfYears" resultMap="PlanOfYearsResult">
-		select * from plan_of_years
+	<select id="selectPlanYearsList" parameterType="com.ozs.plan.doman.PlanYears" resultMap="PlanYearsResult">
+		select * from plan_years
 		<where>
 			<if test="projectName != null and projectName != ''">
 				AND project_name like concat('%', #{projectName}, '%')
@@ -73,63 +73,63 @@
 		order by create_time desc
 	</select>
 
-	<select id="countProjectName" resultType="com.ozs.plan.doman.PlanOfYears" parameterType="java.lang.String">
+	<select id="countProjectName" resultType="com.ozs.plan.doman.PlanYears" parameterType="java.lang.String">
 		select *
-		from plan_of_years
+		from plan_years
 		where project_name = #{projectName}
 		  and is_delete = 0
 	</select>
 
-	<select id="getById" resultType="com.ozs.plan.doman.PlanOfYears" parameterType="java.lang.Long">
+	<select id="getById" resultType="com.ozs.plan.doman.PlanYears" parameterType="java.lang.Long">
 		select *
-		from plan_of_years
+		from plan_years
 		where plan_year_id = #{planYearId}
 		  and is_delete = 0
 	</select>
 
 	<select id="countProjectNameOther" resultType="java.lang.Integer" parameterType="java.lang.String">
-		select count(plan_of_years.plan_year_id)
-		from plan_of_years
+		select count(plan_years.plan_year_id)
+		from plan_years
 		where project_name = #{projectName}
 		  and plan_year_id != #{planYearId}
 		  and is_delete = 0
 	</select>
 
 	<!--	创建计划信息-->
-	<insert id="insertPlanOfYears" parameterType="com.ozs.plan.doman.PlanOfYears">
-		insert into plan_of_years (purchase_unit, project_name, project_type, demand_overview, evaluation, is_excess,
-								   purchase_services, purchase_mode, demand_commit_time, purchase_finish_time,
-								   deliver_time, project_attribute, readjust_of_plan, remarks, project_status,
-								   create_by, create_time, is_delete)
+	<insert id="insertPlanYears" parameterType="com.ozs.plan.doman.PlanYears">
+		insert into plan_years (purchase_unit, project_name, project_type, demand_overview, evaluation, is_excess,
+								purchase_services, purchase_mode, demand_commit_time, purchase_finish_time,
+								deliver_time, project_attribute, readjust_of_plan, remarks, project_status,
+								create_by, create_time, is_delete)
 		values (#{purchaseUnit}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation}, #{isExcess},
 				#{purchaseServices}, #{purchaseMode}, #{demandCommitTime}, #{purchaseFinishTime}, #{deliverTime},
 				#{projectAttribute}, #{readjustOfPlan}, #{remarks}, #{projectStatus}, #{createBy}, #{createTime}, 0)
 	</insert>
 
 	<!--	计划删除-->
-	<update id="deletePlanOfYearsByIds" parameterType="java.lang.Long">
-		update plan_of_years set is_delete=1 where plan_year_id in
+	<update id="deletePlanYearsByIds" parameterType="java.lang.Long">
+		update plan_years set is_delete=1 where plan_year_id in
 		<foreach collection="array" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
 	</update>
 
-	<update id="deletePlanOfYearsById" parameterType="java.lang.Long">
-		update plan_of_years
+	<update id="deletePlanYearsById" parameterType="java.lang.Long">
+		update plan_years
 		set is_delete=1
 		where plan_year_id = #{plan_year_id}
 	</update>
 
 	<!--	计划提交-->
 	<update id="commit" parameterType="java.lang.Long">
-		update plan_of_years
+		update plan_years
 		set project_status=1
 		where plan_year_id = #{plan_year_id}
 	</update>
 
 	<!--	计划审核-->
-	<update id="review" parameterType="com.ozs.plan.doman.PlanOfYears">
-		update plan_of_years
+	<update id="review" parameterType="com.ozs.plan.doman.PlanYears">
+		update plan_years
 		set reason_of_return=#{reasonOfReturn},
 			project_status=#{projectStatus}
 		where plan_year_id = #{planYearId}