From 0e5f92055fdf2102037e92fa39fa12a83bac423f Mon Sep 17 00:00:00 2001 From: xs Date: Tue, 18 Nov 2025 14:03:42 +0800 Subject: [PATCH] =?UTF-8?q?1.0.36.0=EF=BC=9A=20=E9=A2=84=E7=AE=97=E7=9B=B8?= =?UTF-8?q?=E5=85=B3domain=E6=95=B0=E5=80=BC=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E7=94=B1Long=E6=94=B9=E4=B8=BABigDecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/erp/domain/ErpBudgetDetail.java | 5 ++-- .../dromara/oa/erp/domain/ErpBudgetInfo.java | 13 +++++----- .../oa/erp/domain/ErpBudgetMaterialCost.java | 8 +++---- .../oa/erp/domain/bo/ErpBudgetDetailBo.java | 6 +++-- .../oa/erp/domain/bo/ErpBudgetInfoBo.java | 24 ++++++++++++------- .../domain/bo/ErpBudgetMaterialCostBo.java | 8 +++---- .../oa/erp/domain/vo/ErpBudgetDetailVo.java | 5 ++-- .../oa/erp/domain/vo/ErpBudgetInfoVo.java | 13 +++++----- .../domain/vo/ErpBudgetMaterialCostVo.java | 8 +++---- .../impl/ErpProjectChangeServiceImpl.java | 3 +-- 10 files changed, 52 insertions(+), 41 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetDetail.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetDetail.java index 9d5a24d2..4086037a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetDetail.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetDetail.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 项目预算详情对象 erp_budget_detail @@ -44,12 +45,12 @@ public class ErpBudgetDetail{ /** * 预算成本(元) */ - private Long budgetCost; + private BigDecimal budgetCost; /** * 降成本预算成本(元) */ - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 参考项目ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetInfo.java index 0732c065..e2dadefb 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetInfo.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 项目预算对象 erp_budget_info @@ -90,32 +91,32 @@ public class ErpBudgetInfo extends TenantEntity { /** * 合同额(元) */ - private Long contractAmount; + private BigDecimal contractAmount; /** * 合同净额(元) */ - private Long netContractAmount; + private BigDecimal netContractAmount; /** * 预算成本(元) */ - private Long budgetCost; + private BigDecimal budgetCost; /** * 预算毛利率，乘以100保存（如1%,保存1） */ - private Long budgetRate; + private BigDecimal budgetRate; /** * 降成本后预算成本(元) */ - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 降成本后预算毛利率 */ - private Long reduceBudgetRate; + private BigDecimal reduceBudgetRate; /** * 项目预算期间 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetMaterialCost.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetMaterialCost.java index 039cd3d4..44c0f4ec 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetMaterialCost.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetMaterialCost.java @@ -40,22 +40,22 @@ public class ErpBudgetMaterialCost extends TenantEntity { /** * 物料ID，关联base_material_info */ - private Long materielId; + private Long materialId; /** * SAP物料编码 */ - private String materielCode; + private String materialCode; /** * SAP物料名称 */ - private String materielName; + private String materialName; /** * 销售物料ID? */ - private Long relationMaterielId; + private Long relationMaterialId; /** * 单位,关联base_unit_info diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetDetailBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetDetailBo.java index dbdff61d..2839bdcd 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetDetailBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetDetailBo.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; + /** * 项目预算详情业务对象 erp_budget_detail * @@ -46,12 +48,12 @@ public class ErpBudgetDetailBo { /** * 预算成本(元) */ - private Long budgetCost; + private BigDecimal budgetCost; /** * 降成本预算成本(元) */ - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 参考项目ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetInfoBo.java index 4c4a2b28..fae5386e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetInfoBo.java @@ -1,7 +1,6 @@ package org.dromara.oa.erp.domain.bo; -import org.dromara.oa.erp.domain.ErpBudgetDetail; -import org.dromara.oa.erp.domain.ErpBudgetInfo; +import org.dromara.oa.erp.domain.*; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -9,8 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.oa.erp.domain.ErpBudgetMaterialCost; +import java.math.BigDecimal; import java.util.List; /** @@ -97,32 +96,32 @@ public class ErpBudgetInfoBo extends BaseEntity { /** * 合同额(元) */ - private Long contractAmount; + private BigDecimal contractAmount; /** * 合同净额(元) */ - private Long netContractAmount; + private BigDecimal netContractAmount; /** * 预算成本(元) */ - private Long budgetCost; + private BigDecimal budgetCost; /** * 预算毛利率，乘以100保存（如1%,保存1） */ - private Long budgetRate; + private BigDecimal budgetRate; /** * 降成本后预算成本(元) */ - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 降成本后预算毛利率 */ - private Long reduceBudgetRate; + private BigDecimal reduceBudgetRate; /** * 项目预算期间 @@ -168,4 +167,11 @@ public class ErpBudgetInfoBo extends BaseEntity { private List erpBudgetMaterialCostList; + private List erpBudgetLaborCostList; + + private List erpBudgetInstallCostList; + + private List erpBudgetTravelCostList; + + private List erpBudgetOtherCostList; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetMaterialCostBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetMaterialCostBo.java index a62d7ef2..08574252 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetMaterialCostBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetMaterialCostBo.java @@ -40,22 +40,22 @@ public class ErpBudgetMaterialCostBo extends BaseEntity { /** * 物料ID，关联base_material_info */ - private Long materielId; + private Long materialId; /** * SAP物料编码 */ - private String materielCode; + private String materialCode; /** * SAP物料名称 */ - private String materielName; + private String materialName; /** * 销售物料ID? */ - private Long relationMaterielId; + private Long relationMaterialId; /** * 单位,关联base_unit_info diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetDetailVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetDetailVo.java index 30499440..43b9f8c7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetDetailVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetDetailVo.java @@ -10,6 +10,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -56,13 +57,13 @@ public class ErpBudgetDetailVo implements Serializable { * 预算成本(元) */ @ExcelProperty(value = "预算成本(元)") - private Long budgetCost; + private BigDecimal budgetCost; /** * 降成本预算成本(元) */ @ExcelProperty(value = "降成本预算成本(元)") - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 参考项目ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetInfoVo.java index dbbeda0b..8011bc8c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetInfoVo.java @@ -10,6 +10,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -112,38 +113,38 @@ public class ErpBudgetInfoVo implements Serializable { * 合同额(元) */ @ExcelProperty(value = "合同额(元)") - private Long contractAmount; + private BigDecimal contractAmount; /** * 合同净额(元) */ @ExcelProperty(value = "合同净额(元)") - private Long netContractAmount; + private BigDecimal netContractAmount; /** * 预算成本(元) */ @ExcelProperty(value = "预算成本(元)") - private Long budgetCost; + private BigDecimal budgetCost; /** * 预算毛利率，乘以100保存（如1%,保存1） */ @ExcelProperty(value = "预算毛利率，乘以100保存", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "如=1%,保存1") - private Long budgetRate; + private BigDecimal budgetRate; /** * 降成本后预算成本(元) */ @ExcelProperty(value = "降成本后预算成本(元)") - private Long reduceBudgetCost; + private BigDecimal reduceBudgetCost; /** * 降成本后预算毛利率 */ @ExcelProperty(value = "降成本后预算毛利率") - private Long reduceBudgetRate; + private BigDecimal reduceBudgetRate; /** * 项目预算期间 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetMaterialCostVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetMaterialCostVo.java index 57f5487c..d44327e7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetMaterialCostVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetMaterialCostVo.java @@ -50,25 +50,25 @@ public class ErpBudgetMaterialCostVo implements Serializable { * 物料ID，关联base_material_info */ @ExcelProperty(value = "物料ID，关联base_material_info") - private Long materielId; + private Long materialId; /** * SAP物料编码 */ @ExcelProperty(value = "SAP物料编码") - private String materielCode; + private String materialCode; /** * SAP物料名称 */ @ExcelProperty(value = "SAP物料名称") - private String materielName; + private String materialName; /** * 销售物料ID? */ @ExcelProperty(value = "销售物料ID?") - private Long relationMaterielId; + private Long relationMaterialId; /** * 单位,关联base_unit_info diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java index 1e08b71b..af8713eb 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java @@ -450,8 +450,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { ErpProjectChangeBudget budget = new ErpProjectChangeBudget(); budget.setBudgetDetailId(detail.getBudgetDetailId()); budget.setSubjectName(detail.getBudgetItem()); - //xins的预算表数据库是decimal，实体类ErpBudgetDetail却是Long，所以这里需要转换一下 - BigDecimal budgetCost = BigDecimal.valueOf(detail.getBudgetCost()); + BigDecimal budgetCost = detail.getBudgetCost(); budget.setBudgetBefore(budgetCost); budget.setBudgetAfter(budgetCost); // 默认值 budget.setAmountUsed(BigDecimal.ZERO); // 默认已使用金额为0