From 4b5a0b7660879e60694962c8ef5c5dbfc18c2ef5 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 7 Aug 2024 17:37:57 +0800 Subject: [PATCH] fix --- .../db/migration/V202408000000002.sql | 100 ++++++++++++++++++ .../com/iformall/domain/po/WxEnergyFees.java | 3 + .../impl/WxPropertyContractServiceImpl.java | 1 + .../resources/mapper/WxEnergyFeesMapper.xml | 3 +- 4 files changed, 106 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000002.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000002.sql index dfa5545de..145cbe48f 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000002.sql @@ -5,3 +5,103 @@ ALTER TABLE wx_property_contract ADD COLUMN first_bill_date_start timestamp COMM ALTER TABLE wx_property_contract ADD COLUMN first_bill_date_end timestamp COMMENT '首期账单结束时间'; +alter table wx_energy_fees_0 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_1 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_2 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_3 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_4 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_5 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_6 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_7 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_8 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_9 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_10 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_11 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_12 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_13 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_14 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_15 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_16 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_17 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_18 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_19 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_20 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_21 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_22 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_23 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_24 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_25 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_26 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_27 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_28 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_29 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_30 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_31 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_32 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_33 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_34 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_35 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_36 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_37 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_38 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_39 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_40 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_41 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_42 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_43 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_44 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_45 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_46 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_47 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_48 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_49 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_50 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_51 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_52 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_53 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_54 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_55 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_56 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_57 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_58 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_59 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_60 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_61 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_62 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_63 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_64 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_65 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_66 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_67 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_68 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_69 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_70 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_71 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_72 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_73 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_74 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_75 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_76 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_77 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_78 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_79 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_80 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_81 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_82 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_83 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_84 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_85 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_86 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_87 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_88 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_89 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_90 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_91 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_92 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_93 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_94 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_95 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_96 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_97 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_98 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; +alter table wx_energy_fees_99 ADD COLUMN tax_rate VARCHAR(30) COMMENT '税率'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java index 683a1e3e9..f77b56e93 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java @@ -55,6 +55,9 @@ public class WxEnergyFees extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "单价", name = "price") private String price; + @io.swagger.annotations.ApiModelProperty(value = "税率", name = "taxRate") + private String taxRate; + @io.swagger.annotations.ApiModelProperty(value = "公摊计算规则EnumEnergyPublicCalcuteRule", name = "publicCalcute") private Integer publicCalcute; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 9d04adec0..573dc42ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -277,6 +277,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService childList = new ArrayList(); childMap.put(ub.getParentBillId(), childList); } + ub.setFeesStandarsId(ub.getEnergyFeesId()); childList.add(ub); } } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml index 2ca0ad8dc..743daa54b 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml @@ -17,11 +17,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`public_calcute`,`type`,`bill_type`,`is_system`, - `fixed_price`,`calcute_unit`,`time_unit` + `fixed_price`,`calcute_unit`,`time_unit`,`tax_rate`