From 211a306d672ac4a2991286b5da7f5c337b590257 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 13 Jan 2022 15:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E7=BB=91=E5=AE=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/service/ProjectFinalSevice.java | 5 ++--- src/main/java/cn/palmte/work/service/ProjectService.java | 3 ++- .../java/cn/palmte/work/service/ProjectSettleService.java | 5 ++--- src/main/resources/static/assets/js/project_budget.js | 1 + src/main/resources/templates/admin/project_approve.ftl | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java index 455eec5..671c5b1 100644 --- a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java +++ b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java @@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.Transactional; import top.jfunc.common.utils.CollectionUtil; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -61,14 +60,14 @@ public class ProjectFinalSevice { @Transactional public void save(Project project, FinalBean finalBean) { clearAndSave(project, finalBean); - projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT); + projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName()); } @Transactional public void saveAndApprove(Project project, FinalBean finalBean) throws Exception { clearAndSave(project, finalBean); //更新项目和审批状态 - projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING); + projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName()); //发起流程 projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin()); } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index d04fc07..c472021 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -215,10 +215,11 @@ public class ProjectService { /** * 更新项目状态和审批状态 */ - public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum) { + public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum, String otherName) { Project one = projectRepository.findOne(projectId); one.setStatus(statusEnum.getStatus()); one.setStatusDesc(statusEnum.getStatusDesc()); + one.setOtherName(otherName); int approveStatus = approveStatusEnum.getApproveStatus(); switch (statusEnum) { diff --git a/src/main/java/cn/palmte/work/service/ProjectSettleService.java b/src/main/java/cn/palmte/work/service/ProjectSettleService.java index 216c030..5e4ce52 100644 --- a/src/main/java/cn/palmte/work/service/ProjectSettleService.java +++ b/src/main/java/cn/palmte/work/service/ProjectSettleService.java @@ -11,7 +11,6 @@ import top.jfunc.common.utils.CollectionUtil; import java.math.BigDecimal; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -47,13 +46,13 @@ public class ProjectSettleService { public void save(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) { step(project, settleBean, budgetBean, estimateBean, time); - projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT); + projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName()); } public void saveAndApprove(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) throws Exception{ step(project, settleBean, budgetBean, estimateBean, time); - projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING); + projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName()); //发起结算流程 projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin()); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 3aa96d4..0bc0eec 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -369,6 +369,7 @@ function bindDeleteBtn() { $(".am-modal-line-delete").click(function () { //删除自己对应的tr $(this).parent().parent().remove(); + bindNum(); }); } diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 86ceb9e..49c7f2a 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -449,7 +449,7 @@ <#if incomeDetails??> <#list incomeDetails as incomeDetail> - + ${(incomeDetail_index+1)!} <#-- + ${(costDetail_index+1)!} <#-- + ${(costProjectManageDetail_index+1)!} <#--