diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 9624f1b..c571785 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -541,4 +541,16 @@ public class ProjectController extends BaseController { } return ResponseMsg.buildSuccessMsg("成功"); } + + /** + * 项目提交审核 + */ + @RequestMapping("/saveApprove") + @ResponseBody + public ResponseMsg saveApprove(int id) throws Exception { + Project project = projectRepository.findOne(id); + projectService.saveApprove(project, InterfaceUtil.getAdmin()); + + return ResponseMsg.buildSuccessMsg("成功"); + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 99b51d6..a7245ce 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -755,6 +755,11 @@ public class ProjectBudgetService { budgetEditSave(project, projectInDb, budgetBean, admin, ApproveStatusEnum.APPROVAL_PENDING); + budgetApprove(approveStatusBudget, projectInDb, admin); + } + + public void budgetApprove(Integer approveStatusBudget, Project projectInDb, Admin admin) throws Exception { + if(null != approveStatusBudget && ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusBudget){ //审核不通过的情况下重新编辑后就完成当前任务 @@ -769,6 +774,7 @@ public class ProjectBudgetService { projectInstanceService.startBudgetProcessInstance(projectInDb, admin); } } + /** * 编辑预算保存项目 */ diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 2cae490..46580e2 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -261,6 +261,10 @@ public class ProjectEstimateService { estimateEditSave(project, projectInDb, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING); + estimateApprove(approveStatusEstimate, projectInDb, admin); + } + + public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) { if(null != approveStatusEstimate && ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){ //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个,也就是发起审批】 @@ -275,6 +279,7 @@ public class ProjectEstimateService { projectInstanceService.startEstimateProcessInstance(projectInDb, admin); } } + /** * 编辑概算保存项目 */ diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 52751a4..f471c56 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -42,7 +42,10 @@ public class ProjectService { private AdminRepository adminRepository; @Autowired private ProjectEstimateService projectEstimateService; - + @Autowired + private ProjectInstanceService projectInstanceService; + @Autowired + private ProjectBudgetService projectBudgetService; private QueryHelper getQueryHelper(Map searchInfo) { /*"CASE p.type WHEN 1 THEN '工程集成类' WHEN 2 THEN '设备集成类' WHEN 3 THEN '战略合作类' ELSE '未知' AS typeDesc," + @@ -337,4 +340,20 @@ public class ProjectService { return ResponseMsg.buildSuccessMsg("删除成功"); } + + public void saveApprove(Project project, Admin admin) throws Exception { + if (project.getApproveStatusEstimate() == 0) { + Integer approveStatusEstimate = project.getApproveStatusEstimate(); + + projectEstimateService.estimateApprove(approveStatusEstimate, project, admin); + } else if (project.getApproveStatusBudget() == 0) { + Integer approveStatusBudget = project.getApproveStatusBudget(); + + projectBudgetService.budgetApprove(approveStatusBudget, project, admin); + } else if (project.getApproveStatusSettle() == 0) { + projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin()); + } else if (project.getApproveStatusFinal() == 0) { + projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin()); + } + } } diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index a45a2c7..90beeaa 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -134,24 +134,24 @@
-
-
*垫资利息
-
- -
-
-
-
-
*垫资峰值
-
- -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- +<#-- name="advanceInterestAmount" placeholder="单位(元)" maxlength="20"--> +<#-- value="${Utils.format(project.advanceInterestAmount)}" required />--> +<#--
--> +<#--
--> +<#--
--> +<#--
--> +<#--
*垫资峰值
--> +<#--
--> +<#-- +<#-- name="advancePeakAmount" placeholder="单位(元)" maxlength="20"--> +<#-- value="${Utils.format(project.advancePeakAmount)}" required />--> +<#--
--> +<#--
--> +<#--
-->
*合同金额
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 3b25f81..fc285fc 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -109,24 +109,24 @@
-
-
*垫资利息
-
- -
-
-
-
-
*垫资峰值
-
- -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- +<#-- name="advanceInterestAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13"--> +<#-- value="" required />--> +<#--
--> +<#--
--> +<#--
--> +<#--
--> +<#--
*垫资峰值
--> +<#--
--> +<#-- +<#-- name="advancePeakAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13"--> +<#-- value="" required />--> +<#--
--> +<#--
--> +<#--
-->
*合同金额
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 6fb9017..f80fc6d 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -116,24 +116,24 @@
-
-
*垫资利息
-
- -
-
-
-
-
*垫资峰值
-
- -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- +<#-- name="advanceInterestAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13"--> +<#-- value="${Utils.format(project.advanceInterestAmount)}" required />--> +<#--
--> +<#--
--> +<#--
--> +<#--
--> +<#--
*垫资峰值
--> +<#--
--> +<#-- +<#-- name="advancePeakAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13"--> +<#-- value="${Utils.format(project.advancePeakAmount)}" required />--> +<#--
--> +<#--
--> +<#--
-->
*合同金额
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index d48a208..21f5ad0 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -278,6 +278,13 @@ onclick="location.href='${base}/project/detail?id=${list.id}'">查看 --> + <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0> + + <#if adminId==list.approveId>