From 064a49f1e77cf1285ff046597135ac27e9587215 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 28 Dec 2021 14:22:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E8=81=8C=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=EF=BC=8C=E5=88=86=E6=9C=88=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/service/AccountService.java | 26 +++++++++---------- .../templates/admin/account_input.ftl | 16 +++++------- .../templates/admin/month_statistics.ftl | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index 097bffc..9dfa168 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -103,7 +103,7 @@ public class AccountService { Admin oldAdmin = adminRepository.findOne(userId); Dept dept = deptRepository.findOne(admin.getDeptId()); SysRole sysRole = sysRoleRepository.findOne(admin.getRoleId()); - UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId()); +// UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId()); if (oldAdmin == null) { oldAdmin = new Admin(); String userName = admin.getUserName(); @@ -115,7 +115,7 @@ public class AccountService { oldAdmin.setRealName(admin.getRealName()); oldAdmin.setDeptName(dept.getName()); - oldAdmin.setPositionName(userPosition.getPositionName()); + oldAdmin.setPositionName(admin.getPositionName()); oldAdmin.setPassword(newPassword); oldAdmin.setSalt(salt); oldAdmin.setEnabled(1); @@ -126,10 +126,10 @@ public class AccountService { } else { String userName = admin.getUserName(); oldAdmin.setDeptId(admin.getDeptId()); - oldAdmin.setPositionId(admin.getPositionId()); +// oldAdmin.setPositionId(admin.getPositionId()); oldAdmin.setRealName(admin.getRealName()); oldAdmin.setDeptName(dept.getName()); - oldAdmin.setPositionName(userPosition.getPositionName()); + oldAdmin.setPositionName(admin.getPositionName()); //oldAdmin.setEmpCode(admin.getEmpCode()); oldAdmin.setWorkLocation(admin.getWorkLocation()); oldAdmin.setDirectManager(admin.getDirectManager()); @@ -362,15 +362,15 @@ public class AccountService { throw new Exception("职位不能为空"); } - UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString()); +// UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString()); +// +// if (null == userPosition) { +// throw new Exception("职位" + positionName.toString() + "不存在"); +// } - if (null == userPosition) { - throw new Exception("职位" + positionName.toString() + "不存在"); - } - - Object sysRole = m.get("所属角色"); + Object sysRole = m.get("所属角色名称"); if (sysRole == null || StrKit.isBlank(sysRole.toString())) { - throw new Exception("所属角色不能为空"); + throw new Exception("所属角色名称不能为空"); } SysRole role = sysRoleRepository.findByNameEqualsAndDeletedEquals(sysRole.toString(), 0); @@ -393,8 +393,8 @@ public class AccountService { admin.setDeptId(dept.getId()); admin.setDeptName(dept.getName()); admin.setDirectManager(directManager.toString()); - admin.setPositionId(userPosition.getId()); - admin.setPositionName(userPosition.getPositionName()); +// admin.setPositionId(userPosition.getId()); + admin.setPositionName(positionName.toString()); admin.setRoleId(role.getId()); admin.setRoleName(role.getName()); admin.setCompanyEmail(companyEmail.toString()); diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl index bdfdfd4..ffad074 100644 --- a/src/main/resources/templates/admin/account_input.ftl +++ b/src/main/resources/templates/admin/account_input.ftl @@ -141,22 +141,18 @@ 职位
- + readonly + required placeholder="请输入职位"/>
* - 角色 + 角色名称
-
-
-
-
-
*垫资峰值
-
- -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- +<#-- 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> From a1a21bba2569497677416096bbca7b30ab259f35 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 28 Dec 2021 15:47:56 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A4=84=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=9B=B8=E5=BA=94=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectEstimateService.java | 2 +- .../templates/admin/project_approve.ftl | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 46580e2..8431cc5 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -264,7 +264,7 @@ public class ProjectEstimateService { estimateApprove(approveStatusEstimate, projectInDb, admin); } - public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) { + public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception { if(null != approveStatusEstimate && ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){ //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个，也就是发起审批】 diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index b78f971..a279b1c 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -199,20 +199,20 @@
-
-
*垫资利息
-
- ${Utils.format(project.advanceInterestAmount)}元 -
-
-
-
-
*垫资峰值
-
- ${Utils.format(project.advancePeakAmount)}元 -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- ${Utils.format(project.advanceInterestAmount)}元--> +<#--
--> +<#--
--> +<#--
--> +<#--
--> +<#--
*垫资峰值
--> +<#--
--> +<#-- ${Utils.format(project.advancePeakAmount)}元--> +<#--
--> +<#--
--> +<#--
-->
*合同金额
From bfd663a05e00ff37a3198baea27cde86e1350cad Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 10:49:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/service/ProjectService.java | 15 +++++--- .../templates/admin/project_list.ftl | 36 +++++++++++-------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index f471c56..eb88375 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -342,18 +342,25 @@ public class ProjectService { } public void saveApprove(Project project, Admin admin) throws Exception { - if (project.getApproveStatusEstimate() == 0) { + if (project.getApproveStatusEstimate() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { Integer approveStatusEstimate = project.getApproveStatusEstimate(); projectEstimateService.estimateApprove(approveStatusEstimate, project, admin); - } else if (project.getApproveStatusBudget() == 0) { + project.setApproveStatusEstimate(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusBudget() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { Integer approveStatusBudget = project.getApproveStatusBudget(); projectBudgetService.budgetApprove(approveStatusBudget, project, admin); - } else if (project.getApproveStatusSettle() == 0) { + project.setApproveStatusBudget(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusSettle() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin()); - } else if (project.getApproveStatusFinal() == 0) { + project.setApproveStatusSettle(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusFinal() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin()); + project.setApproveStatusFinal(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else { + return ; } + projectRepository.save(project); } } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 21f5ad0..6c7d33e 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -281,7 +281,7 @@ <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0> @@ -355,6 +355,25 @@ From b0afd19f82643a95fa8fb24b3b21451dc400f77e Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 11:17:20 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=B4=AB=E5=85=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/model/Project.java | 2 +- src/main/resources/templates/admin/project_approve.ftl | 2 +- src/main/resources/templates/admin/project_budget_edit.ftl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 296777c..ff2c4d5 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -125,7 +125,7 @@ public class Project { @Column(name = "huazhi_product_amount") private BigDecimal huazhiProductAmount; /** - *紫光其他产品金额 + *其他产品金额 */ @Column(name = "ziguang_other_amount") private BigDecimal ziguangOtherAmount; diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a279b1c..a0222a1 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -235,7 +235,7 @@
-
紫光其他产品金额
+
其他产品金额
${Utils.format(project.ziguangOtherAmount)}元
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 90beeaa..ecea88d 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -180,9 +180,9 @@
-
紫光其他产品金额
+
其他产品金额
-
From 01d660452f5965246574b33947522d87cd6db087 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 14:16:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A6=82=E7=AE=97?= =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=88=A9=E6=B6=A6=E7=8E=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_approve.ftl | 26 +++++++++++++------ .../templates/admin/project_budget_edit.ftl | 13 +++++++--- .../templates/admin/project_estimate_add.ftl | 13 +++++++--- .../templates/admin/project_estimate_edit.ftl | 13 +++++++--- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a0222a1..50f59fd 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -387,17 +387,22 @@ 类别 - 不含税金额（元） - 利润率（%） + - 项目毛利 + 项目毛利（元） + + + 项目毛利率（%） - 项目贡献利润率 + 项目贡献利润（元） + + + 项目贡献利润率（%） @@ -543,17 +548,22 @@ 类别 - 不含税金额（元） - 利润率（%） + - 项目毛利 + 项目毛利（元） + + + 项目毛利率（%） - 项目贡献利润率 + 项目贡献利润（元） + + + 项目贡献利润率（%） diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index ecea88d..fd50df6 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -329,17 +329,22 @@ 类别 - 不含税金额（元） - 利润率（%） + - 项目毛利 + 项目毛利（元） + + + 项目毛利率（%） - 项目贡献利润率 + 项目贡献利润（元） + + + 项目贡献利润率（%） diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index fc285fc..73f4327 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -298,17 +298,22 @@ 类别 - 不含税金额（元） - 利润率（%） + - 项目毛利 + 项目毛利（元） + + + 项目毛利率（%） - 项目贡献利润率 + 项目贡献利润（元） + + + 项目贡献利润率（%） diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index f80fc6d..18fe219 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -305,17 +305,22 @@ 类别 - 不含税金额（元） - 利润率（%） + - 项目毛利 + 项目毛利（元） + + + 项目毛利率（%） - 项目贡献利润率 + 项目贡献利润（元） + + + 项目贡献利润率（%） From fb8a16b63b5e618644bd96e93e6059bd1a35a24e Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 14:30:11 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=81=8C=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/account_input.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl index ffad074..8ad2a99 100644 --- a/src/main/resources/templates/admin/account_input.ftl +++ b/src/main/resources/templates/admin/account_input.ftl @@ -140,11 +140,11 @@ * 职位
-
+
readonly + minlength="1" maxlength="10" required placeholder="请输入职位"/>
From 3bcc010803c7b28ea75c17a7b51fc32ba53625fb Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 15:37:14 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=B7=E5=80=BC?= =?UTF-8?q?=E4=B8=8E=E9=A3=8E=E9=99=A9=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E7=AB=96=E5=BC=8F=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/model/Project.java | 13 ++ .../palmte/work/service/ProjectService.java | 1 + .../templates/admin/project_approve.ftl | 8 +- .../templates/admin/project_budget_edit.ftl | 10 + .../templates/admin/project_estimate_add.ftl | 11 +- .../templates/admin/project_estimate_edit.ftl | 11 +- .../templates/admin/project_statistics.ftl | 211 ++++++++++-------- 7 files changed, 165 insertions(+), 100 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index ff2c4d5..7de65ee 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -134,6 +134,11 @@ public class Project { */ @Column(name = "main_contract_collection_terms") private String mainContractCollectionTerms; + /** + * 价值及风险 + */ + @Column(name = "value_risk") + private String valueRisk; /** * 项目创建时的配置的阀值 */ @@ -366,6 +371,14 @@ public class Project { this.mainContractCollectionTerms = mainContractCollectionTerms; } + public String getValueRisk() { + return valueRisk; + } + + public void setValueRisk(String valueRisk) { + this.valueRisk = valueRisk; + } + public BigDecimal getProjectContributionProfitRateThreshold() { return projectContributionProfitRateThreshold; } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index eb88375..7b09e07 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -189,6 +189,7 @@ public class ProjectService { projectInDb.setHuazhiProductAmount(project.getHuazhiProductAmount()); projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount()); projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms()); + projectInDb.setValueRisk(project.getValueRisk()); /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 50f59fd..4e24fc4 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -248,7 +248,13 @@
- +
+
*价值及风险
+
+
${project.valueRisk!}
+
+
+
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index fd50df6..4a570c8 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -197,6 +197,16 @@
+
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 73f4327..58e7da6 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -170,7 +170,16 @@
- +
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 18fe219..a6c4ef1 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -177,7 +177,16 @@
- +
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_statistics.ftl b/src/main/resources/templates/admin/project_statistics.ftl index bcb7ff9..8e03f18 100644 --- a/src/main/resources/templates/admin/project_statistics.ftl +++ b/src/main/resources/templates/admin/project_statistics.ftl @@ -1,6 +1,23 @@ <#assign base=request.contextPath /> <#import "../common/defaultLayout.ftl" as defaultLayout> <@defaultLayout.layout> + + + +
@@ -28,40 +45,40 @@
- - - - - - - - - - - - - - - +
项目名称收入--设备类收入--工程类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本公司管理费用
+ + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -75,44 +92,44 @@
-
项目名称收入--设备类收入--工程类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本公司管理费用
${list.projectName!}${(list.incomeDevice!0)?string("0.##")}${(list.incomeEngineer!0)?string("0.##")}${(list.incomeService!0)?string("0.##")}${(list.costPurchaseDevice!0)?string("0.##")}${(list.costPurchaseBuild!0)?string("0.##")}${(list.costPurchaseService!0)?string("0.##")}${(list.costPurchaseOther!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}
${list.projectName!}${(list.incomeDevice!0)?string("0.##")}${(list.incomeEngineer!0)?string("0.##")}${(list.incomeService!0)?string("0.##")}${(list.costPurchaseDevice!0)?string("0.##")}${(list.costPurchaseBuild!0)?string("0.##")}${(list.costPurchaseService!0)?string("0.##")}${(list.costPurchaseOther!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}
- - - - - - - - - - - - - - - - +
项目名称营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率
+ + + + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -125,46 +142,46 @@
-
项目名称营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率
${list.projectName!}${(list.incomeTotal!0)?string("0.##")}${(list.costTotal2!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.grossProfit!0)?string("0.##")}${(list.grossProfitProfitMargin!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}${(list.contributionProfit!0)?string("0.##")}${(list.contributionProfitProfitMargin!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.netProfit!0)?string("0.##")}${(list.netProfitProfitMargin!0)?string("0.##")}
${list.projectName!}${(list.incomeTotal!0)?string("0.##")}${(list.costTotal2!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.grossProfit!0)?string("0.##")}${(list.grossProfitProfitMargin!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}${(list.contributionProfit!0)?string("0.##")}${(list.contributionProfitProfitMargin!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.netProfit!0)?string("0.##")}${(list.netProfitProfitMargin!0)?string("0.##")}
- - - - - - - - - - - - - - - - - +
项目名称销售商品、提供劳务收到的现金收到的税费返还收到的其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额
+ + + + + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + From 50df4ecfb8f46d5c65f3dc4a3c7342618c2a37e0 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 16:11:19 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=BB=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=92=8C=E4=BB=B7=E5=80=BC=E5=AD=97=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E6=9C=88=E7=BB=9F=E8=AE=A1=E7=9A=84=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/AccountController.java | 4 +-- .../controller/backend/ProjectController.java | 2 +- .../work/service/StatisticsService.java | 34 +++++++++++++++++-- .../templates/admin/account_input.ftl | 1 + .../templates/admin/account_list.ftl | 4 +-- .../templates/admin/project_budget_edit.ftl | 9 ++--- .../templates/admin/project_estimate_add.ftl | 9 ++--- .../templates/admin/project_estimate_edit.ftl | 9 ++--- .../templates/admin/project_list.ftl | 4 +-- 9 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/AccountController.java b/src/main/java/cn/palmte/work/controller/backend/AccountController.java index aba1695..3036d9d 100644 --- a/src/main/java/cn/palmte/work/controller/backend/AccountController.java +++ b/src/main/java/cn/palmte/work/controller/backend/AccountController.java @@ -223,7 +223,7 @@ public class AccountController extends BaseController { public void export(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse, Utils.generateExcelName("人员信息"), "application/octet-stream"); - String[] headers = {"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "所属角色", "公司邮件地址"}; + String[] headers = {"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "角色名称", "公司邮件地址"}; String[] exportColumns = {"userName", "telephone", "realName", "workLocation", "deptName", "directManager", "positionName", "roleName", "companyEmail"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> accountService.list(searchInfo, pN, pS).getList()); @@ -235,7 +235,7 @@ public class AccountController extends BaseController { @RequestMapping("/template") public void template(HttpServletResponse response) throws Exception { - String[] headers = new String[]{"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "所属角色", "公司邮件地址"}; + String[] headers = new String[]{"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "角色名称", "公司邮件地址"}; downloadHeader(response, Utils.generateExcelName("人员信息批量导入模板")); ExportUtils exportUtils = new ExportUtils(headers); exportUtils.write(response.getOutputStream()); 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 c571785..4b19265 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -551,6 +551,6 @@ public class ProjectController extends BaseController { Project project = projectRepository.findOne(id); projectService.saveApprove(project, InterfaceUtil.getAdmin()); - return ResponseMsg.buildSuccessMsg("成功"); + return ResponseMsg.buildSuccessMsg("提交成功"); } } diff --git a/src/main/java/cn/palmte/work/service/StatisticsService.java b/src/main/java/cn/palmte/work/service/StatisticsService.java index 6855bea..dda3cfc 100644 --- a/src/main/java/cn/palmte/work/service/StatisticsService.java +++ b/src/main/java/cn/palmte/work/service/StatisticsService.java @@ -8,6 +8,7 @@ import cn.palmte.work.model.*; import cn.palmte.work.utils.InterfaceUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import top.jfunc.common.db.utils.Pagination; import top.jfunc.common.utils.CollectionUtil; import java.math.BigDecimal; @@ -47,6 +48,12 @@ public class StatisticsService { @Autowired private ProjectVisibleRepository projectVisibleRepository; + @Autowired + private SysRoleRepository sysRoleRepository; + + @Autowired + private Pagination pagination; + /** * 分月项目统计 获取主要指标数据、损益表 * @@ -67,9 +74,30 @@ public class StatisticsService { include.setTitle("预算金额（含税）"); exclude.setTitle("预算金额（不含税）"); - int adminId = InterfaceUtil.getAdminId(); - List projectIds = projectVisibleRepository.findProjectIdByTypeAndTid(ProjectVisible.TYPE_USER, adminId); - + Admin admin = InterfaceUtil.getAdmin(); + List projectList = null; + //项目可见性，根据角色和人员id + int roleId = admin.getRoleId(); + Integer adminId = admin.getId(); + String sql = "select proj.id, proj.name, proj.approve_status_settle from project_settle_cost psc left join project proj on psc.project_id = proj.id "; + //自己创建的肯定能看见，配置的可以看见，系统管理员可以看见 + SysRole sysRole = sysRoleRepository.findSysRoleById(roleId); + if(SysRole.ROLE_TYPE_SYSTEM != sysRole.getType()){ + sql = sql + " where (proj.creator_id=? OR proj.id in (SELECT pv1.project_id FROM project_visible pv1 WHERE pv1.type=1 AND pv1.tid=? UNION SELECT pv2.project_id FROM project_visible pv2 WHERE pv2.type=2 AND pv2.tid=?)) group by proj.id order by proj.id asc"; + projectList = pagination.find(sql, Project.class, adminId, roleId, adminId); + } else { + sql = sql + " group by proj.id order by proj.id asc"; + projectList = pagination.find(sql, Project.class); + } + List projects = new ArrayList<>(); + List projectIds = new ArrayList<>(); + for (Project project : projectList) { + if (project.getApproveStatusSettle() == 2) { + projects.add(project); + projectIds.add(project.getId()); + continue; + } + } if(CollectionUtil.isEmpty(projectIds)){ return statisticsBean; diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl index 8ad2a99..d2f2fb6 100644 --- a/src/main/resources/templates/admin/account_input.ftl +++ b/src/main/resources/templates/admin/account_input.ftl @@ -147,6 +147,7 @@ minlength="1" maxlength="10" required placeholder="请输入职位"/> +
diff --git a/src/main/resources/templates/admin/account_list.ftl b/src/main/resources/templates/admin/account_list.ftl index feee5c9..2085dbd 100644 --- a/src/main/resources/templates/admin/account_list.ftl +++ b/src/main/resources/templates/admin/account_list.ftl @@ -51,7 +51,7 @@
- + - + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 4a570c8..e4944ce 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -191,16 +191,17 @@
*主合同收款条款
- +
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 58e7da6..83dbc13 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -164,16 +164,17 @@
*主合同收款条款
- +
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index a6c4ef1..93e9a2e 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -171,16 +171,17 @@
*主合同收款条款
- +
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 6c7d33e..5d5803d 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -281,7 +281,7 @@ <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0> @@ -358,7 +358,7 @@ var approveProject = function (id) { if (window.confirm('确定要提交审核吗？')) { $.ajax({ - url: '${base}/project/saveApprove, + url: '${base}/project/saveApprove', data: {id:id}, dataType: "json", async: false, From 9330c2c84cb10114a568a9fbccb7bb3063d52ad3 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 17:35:23 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=B0=8F=E7=B1=BB=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/model/Project.java | 13 +++++++++ .../palmte/work/service/ProjectService.java | 1 + .../templates/admin/project_approve.ftl | 10 +++---- .../templates/admin/project_budget_edit.ftl | 29 +++++++++---------- .../templates/admin/project_estimate_add.ftl | 3 +- .../templates/admin/project_estimate_edit.ftl | 5 ++-- .../templates/admin/project_final_add.ftl | 3 +- .../templates/admin/project_final_edit.ftl | 3 +- .../templates/admin/project_settle_add.ftl | 3 +- .../templates/admin/project_settle_edit.ftl | 3 +- 10 files changed, 45 insertions(+), 28 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 7de65ee..3702164 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -139,6 +139,11 @@ public class Project { */ @Column(name = "value_risk") private String valueRisk; + /** + * 其他中的小类名称 + */ + @Column(name = "other_name") + private String otherName; /** * 项目创建时的配置的阀值 */ @@ -379,6 +384,14 @@ public class Project { this.valueRisk = valueRisk; } + public String getOtherName() { + return otherName; + } + + public void setOtherName(String otherName) { + this.otherName = otherName; + } + public BigDecimal getProjectContributionProfitRateThreshold() { return projectContributionProfitRateThreshold; } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 7b09e07..b10e395 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -190,6 +190,7 @@ public class ProjectService { projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount()); projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms()); projectInDb.setValueRisk(project.getValueRisk()); + projectInDb.setOtherName(project.getOtherName()); /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 4e24fc4..151041b 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -244,7 +244,7 @@
*主合同收款条款
- ${project.mainContractCollectionTerms} +
${project.mainContractCollectionTerms!}
@@ -354,7 +354,7 @@
- + @@ -514,7 +514,7 @@ - + @@ -782,7 +782,7 @@ - + @@ -1134,7 +1134,7 @@ - + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index e4944ce..2eaf40e 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -95,23 +95,19 @@
*项目类型
- + value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类" + required readonly/>
*垫资模式
- + value="A类-不垫资（战略合作）"<#elseif project.underwrittenMode=2>value="B类-不垫资（背靠背）" + <#elseif project.underwrittenMode=3>value="C类-垫资（账期覆盖）"<#else>value="D类-垫资（账期不覆盖）" />
@@ -191,10 +187,10 @@
*主合同收款条款
- +
@@ -300,7 +296,8 @@ - + diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 83dbc13..0e28f44 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -269,7 +269,8 @@ - + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 93e9a2e..4d6c866 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -174,7 +174,7 @@ + >${project.mainContractCollectionTerms!}
@@ -276,7 +276,8 @@ - + diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 9e919b2..1e058c9 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -139,7 +139,8 @@ - + diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index d760d91..c75dcd4 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -139,7 +139,8 @@ - + diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl index df8b916..a5a05de 100644 --- a/src/main/resources/templates/admin/project_settle_add.ftl +++ b/src/main/resources/templates/admin/project_settle_add.ftl @@ -163,7 +163,8 @@ - + diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl index 3edd9f6..180da1e 100644 --- a/src/main/resources/templates/admin/project_settle_edit.ftl +++ b/src/main/resources/templates/admin/project_settle_edit.ftl @@ -161,7 +161,8 @@ - +
项目名称销售商品、提供劳务收到的现金收到的税费返还收到的其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额
${list.projectName!}${(list.saleIncomeCash!0)?string("0.##")}${(list.taxReturn!0)?string("0.##")}${(list.earnestMoneyIncome!0)?string("0.##")}${(list.purchaseCost!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.earnestMoneyCost!0)?string("0.##")}${(list.netCashFlow!0)?string("0.##")}${(list.cashInflowFromInvestingActivities!0)?string("0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}${(list.netCashFromInvestingActivities!0)?string("0.##")}${(list.financingCapitalInflow!0)?string("0.##")}${(list.financingCapitalOutflow!0)?string("0.##")}${(list.financingCapitalCashflow!0)?string("0.##")}${(list.netIncreaseMonetaryFunds!0)?string("0.##")}
${list.projectName!}${(list.saleIncomeCash!0)?string("0.##")}${(list.taxReturn!0)?string("0.##")}${(list.earnestMoneyIncome!0)?string("0.##")}${(list.purchaseCost!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.earnestMoneyCost!0)?string("0.##")}${(list.netCashFlow!0)?string("0.##")}${(list.cashInflowFromInvestingActivities!0)?string("0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}${(list.netCashFromInvestingActivities!0)?string("0.##")}${(list.financingCapitalInflow!0)?string("0.##")}${(list.financingCapitalOutflow!0)?string("0.##")}${(list.financingCapitalCashflow!0)?string("0.##")}${(list.netIncreaseMonetaryFunds!0)?string("0.##")}
账号角色角色名称
一级部门 直接主管 职位所属角色角色名称 公司邮件地址 操作
成本 其他其他${project.otherName!}
成本 其他其他${project.otherName!}
成本 其他其他${project.otherName!}
成本 其他其他${project.otherName!}
成本 其他其他
成本 其他其他
成本 其他其他
成本 其他其他
成本 其他其他
成本 其他其他
成本 其他其他