diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/XzdBidDepositPayment.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/XzdBidDepositPayment.java index dc2104ed..32698368 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/XzdBidDepositPayment.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/XzdBidDepositPayment.java @@ -50,7 +50,7 @@ public class XzdBidDepositPayment extends BaseEntity { /** * 工程造价(万元) */ - private Long projectCost; + private BigDecimal projectCost; /** * 经营模式 @@ -60,7 +60,7 @@ public class XzdBidDepositPayment extends BaseEntity { /** * 保证金金额 */ - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/bo/XzdBidDepositPaymentBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/bo/XzdBidDepositPaymentBo.java index bdc638f8..f7516066 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/bo/XzdBidDepositPaymentBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/bo/XzdBidDepositPaymentBo.java @@ -50,7 +50,7 @@ public class XzdBidDepositPaymentBo extends BaseEntity { /** * 工程造价(万元) */ - private Long projectCost; + private BigDecimal projectCost; /** * 经营模式 @@ -61,7 +61,7 @@ public class XzdBidDepositPaymentBo extends BaseEntity { * 保证金金额 */ @NotNull(message = "保证金金额不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/vo/XzdBidDepositPaymentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/vo/XzdBidDepositPaymentVo.java index b216be71..52bb7da9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/vo/XzdBidDepositPaymentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/domain/vo/XzdBidDepositPaymentVo.java @@ -65,7 +65,7 @@ public class XzdBidDepositPaymentVo implements Serializable { * 工程造价(万元) */ @ExcelProperty(value = "工程造价(万元)") - private Long projectCost; + private BigDecimal projectCost; /** * 经营模式 @@ -77,7 +77,7 @@ public class XzdBidDepositPaymentVo implements Serializable { * 保证金金额 */ @ExcelProperty(value = "保证金金额") - private Long depositAmount; + private BigDecimal depositAmount; /** * 保证金金额大写 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/service/impl/XzdBidDepositPaymentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/service/impl/XzdBidDepositPaymentServiceImpl.java index 65a4413f..d99c6615 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/service/impl/XzdBidDepositPaymentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/service/impl/XzdBidDepositPaymentServiceImpl.java @@ -100,6 +100,7 @@ public class XzdBidDepositPaymentServiceImpl extends ServiceImpl queryPageList(XzdBidDepositPaymentBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveName); return TableDataInfo.build(result); }