Browse Source

DeBugDeBugDeBug

buzhanyi 2 years ago
parent
commit
3f6636c595

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

@@ -81,7 +81,6 @@ public class ProvisionalPlanController extends BaseController {
         // 项目状态(0:计划待提交,1:计划待审核,2:计划已退回,3:计划已审核)
         provisionalPlan.setProjectStatus("0");
         // 计算是否超限额计划 *** 改为前端录入
-        // provisionalPlan.setIsExcess(iSysDeptService.isExcessOrNo(provisionalPlan.getProjectType(), provisionalPlan.getEvaluation(), Long.valueOf(provisionalPlan.getPurchaseDeptId())));
         boolean save = provisionalPlanService.save(provisionalPlan);
         log.info("provisionalPlan的主键id:{}", provisionalPlan.getPlanPracticalId());
         List<SysFileRef> sysFileRefs = provisionalPlan.getSysFileRefs();
@@ -113,7 +112,7 @@ public class ProvisionalPlanController extends BaseController {
         return toAjax(provisionalPlanService.deleteProvisionalPlanById(provisionalPlan.getPlanPracticalId()));
     }
 
-    @ApiOperation(value = "修改临时计划", notes = "必传 plan_year_id 及修改数据")
+    @ApiOperation(value = "修改临时计划" , notes = "必传 planPracticalId 及修改数据")
     @PostMapping("/updateProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:updateProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)

BIN
purchase-admin/src/main/resources/template/plan_year.xlsx


BIN
purchase-admin/src/main/resources/template/provisionalPlan.xlsx


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

@@ -214,7 +214,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
         planYearsMapper.insertPlanYears(ofYears);
-        log.info("id:{}", ofYears.getPlanYearId());
+        log.info("id:{}" , ofYears.getPlanYearId());
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -397,7 +397,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         }
                         String zs = zBuilder.toString();
                         if (zs.endsWith(",")) {
-                            zBuilder = null;
+                            zBuilder.replace(0, zBuilder.length(), "");
                             zBuilder.append(zs.substring(0, zs.length() - 1));
                         }
                     } else {
@@ -1050,13 +1050,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         Map<String, Object> params = vo.getParams();
         if (!ObjectUtils.isEmpty(vo.getParams())) {
             if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
-                params.put("beginTime", vo.getParams().get("beginTime").toString() + "-01");
+                params.put("beginTime" , vo.getParams().get("beginTime").toString() + "-01");
             }
             if (!ObjectUtils.isEmpty(vo.getParams().get("endTime"))) {
                 SimpleDateFormat dateFormaH = new SimpleDateFormat("yyyy-MM");
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 Date ofMonth = DateUtils.getLastDayOfMonth(dateFormaH.parse(vo.getParams().get("endTime").toString()));
-                params.put("endTime", dateFormat.format(ofMonth) + " 23:59:59:999");
+                params.put("endTime" , dateFormat.format(ofMonth) + " 23:59:59:999");
             }
         }
         vo.setParams(params);
@@ -1114,8 +1114,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     private List<SysFileInfo> getSysFileInfoList(Long redId, Integer type) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", redId);
-        map.put("type", type);
+        map.put("red_id" , redId);
+        map.put("type" , type);
         List<SysFileRef> fileRefs = sysFileRefService.listByMap(map);
         if (!ObjectUtils.isEmpty(fileRefs)) {
             List<SysFileInfo> fileInfos = new ArrayList<>();