diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/XzdBidDepositRecovery.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/XzdBidDepositRecovery.java index b791c279..b148a9ce 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/XzdBidDepositRecovery.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/XzdBidDepositRecovery.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.time.LocalDateTime; import java.util.Date; @@ -60,12 +61,12 @@ public class XzdBidDepositRecovery extends BaseEntity { /** * 工程造价 */ - private Long projectCost; + private BigDecimal projectCost; /** * 收回金额 */ - private Long recoveryAmount; + private BigDecimal recoveryAmount; /** * 收回金额大写 @@ -75,7 +76,7 @@ public class XzdBidDepositRecovery extends BaseEntity { /** * 资料费 */ - private Long dataFee; + private BigDecimal dataFee; /** * 资料费大写 @@ -85,7 +86,7 @@ public class XzdBidDepositRecovery extends BaseEntity { /** * 退款金额 */ - private Long refundAmount; + private BigDecimal refundAmount; /** * 收回日期 @@ -100,7 +101,7 @@ public class XzdBidDepositRecovery extends BaseEntity { /** * 保证金金额 */ - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/bo/XzdBidDepositRecoveryBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/bo/XzdBidDepositRecoveryBo.java index 0f0f2695..c5bbaa02 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/bo/XzdBidDepositRecoveryBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/bo/XzdBidDepositRecoveryBo.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; @@ -60,12 +61,12 @@ public class XzdBidDepositRecoveryBo extends BaseEntity { /** * 工程造价 */ - private Long projectCost; + private BigDecimal projectCost; /** * 收回金额 */ - private Long recoveryAmount; + private BigDecimal recoveryAmount; /** * 收回金额大写 @@ -75,7 +76,7 @@ public class XzdBidDepositRecoveryBo extends BaseEntity { /** * 资料费 */ - private Long dataFee; + private BigDecimal dataFee; /** * 资料费大写 @@ -85,7 +86,7 @@ public class XzdBidDepositRecoveryBo extends BaseEntity { /** * 退款金额 */ - private Long refundAmount; + private BigDecimal refundAmount; /** * 收回日期 @@ -100,7 +101,7 @@ public class XzdBidDepositRecoveryBo extends BaseEntity { /** * 保证金金额 */ - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java index 4eb50370..854cfb23 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java @@ -1,5 +1,6 @@ package org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; @@ -77,7 +78,7 @@ public class XzdBidDepositRecoveryVo implements Serializable { * 工程造价 */ @ExcelProperty(value = "工程造价") - private Long projectCost; + private BigDecimal projectCost; /** * 收回金额 @@ -95,7 +96,7 @@ public class XzdBidDepositRecoveryVo implements Serializable { * 资料费 */ @ExcelProperty(value = "资料费") - private Long dataFee; + private BigDecimal dataFee; /** * 资料费大写 @@ -107,7 +108,7 @@ public class XzdBidDepositRecoveryVo implements Serializable { * 退款金额 */ @ExcelProperty(value = "退款金额") - private Long refundAmount; + private BigDecimal refundAmount; /** * 收回日期 @@ -125,7 +126,7 @@ public class XzdBidDepositRecoveryVo implements Serializable { * 保证金金额 */ @ExcelProperty(value = "保证金金额") - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写