年度计划重命名

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

@@ -26,7 +26,7 @@ import java.util.List;
  * @author buzhanyi
  */
 @RestController
-@RequestMapping("/plan/planOfYears")
+@RequestMapping("/plan/PlanYears")
 public class PlanYearsController extends BaseController {
     @Autowired
     private PlanYearsService planYearsService;
@@ -37,7 +37,7 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         startPage();
-        List<PlanYears> list = planYearsService.selectPlanOfYearsList(yearsStandardVo);
+        List<PlanYears> list = planYearsService.selectPlanYearsList(yearsStandardVo);
         return getDataTable(list);
     }
 
@@ -48,7 +48,7 @@ public class PlanYearsController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(request);
         yearsStandardVo.setPurchaseUnit(loginUser.getDeptId());
         yearsStandardVo.setCreateBy(String.valueOf(loginUser.getUserId()));
-        return planYearsService.insertPlanOfYears(yearsStandardVo);
+        return planYearsService.insertPlanYears(yearsStandardVo);
     }
 
     @ApiOperation(value = "修改年度计划")
@@ -66,7 +66,7 @@ public class PlanYearsController extends BaseController {
     @ApiOperation(value = "删除年度计划")
     @PostMapping("/delete")
     public AjaxResult delete(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        return planYearsService.deletePlanOfYearsById(yearsStandardVo.getPlanYearId());
+        return planYearsService.deletePlanYearsById(yearsStandardVo.getPlanYearId());
     }
 
     @ApiOperation(value = "根据id获取年度计划信息")
@@ -93,7 +93,7 @@ public class PlanYearsController extends BaseController {
         ExcelUtil<PlanYears> util = new ExcelUtil<>(PlanYears.class);
         List<PlanYears> planYears = util.importExcel(file.getInputStream());
         String operName = getUsername();
-        String message = planYearsService.importPlanOfYears(planYears, updateSupport, operName);
+        String message = planYearsService.importPlanYears(planYears, updateSupport, operName);
         return success(message);
     }
 

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

@@ -20,14 +20,14 @@ public interface PlanYearsService {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYears> selectPlanOfYearsList(PlanYearsStandardVo vo);
+    public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
 
     /**
      * 创建年度计划
      *
      * @param yearsStandardVo 年度计划请求对象
      */
-    public AjaxResult insertPlanOfYears(PlanYearsStandardVo yearsStandardVo);
+    public AjaxResult insertPlanYears(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 批量删除年度计划
@@ -35,7 +35,7 @@ public interface PlanYearsService {
      * @param planIds 需要删除的年度计划ID
      * @return 结果
      */
-    public AjaxResult deletePlanOfYearsByIds(Long[] planIds);
+    public AjaxResult deletePlanYearsByIds(Long[] planIds);
 
     /**
      * 批量删除年度计划
@@ -43,7 +43,7 @@ public interface PlanYearsService {
      * @param planYearId 需要删除的年度计划ID
      * @return 结果
      */
-    public AjaxResult deletePlanOfYearsById(Long planYearId);
+    public AjaxResult deletePlanYearsById(Long planYearId);
 
     /**
      * 根据id获取年度计划信息
@@ -66,7 +66,7 @@ public interface PlanYearsService {
      *
      * @return 结果
      */
-    public String importPlanOfYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName);
+    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName);
 
     /**
      * 提交年度计划

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

@@ -43,12 +43,12 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     private ISysDictTypeService dictTypeService;
 
     @Override
-    public List<PlanYears> selectPlanOfYearsList(PlanYearsStandardVo vo) {
+    public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         List<PlanYears> planYears = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
-            planYears = planYearsMapper.selectPlanOfYearsList(ofYears);
+            planYears = planYearsMapper.selectPlanYearsList(ofYears);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -56,7 +56,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     }
 
     @Override
-    public AjaxResult insertPlanOfYears(PlanYearsStandardVo yearsStandardVo) {
+    public AjaxResult insertPlanYears(PlanYearsStandardVo yearsStandardVo) {
         if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()).size() > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
@@ -92,19 +92,19 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         }
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
-        planYearsMapper.insertPlanOfYears(ofYears);
+        planYearsMapper.insertPlanYears(ofYears);
         return AjaxResult.success();
     }
 
     @Override
-    public AjaxResult deletePlanOfYearsByIds(Long[] planIds) {
-        planYearsMapper.deletePlanOfYearsByIds(planIds);
+    public AjaxResult deletePlanYearsByIds(Long[] planIds) {
+        planYearsMapper.deletePlanYearsByIds(planIds);
         return AjaxResult.success();
     }
 
     @Override
-    public AjaxResult deletePlanOfYearsById(Long planId) {
-        planYearsMapper.deletePlanOfYearsById(planId);
+    public AjaxResult deletePlanYearsById(Long planId) {
+        planYearsMapper.deletePlanYearsById(planId);
         return AjaxResult.success();
     }
 
@@ -160,7 +160,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     }
 
     @Override
-    public String importPlanOfYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName) {
+    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName) {
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
             throw new ServiceException("导入年度计划数据不能为空！");
         }
@@ -181,7 +181,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                 if (plan.size() == 0) {
                     //将录入信息中的值更改为要保存的数据
 
-                    planYearsMapper.insertPlanOfYears(ofYear);
+                    planYearsMapper.insertPlanYears(ofYear);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 导入成功");
                 } else if (isUpdateSupport) {
@@ -215,7 +215,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
 
     @Override
     public AjaxResult commit(PlanYearsStandardVo yearsStandardVo) {
-        //PlanOfYears byId = planOfYearsMapper.getById(yearsStandardVo.getPlanYearId());
+        //PlanYears byId = PlanYearsMapper.getById(yearsStandardVo.getPlanYearId());
         //BigDecimal evaluation = byId.getEvaluation();
         //BigDecimal threshold = new BigDecimal(0);
         ////获取各个项目类型设定的概算金额阈值