From d7fe81fabb36d799c17061840bf9964f0e14eb73 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 6 Jan 2023 10:24:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9E=AB=E8=B5=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/model/process/ProcurementDetail.java | 7 ++++--- .../work/service/ProjectProcessService.java | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java index 5fdd965..a2859ad 100644 --- a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java +++ b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java @@ -28,7 +28,7 @@ public class ProcurementDetail { private String contractParty; - private int isUnderwritten; + private boolean isUnderwritten; private String isUnderwrittenDesc; private BigDecimal underwrittenAmount; @@ -60,8 +60,9 @@ public class ProcurementDetail { private Integer amountId; - public void setIsUnderwritten(int isUnderwritten) { + public void setIsUnderwritten(boolean isUnderwritten) { this.isUnderwritten = isUnderwritten; - this.isUnderwrittenDesc = isUnderwritten == 1 ? "是" : "否"; + this.isUnderwrittenDesc = isUnderwritten ? "是" : "否"; } + } diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 30c5c41..1ea1034 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -296,7 +296,7 @@ public class ProjectProcessService { for (BudgetPurchaseAmount amount : purchaseAmount) { ProjectBudgetCostDetail costDetail = getCostDetailById(amount.getBudgetCostId()); ProcurementDetail detail = new ProcurementDetail(); - BeanUtils.copyProperties(costDetail, detail); + BeanUtils.copyProperties(costDetail, detail, "isUnderwritten"); Integer amountId = amount.getId(); // 找对应 预算采购明细的数量记录 的采购详情 @@ -314,6 +314,7 @@ public class ProjectProcessService { } detail.setAmountLeft(allAmount.subtract(amountAlready)); detail.setAmountCurrent(amount.getAmountCurrent()); + detail.setIsUnderwritten(isProjectPrepaid(projectId)); ret.add(detail); } } @@ -321,7 +322,7 @@ public class ProjectProcessService { List costDetails = getCostDetails(projectId); for (ProjectBudgetCostDetail costDetail : costDetails) { ProcurementDetail detail = new ProcurementDetail(); - BeanUtils.copyProperties(costDetail, detail); + BeanUtils.copyProperties(costDetail, detail, "isUnderwritten"); // 可能为 0 BigDecimal amountAlready = getAmountAlready(costDetail.getId()); detail.setAmountAlready(amountAlready); @@ -333,6 +334,7 @@ public class ProjectProcessService { // TODO 查询太频繁 detail.setCategory(getCategory(costDetail)); detail.setBudgetCostId(costDetail.getId()); + detail.setIsUnderwritten(isProjectPrepaid(projectId)); ret.add(detail); } } @@ -500,7 +502,14 @@ public class ProjectProcessService { * 是否垫资 */ public boolean isProjectPrepaid(Project project) { - return BigDecimal.ZERO.equals(getProjectRepaidAmount(project.getId())); + return isProjectPrepaid(project.getId()); + } + + /** + * 是否垫资 + */ + public boolean isProjectPrepaid(Integer projectId) { + return isProjectPrepaid(getProjectRepaidAmount(projectId)); } /** From 9a17b67bc41c89459ee078a60e330cb5504158c5 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 6 Jan 2023 10:33:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=20=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/business/process-new.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index a53b2df..054a1df 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -974,7 +974,7 @@ } } // @formatter:on - if (this.projectType === procurementContract) { + if (this.processType === procurementContract) { // 只有 采购合同重置 合同金额 （因为要根据合同清单明细计算） this.initForm({ ...form, contractAmount: 0 }) } From 4cd2850b40ff66eb04231bf04172a31912144546 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 6 Jan 2023 10:54:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/business/process-edit.ftl | 2 +- src/main/resources/templates/admin/business/process-new.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index 6a010fe..99e004d 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -263,7 +263,7 @@ diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index 054a1df..a83a205 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -384,7 +384,7 @@ From 29d74d0889e334ab463521a429db71318eb0b217 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 6 Jan 2023 11:06:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B5=81=E7=A8=8B=E7=B1=BB=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/business/process-edit.ftl | 2 +- src/main/resources/templates/admin/business/process-new.ftl | 2 +- src/main/resources/templates/admin/business/process-review.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index 99e004d..7f5a6d7 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -185,7 +185,7 @@ - {{processForm.repaidAmount}}元 + {{processForm.repaidAmount|numberFormat}}元 diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index a83a205..ee0069c 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -305,7 +305,7 @@ - {{processForm.repaidAmount}} + {{processForm.repaidAmount|numberFormat}} 未选择项目 diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl index aa330bc..e875b99 100644 --- a/src/main/resources/templates/admin/business/process-review.ftl +++ b/src/main/resources/templates/admin/business/process-review.ftl @@ -409,7 +409,7 @@ switch (value) { case 'sale_contract': return "销售合同流程" - case 'business_procurement': + case 'procurement_contract': return "业务采购流程" } }