|
@@ -65,6 +65,8 @@ public class ProvisionalPlanController extends BaseController {
|
|
|
private TokenService tokenService;
|
|
|
@Autowired
|
|
|
private ISysDeptService iSysDeptService;
|
|
|
+ @Autowired
|
|
|
+ private PlanQuarterServiceImpl planQuarterServiceImpl;
|
|
|
|
|
|
@ApiOperation(value = "新增临时计划")
|
|
|
@PostMapping("/insertProvisionalPlan")
|
|
@@ -80,6 +82,7 @@ public class ProvisionalPlanController extends BaseController {
|
|
|
provisionalPlan.setPlanType("1");
|
|
|
// 项目状态(0:计划待提交,1:计划待审核,2:计划已退回,3:计划已审核)
|
|
|
provisionalPlan.setProjectStatus("0");
|
|
|
+ provisionalPlan.setIsExcess(planQuarterServiceImpl.isExcessOrNo(provisionalPlan.getProjectType(), provisionalPlan.getEvaluation()));
|
|
|
return toAjax(provisionalPlanService.save(provisionalPlan));
|
|
|
}
|
|
|
|
|
@@ -183,10 +186,10 @@ public class ProvisionalPlanController extends BaseController {
|
|
|
}
|
|
|
Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
|
|
|
PageInfo<ProvisionalPlan> provisionalPlanPageInfo = new PageInfo<>();
|
|
|
- if(!ObjectUtils.isEmpty(pages) && pages.getRecords().size()>0){
|
|
|
+ if (!ObjectUtils.isEmpty(pages) && pages.getRecords().size() > 0) {
|
|
|
provisionalPlanPageInfo.setList(pages.getRecords());
|
|
|
provisionalPlanPageInfo.setTotal(pages.getTotal());
|
|
|
- provisionalPlanPageInfo.setPages(Integer.parseInt(pages.getPages()+""));
|
|
|
+ provisionalPlanPageInfo.setPages(Integer.parseInt(pages.getPages() + ""));
|
|
|
}
|
|
|
return success(provisionalPlanPageInfo);
|
|
|
}
|
|
@@ -273,6 +276,8 @@ public class ProvisionalPlanController extends BaseController {
|
|
|
PageInfo<ProvisionalPlan> provisionalPlanPageInfo = new PageInfo<>();
|
|
|
if (!ObjectUtils.isEmpty(pages) && pages.getRecords().size() > 0) {
|
|
|
provisionalPlanPageInfo.setList(pages.getRecords());
|
|
|
+ provisionalPlanPageInfo.setSize(Math.toIntExact(pages.getSize()));
|
|
|
+ provisionalPlanPageInfo.setPageNum(Math.toIntExact(pages.getCurrent()));
|
|
|
provisionalPlanPageInfo.setTotal(pages.getTotal());
|
|
|
provisionalPlanPageInfo.setPages(Integer.parseInt(pages.getPages() + ""));
|
|
|
}
|