From 02da71d4a94eb70763973b9eaef5e9360f7c634d Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 30 Oct 2024 17:35:41 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8:=201:=E4=BA=A7=E5=93=81=E5=A4=A7=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/palmte/work/model/ProjectBudget.java | 20 ++++++++++++++ .../model/ProjectBudgetCostDetailBase.java | 8 +----- .../model/ProjectBudgetCostDetailTemp.java | 1 - .../model/ProjectBudgetIncomeDetailBase.java | 8 +----- .../model/ProjectBudgetIncomeDetailTemp.java | 1 - .../palmte/work/service/ProjectService.java | 26 +++++++++---------- 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/ProjectBudget.java b/src/main/java/cn/palmte/work/model/ProjectBudget.java index 477f141..0ea7308 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudget.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudget.java @@ -116,6 +116,10 @@ public class ProjectBudget { */ @Column(name = "industry_scene_budget") private Integer industrySceneBudget; + @Column(name = "cost_detail_attr") + private String costDetailAttr; + @Column(name = "income_detail_attr") + private String incomeDetailAttr; /** * 行业场景应用 */ @@ -241,6 +245,22 @@ public class ProjectBudget { @Transient private String advancePeakAmountRoundBudget; + public String getCostDetailAttr() { + return costDetailAttr; + } + + public void setCostDetailAttr(String costDetailAttr) { + this.costDetailAttr = costDetailAttr; + } + + public String getIncomeDetailAttr() { + return incomeDetailAttr; + } + + public void setIncomeDetailAttr(String incomeDetailAttr) { + this.incomeDetailAttr = incomeDetailAttr; + } + public int getId() { return id; } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java index f8adfed..ac8aa9d 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java @@ -28,7 +28,7 @@ public class ProjectBudgetCostDetailBase { private String category; private String name; - private String attr; + private String unit; private BigDecimal amount; @@ -60,13 +60,7 @@ public class ProjectBudgetCostDetailBase { @Column(name = "remark") private String remark; - public String getAttr() { - return attr; - } - public void setAttr(String attr) { - this.attr = attr; - } public Integer getId() { return id; diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java index cedf332..60f916d 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java @@ -28,7 +28,6 @@ public class ProjectBudgetCostDetailTemp extends ProjectBudgetCostDetailBase{ detail.setPayWay(getPayWay()); detail.setRemark(getRemark()); detail.setTotalTaxInclude(getTotalTaxInclude()); - detail.setAttr(getAttr()); return detail; } } \ No newline at end of file diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java index dd5fed9..f6f2aa0 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java @@ -39,7 +39,7 @@ public class ProjectBudgetIncomeDetailBase { private String unit; private BigDecimal amount; private BigDecimal price; - private String attr; + @Column(name = "tax_rate") private BigDecimal taxRate; @@ -48,13 +48,7 @@ public class ProjectBudgetIncomeDetailBase { @Column(name = "expiration_date") public String expirationDate; - public String getAttr() { - return attr; - } - public void setAttr(String attr) { - this.attr = attr; - } public Integer getId() { return id; diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java index f941824..4049d15 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java @@ -21,7 +21,6 @@ public class ProjectBudgetIncomeDetailTemp extends ProjectBudgetIncomeDetailBase projectBudgetIncomeDetail.setPrice(getPrice()); projectBudgetIncomeDetail.setTaxRate(getTaxRate()); projectBudgetIncomeDetail.setTotalTaxInclude(getTotalTaxInclude()); - projectBudgetIncomeDetail.setAttr(getAttr()); return projectBudgetIncomeDetail; } } \ No newline at end of file diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index bbafa9a..542cc7d 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -404,10 +404,10 @@ public class ProjectService { public Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) { String projectNo = numSeqService.generate(); - if (project.getCooperateType() != 1) { - project.setCollaborator(null); - project.setCollaboratorUrl(null); - } + // if (project.getCooperateType() != 1) { + // project.setCollaborator(null); + // project.setCollaboratorUrl(null); + // } if (project.getUnderwrittenMode() <= 2) { project.setAdvancePeakAmount(new BigDecimal(0)); project.setAdvanceInterestAmount(new BigDecimal(0)); @@ -415,11 +415,11 @@ public class ProjectService { project.setProjectNo(projectNo); project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); project.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); - project.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); + // project.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); project.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); project.setIsSecondStr(IsSecondEnum.parseIsSecond(project.getIsSecond()).getIsSecondStr()); project.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr()); - project.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); + // project.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); project.setStatus(StatusEnum.ESTIMATE_ACCOUNTS.getStatus()); project.setStatusDesc(StatusEnum.ESTIMATE_ACCOUNTS.getStatusDesc()); project.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); @@ -459,7 +459,7 @@ public class ProjectService { projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); projectInDb.setCooperateType(project.getCooperateType()); - projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); + // projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); projectInDb.setCertainty(project.getCertainty()); projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); projectInDb.setIsSecond(project.getIsSecond()); @@ -467,15 +467,15 @@ public class ProjectService { projectInDb.setSignType(project.getSignType()); projectInDb.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr()); projectInDb.setResolvePlan(project.getResolvePlan()); - projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); + // projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); - if (project.getCooperateType() != 1) { - projectInDb.setCollaborator(null); - projectInDb.setCollaboratorUrl(null); - } else { + // if (project.getCooperateType() != 1) { + // projectInDb.setCollaborator(null); + // projectInDb.setCollaboratorUrl(null); + // } else { projectInDb.setCollaborator(project.getCollaborator()); projectInDb.setCollaboratorUrl(project.getCollaboratorUrl()); - } + // } if (project.getUnderwrittenMode() <= 2) { projectInDb.setAdvancePeakAmount(new BigDecimal(0)); projectInDb.setAdvanceInterestAmount(new BigDecimal(0));