buzhanyi 2 years ago
parent
commit
615a3332dc

+ 6 - 5
purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -87,9 +87,10 @@ public class ProvisionalPlanController extends BaseController {
         provisionalPlan.setPlanType("1");
         // 项目状态(0:计划待提交,1:计划待审核,2:计划已退回,3:计划已审核)
         provisionalPlan.setProjectStatus("0");
+        //     发函状态(0:未发函或已处理,1:确认发函)
+        provisionalPlan.setSendLetter("0");
         // 计算是否超限额计划 *** 改为前端录入
         boolean save = provisionalPlanService.save(provisionalPlan);
-        log.info("provisionalPlan的主键id:{}" , provisionalPlan.getPlanPracticalId());
         List<SysFileRef> sysFileRefs = provisionalPlan.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             if (save) {
@@ -108,7 +109,7 @@ public class ProvisionalPlanController extends BaseController {
         return toAjax(save);
     }
 
-    @ApiOperation(value = "删除临时计划" , notes = "必传 plan_practical_id")
+    @ApiOperation(value = "删除临时计划", notes = "必传 plan_practical_id")
     @PostMapping("/deleteProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:deleteProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.DELETE)
@@ -119,7 +120,7 @@ public class ProvisionalPlanController extends BaseController {
         return toAjax(provisionalPlanService.deleteProvisionalPlanById(provisionalPlan.getPlanPracticalId()));
     }
 
-    @ApiOperation(value = "修改临时计划" , notes = "必传 planPracticalId 及修改数据")
+    @ApiOperation(value = "修改临时计划", notes = "必传 planPracticalId 及修改数据")
     @PostMapping("/updateProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:updateProvisionalPlan')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.UPDATE)
@@ -134,7 +135,7 @@ public class ProvisionalPlanController extends BaseController {
         if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanPracticalId())) {
             return error("临时计划id和修改数据不能为空");
         }
-        log.info(":{}" , provisionalPlan);
+        log.info(":{}", provisionalPlan);
         // 计算是否超限额计划 *** 改为前端录入
         // provisionalPlan.setIsExcess(iSysDeptService.isExcessOrNo(provisionalPlan.getProjectType(), provisionalPlan.getEvaluation(), getDeptId()));
         return toAjax(provisionalPlanService.updateProvisionalPlanById(provisionalPlan));
@@ -265,7 +266,7 @@ public class ProvisionalPlanController extends BaseController {
             FileUtils.setAttachmentResponseHeader(response, "临时计划导入模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
         } catch (Exception e) {
-            log.error("下载文件失败" , e);
+            log.error("下载文件失败", e);
         }
     }
 

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