From d6037d5846ed518c60ee8b1d59a2eab88cdecd21 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Wed, 12 Aug 2026 18:01:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(bms):=E5=8D=95=E4=BD=8D=20=E6=95=B0?= =?UTF-8?q?=E9=87=8F=20=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/bms/domain/billManage/entity/BillDetail.java | 6 ++++++ .../bms/domain/billManage/repository/po/BillDetailPO.java | 6 ++++++ .../bms/domain/billManage/repository/todo/BillDetailDO.java | 6 ++++++ .../mhd/bms/interfaces/dto/billManage/BillDetailDTO.java | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java index 546cf0e14..6bd28ad64 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java @@ -88,4 +88,10 @@ public class BillDetail extends BaseVOEntity{ private String invoiceItemName; @ApiModelProperty(value = "费用类别") private String feeType; + @ApiModelProperty(value = "计费单位") + private String billingUnit; + @ApiModelProperty(value = "计费数量") + private BigDecimal billingNum; + @ApiModelProperty(value = "计费单价") + private BigDecimal billingUnitPrice; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java index 5c4c7bac5..acd96caf2 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java @@ -134,5 +134,11 @@ public class BillDetailPO extends BaseVOEntity{ private String invoiceItemName; @ApiModelProperty(value = "费用类别") private String feeType; + @ApiModelProperty(value = "计费单位") + private String billingUnit; + @ApiModelProperty(value = "计费数量") + private BigDecimal billingNum; + @ApiModelProperty(value = "计费单价") + private BigDecimal billingUnitPrice; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java index e443f47f0..b1d521d77 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java @@ -98,4 +98,10 @@ public class BillDetailDO extends BaseVOEntity{ private String invoiceItemName; @ApiModelProperty(value = "费用类别") private String feeType; + @ApiModelProperty(value = "计费单位") + private String billingUnit; + @ApiModelProperty(value = "计费数量") + private BigDecimal billingNum; + @ApiModelProperty(value = "计费单价") + private BigDecimal billingUnitPrice; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java index 9c42728a0..acb35ff99 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java @@ -139,4 +139,10 @@ public class BillDetailDTO extends BaseVOEntity{ private String invoiceItemName; @ApiModelProperty(value = "费用类别") private String feeType; + @ApiModelProperty(value = "计费单位") + private String billingUnit; + @ApiModelProperty(value = "计费数量") + private BigDecimal billingNum; + @ApiModelProperty(value = "计费单价") + private BigDecimal billingUnitPrice; } \ No newline at end of file From f6125e68bfa69f3e166a5478c7f80736e37f1a6e Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Wed, 12 Aug 2026 18:04:51 +0800 Subject: [PATCH 2/2] fix(bms):sql --- sql/20260803_alter_table_lease_add_status.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sql/20260803_alter_table_lease_add_status.sql b/sql/20260803_alter_table_lease_add_status.sql index c67fbe76b..c764a4411 100644 --- a/sql/20260803_alter_table_lease_add_status.sql +++ b/sql/20260803_alter_table_lease_add_status.sql @@ -14,3 +14,14 @@ ALTER TABLE NGWL_TEST_SYSTEM.LEASE ADD status TINYINT DEFAULT 1; -- 2. 添加注释（达梦必须单独写） COMMENT ON COLUMN NGWL_TEST_SYSTEM.LEASE.status IS '状态：1=启用，0=停用'; + + + + +-- bms +ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_UNIT VARCHAR2(100); +ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_NUM NUMBER(18,2); +ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_UNIT_PRICE NUMBER(18,2); +COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_UNIT IS '计费单位'; +COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_NUM IS '计费数量'; +COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_UNIT_PRICE IS '计费单价';