From b208292a9b476992b05463993ea6760ddbe5d4cb Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jul 2024 17:15:46 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=B0=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98;=E4=BF=AE?= =?UTF-8?q?=E6=94=B9sortNo=E7=9A=84=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 2 +- .../data/service/impl/PayCaseCouncilSubitemServiceImpl.java | 6 +++--- .../main/java/com/jero/project/entity/PayCommonProject.java | 2 +- .../main/java/com/jero/project/entity/PayWorkingGroup.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index 6f3b9f87..449ba201 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -162,7 +162,7 @@ ALTER TABLE `pay_working_group_subitem` -- 20240708 工作组表新增自定义排序字段 ALTER TABLE `pay_working_group` - add column sort_no int comment '自定义排序顺序'; + add column sort_no decimal(20, 10) comment '自定义排序顺序'; -- 20240710 新增会议酒店推荐表 DROP TABLE IF EXISTS `pay_meeting_hotel_recommend`; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index 681c55be..943e27ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -101,9 +101,9 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl tbMemberProjectSubitems = new ArrayList<>(); - BigDecimal councilChargeStandard = tbMemberProject.getCouncilChargeStandard(); - String councilChargeNoticeNo = tbMemberProject.getCouncilChargeNoticeNo(); - String chargeNoticeFileId = tbMemberProject.getCouncilChargeNoticeFileId(); + BigDecimal councilChargeStandard = tbMemberProject.getChargeStandard(); + String councilChargeNoticeNo = tbMemberProject.getChargeNoticeNo(); + String chargeNoticeFileId = tbMemberProject.getChargeNoticeFileId(); // 将所有企业成员添加到标协会成员表中 for (PayCaseCouncilSubitem payCaseCouncilSubitem : councilSubitemList) { String companyId = payCaseCouncilSubitem.getCompanyId(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index a5ec7a14..895a6af6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -381,5 +381,5 @@ public class PayCommonProject implements Serializable { @ApiModelProperty(value = "自定义排序顺序") @TableField(exist = false) - private Integer sortNo; + private BigDecimal sortNo; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 318c1851..a3dcdec3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -162,5 +162,5 @@ public class PayWorkingGroup implements Serializable { private String companyName; @ApiModelProperty(value = "自定义排序顺序") - private Integer sortNo; + private BigDecimal sortNo; }