buzhanyi 2 éve
szülő
commit
135dbd134b

+ 10 - 0
purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -270,5 +270,15 @@ public class PlanQuarterController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "导入年度计划数据")
+    @PostMapping("/importPlanYearsData")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:importPlanYearsData')")
+    @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
+    public AjaxResult importPlanYearsData(@RequestBody List<Long> planYearIds) throws Exception {
+        if (ObjectUtils.isEmpty(planYearIds)) {
+            return error("请选择要创建的计划!");
+        }
+        return quarterService.importPlanYearsData(planYearIds);
+    }
 
 }

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

@@ -200,7 +200,8 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "填写采购服务站")
     @PostMapping("/adPurchaseServices")
-    @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
+    //@PreAuthorize("@ss.hasPermi('plan:planYears:adPurchaseServices')")
+    @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult adPurchaseServices(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.adPurchaseServices(yearsStandardVo);
     }

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

@@ -62,11 +62,10 @@ public class PlanQuarter {
      */
     @NotNull(message = "概算金额不能为空")
     private BigDecimal evaluation;
-    ///**
-    // * 是否为超限额计划(0:未超额,1:超额)
-    // */
-    //@NotNull(message = "是否为超限额计划不能为空")
-    //private String isExcess;
+    /**
+     * 是否为超限额计划(0:未超额,1:超额)
+     */
+    private String isExcess;
     /**
      * 采购服务站
      */

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

@@ -54,7 +54,10 @@ public class PlanYears {
      */
     @NotNull(message = "概算金额不能为空")
     private BigDecimal evaluation;
-
+    /**
+     * 是否为超限额计划(0:未超额,1:超额)
+     */
+    private String isExcess;
     /**
      * 采购服务站
      */

+ 8 - 0
purchase-system/src/main/java/com/ozs/plan/service/PlanQuarterService.java

@@ -148,4 +148,12 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      * 查询审核分页
      */
     List<PlanQuarter> queryPage(PlanQuarterStandardVo vo);
+
+    /**
+     * 导入年度计划数据
+     *
+     * @param planYearIds
+     * @return
+     */
+    AjaxResult importPlanYearsData(List<Long> planYearIds);
 }

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

@@ -611,6 +611,37 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return query;
     }
 
+    /**
+     * 导入年度计划数据
+     *
+     * @param planYearIds
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult importPlanYearsData(List<Long> planYearIds) {
+        StringBuilder sb = new StringBuilder("项目【'");
+        for (Long yearId : planYearIds) {
+            PlanQuarter byPlanYearId = planQuarterMapper.getByPlanYearId(yearId);
+            if (!ObjectUtils.isEmpty(byPlanYearId)) {
+                sb.append(byPlanYearId.getProjectName() + "'、'");
+            } else {
+                PlanQuarter quarter = new PlanQuarter();
+                PlanYears years = planYearsMapper.getById(yearId);
+                BeanUtils.copyProperties(years, quarter);
+                quarter.setPlanYearId(yearId);
+                quarter.setPlanType(0);
+                quarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+                planQuarterMapper.insert(quarter);
+            }
+        }
+        sb.append("】已存在,请勿选择。");
+        if (sb.length() > 14) {
+            return AjaxResult.success(sb);
+        }
+        return AjaxResult.success();
+    }
+
     //字段赋值对应的名称
     public List<PlanQuarterResponseVo> changeTo(List<PlanQuarter> planQuarters) {
         //获取季度计划各个季度提报时间的阈值