From 48a979e5ab43d3d54a17c7e368d9bda2427d045b Mon Sep 17 00:00:00 2001 From: pengqiang Date: Wed, 17 Nov 2021 11:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/model/Project.java | 97 ++++++++++--------- .../work/service/ActListenerService.java | 14 +-- .../work/service/ProjectInstanceService.java | 14 ++- .../palmte/work/service/ProjectService.java | 2 +- .../templates/admin/project_list.ftl | 31 +++--- 5 files changed, 90 insertions(+), 68 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index e343c98..7d47e7c 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -42,19 +42,19 @@ public class Project { * 概算、预算、结算、决算：审核状态：0草稿，1待审核，2审核通过，3审核不通过 */ @Column(name = "approve_status_estimate") - private Integer approveStatusEstimate; + private int approveStatusEstimate = -1; @Column(name = "approve_status_budget") - private Integer approveStatusBudget; + private int approveStatusBudget = -1; @Column(name = "approve_status_settle") - private Integer approveStatusSettle; + private int approveStatusSettle = -1; @Column(name = "approve_status_final") - private Integer approveStatusFinal; + private int approveStatusFinal = -1; /** * 审核人id */ @Column(name = "approve_id") - private Integer approveId; + private int approveId = 0; @Column(name = "approve_name") private String approveName; /** @@ -204,39 +204,8 @@ public class Project { this.statusDesc = statusDesc; } - public Integer getApproveStatusEstimate() { - return approveStatusEstimate; - } - public void setApproveStatusEstimate(Integer approveStatusEstimate) { - this.approveStatusEstimate = approveStatusEstimate; - } - - public Integer getApproveStatusBudget() { - return approveStatusBudget; - } - - public void setApproveStatusBudget(Integer approveStatusBudget) { - this.approveStatusBudget = approveStatusBudget; - } - - public Integer getApproveStatusSettle() { - return approveStatusSettle; - } - - public void setApproveStatusSettle(Integer approveStatusSettle) { - this.approveStatusSettle = approveStatusSettle; - } - - public Integer getApproveStatusFinal() { - return approveStatusFinal; - } - - public void setApproveStatusFinal(Integer approveStatusFinal) { - this.approveStatusFinal = approveStatusFinal; - } - - public Integer getApproveStatus() { + public int getApproveStatus() { if(status == STATUS_ESTIMATE){ return approveStatusEstimate; } @@ -249,25 +218,17 @@ public class Project { if(status == STATUS_FINAL){ return approveStatusFinal; } - return null; + return -1; } public String getApproveStatusDesc() { - Integer approveStatus = getApproveStatus(); - if(null == approveStatus){ + int approveStatus = getApproveStatus(); + if(-1 == approveStatus){ return "未知"; } return ApproveStatusEnum.parseApproveStatus(approveStatus).getApproveStatusDesc(); } - public Integer getApproveId() { - return approveId; - } - - public void setApproveId(Integer approveId) { - this.approveId = approveId; - } - public String getApproveName() { return approveName; } @@ -435,4 +396,44 @@ public class Project { public void setLastUpdateTime(Date lastUpdateTime) { this.lastUpdateTime = lastUpdateTime; } + + public int getApproveStatusEstimate() { + return approveStatusEstimate; + } + + public void setApproveStatusEstimate(int approveStatusEstimate) { + this.approveStatusEstimate = approveStatusEstimate; + } + + public int getApproveStatusBudget() { + return approveStatusBudget; + } + + public void setApproveStatusBudget(int approveStatusBudget) { + this.approveStatusBudget = approveStatusBudget; + } + + public int getApproveStatusSettle() { + return approveStatusSettle; + } + + public void setApproveStatusSettle(int approveStatusSettle) { + this.approveStatusSettle = approveStatusSettle; + } + + public int getApproveStatusFinal() { + return approveStatusFinal; + } + + public void setApproveStatusFinal(int approveStatusFinal) { + this.approveStatusFinal = approveStatusFinal; + } + + public int getApproveId() { + return approveId; + } + + public void setApproveId(int approveId) { + this.approveId = approveId; + } } diff --git a/src/main/java/cn/palmte/work/service/ActListenerService.java b/src/main/java/cn/palmte/work/service/ActListenerService.java index bf67ed7..529f63d 100644 --- a/src/main/java/cn/palmte/work/service/ActListenerService.java +++ b/src/main/java/cn/palmte/work/service/ActListenerService.java @@ -86,13 +86,15 @@ public class ActListenerService { String businessKey = processInstance.getBusinessKey(); logger.info("businessKey : {}", businessKey); - if (candidateUsers != null && !candidateUsers.isEmpty() && businessKey != null) { - try { - int adminId = Integer.parseInt(candidateUsers.get(0)); - projectInstanceService.updateApprover(Integer.parseInt(businessKey), adminId); - } catch (Exception e) { - logger.error("", e); + try { + int adminId = 0; + if (!candidateUsers.isEmpty()) { + adminId = Integer.parseInt(candidateUsers.get(0)); } + projectInstanceService.updateApprover(Integer.parseInt(businessKey), adminId); + } catch (Exception e) { + logger.error("", e); } + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectInstanceService.java b/src/main/java/cn/palmte/work/service/ProjectInstanceService.java index 2da11b5..a762b16 100644 --- a/src/main/java/cn/palmte/work/service/ProjectInstanceService.java +++ b/src/main/java/cn/palmte/work/service/ProjectInstanceService.java @@ -110,9 +110,13 @@ public class ProjectInstanceService { */ public void updateApprover(int projectId, int adminId){ Project project = projectRepository.findOne(projectId); - Admin admin = adminService.getAdminById(adminId); + if (adminId == 0) { + project.setApproveName(""); + }else { + Admin admin = adminService.getAdminById(adminId); + project.setApproveName(admin.getRealName()); + } project.setApproveId(adminId); - project.setApproveName(admin.getUserName()); project.setLastUpdateTime(new Date()); projectRepository.saveAndFlush(project); } @@ -137,6 +141,12 @@ public class ProjectInstanceService { project.setApproveStatusFinal(approveStatusEnum.getApproveStatus()); } + if (approveStatusEnum.getApproveStatus() == ApproveStatusEnum.APPROVAL_PASSED.getApproveStatus()) { + //审批通过设置审批人为空 + project.setApproveId(0); + project.setApproveName(""); + } + project.setLastUpdateTime(new Date()); projectRepository.saveAndFlush(project); } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index c5d4655..2a84ebe 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -212,7 +212,7 @@ public class ProjectService { project.setProjectContributionProfitRateThreshold(projectConfigBeanConfig.getProjectContributionProfitRateThreshold()); project.setUnderwrittenTaxRate(projectConfigBeanConfig.getUnderwrittenTaxRate()); - project.setApproveId(null); + project.setApproveId(0); project.setApproveName(""); //TODO 获取登录人的部门信息 diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 9555b32..380f0c9 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -210,7 +210,8 @@ <#-- <@shiro.hasPermission name="PROJECT_EDIT">--> - <#if list.status==5 && (list.approveStatusBudget=0 || list.approveStatusBudget=3)> + <#--概算审核通过 才可以发起预算--> + <#if list.approveStatusEstimate=2 && (list.approveStatusBudget==0 || list.approveStatusBudget==3) > + + <#--预算审核通过 才可以发起结算--> + <#if list.approveStatusBudget=2 > + + + + + <#if list.approveStatusEstimate != 0 > + +