diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java index 9bb59335..3cfba853 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -64,7 +65,7 @@ public class XzdPurchaseContractInformation extends BaseEntity { /** * 原合同造价 */ - private Long originalContractCost; + private BigDecimal originalContractCost; /** * 签订日期 @@ -79,7 +80,7 @@ public class XzdPurchaseContractInformation extends BaseEntity { /** * 含税合同金额 */ - private Long taxInclusiveContractAmount; + private BigDecimal taxInclusiveContractAmount; /** * 合同状态,例如:新增 @@ -89,7 +90,7 @@ public class XzdPurchaseContractInformation extends BaseEntity { /** * 累计变更金额 */ - private Long cumulativeChangeAmount; + private BigDecimal cumulativeChangeAmount; private Long deptId; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java index 3848c645..ba147354 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -68,7 +69,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { /** * 原合同造价 */ - private Long originalContractCost; + private BigDecimal originalContractCost; /** * 签订日期 @@ -85,7 +86,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { /** * 含税合同金额 */ - private Long taxInclusiveContractAmount; + private BigDecimal taxInclusiveContractAmount; /** * 合同状态,例如:新增 @@ -95,7 +96,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { /** * 累计变更金额 */ - private Long cumulativeChangeAmount; + private BigDecimal cumulativeChangeAmount; /** * 归档日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index ff78e6f3..74b9c7df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -1,5 +1,6 @@ package org.dromara.xzd.contractManagement.purchaseManagement.domain.vo; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; @@ -102,7 +103,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 原合同造价 */ @ExcelProperty(value = "原合同造价") - private Long originalContractCost; + private BigDecimal originalContractCost; /** * 签订日期 @@ -127,7 +128,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 含税合同金额 */ @ExcelProperty(value = "含税合同金额") - private Long taxInclusiveContractAmount; + private BigDecimal taxInclusiveContractAmount; /** * 合同状态,例如:新增 @@ -139,7 +140,7 @@ public class XzdPurchaseContractInformationVo implements Serializable { * 累计变更金额 */ @ExcelProperty(value = "累计变更金额") - private Long cumulativeChangeAmount; + private BigDecimal cumulativeChangeAmount; /** * 归档日期