diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index 0696b3473..26374136b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -281,10 +281,313 @@ UPDATE mall_permission SET sort = 44009 WHERE id = 44002; ALTER TABLE wx_energy_fees_shop ADD COLUMN time_unit INT(1) COMMENT '计费周期'; ALTER TABLE wx_energy_fees_shop ADD COLUMN time_type INT(1) COMMENT '费用生成方式'; -ALTER TABLE wx_energy_fees_shop ADD COLUMN begin_time TIMESTAMP COMMENT '开始日期'; -ALTER TABLE wx_energy_fees_shop ADD COLUMN end_time TIMESTAMP COMMENT '终止日期'; -ALTER TABLE wx_energy_reading_calcute_result ADD COLUMN begin_time TIMESTAMP COMMENT '开始日期'; -ALTER TABLE wx_energy_reading_calcute_result ADD COLUMN end_time TIMESTAMP COMMENT '终止日期'; +ALTER TABLE wx_energy_fees_shop ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_fees_shop ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; + +ALTER TABLE wx_energy_reading_calcute_result_0 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_1 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_2 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_3 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_4 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_5 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_6 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_7 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_8 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_9 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_10 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_11 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_12 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_13 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_14 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_15 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_16 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_17 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_18 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_19 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_20 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_21 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_22 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_23 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_24 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_25 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_26 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_27 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_28 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_29 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_30 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_31 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_32 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_33 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_34 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_35 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_36 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_37 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_38 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_39 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_40 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_41 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_42 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_43 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_44 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_45 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_46 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_47 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_48 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_49 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_50 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_51 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_52 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_53 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_54 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_55 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_56 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_57 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_58 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_59 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_60 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_61 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_62 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_63 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_64 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_65 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_66 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_67 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_68 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_69 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_70 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_71 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_72 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_73 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_74 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_75 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_76 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_77 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_78 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_79 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_80 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_81 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_82 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_83 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_84 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_85 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_86 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_87 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_88 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_89 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_90 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_91 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_92 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_93 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_94 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_95 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_96 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_97 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_98 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; +ALTER TABLE wx_energy_reading_calcute_result_99 ADD COLUMN begin_time TIMESTAMP DEFAULT current_timestamp COMMENT '开始日期'; + +ALTER TABLE wx_energy_reading_calcute_result_0 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_1 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_2 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_3 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_4 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_5 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_6 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_7 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_8 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_9 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_10 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_11 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_12 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_13 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_14 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_15 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_16 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_17 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_18 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_19 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_20 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_21 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_22 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_23 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_24 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_25 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_26 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_27 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_28 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_29 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_30 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_31 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_32 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_33 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_34 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_35 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_36 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_37 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_38 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_39 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_40 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_41 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_42 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_43 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_44 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_45 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_46 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_47 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_48 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_49 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_50 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_51 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_52 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_53 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_54 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_55 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_56 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_57 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_58 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_59 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_60 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_61 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_62 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_63 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_64 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_65 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_66 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_67 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_68 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_69 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_70 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_71 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_72 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_73 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_74 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_75 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_76 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_77 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_78 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_79 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_80 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_81 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_82 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_83 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_84 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_85 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_86 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_87 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_88 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_89 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_90 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_91 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_92 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_93 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_94 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_95 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_96 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_97 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_98 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; +ALTER TABLE wx_energy_reading_calcute_result_99 ADD COLUMN end_time TIMESTAMP DEFAULT current_timestamp COMMENT '终止日期'; + +ALTER TABLE wx_all_bill_0 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_1 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_2 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_3 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_4 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_5 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_6 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_7 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_8 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_9 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_10 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_11 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_12 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_13 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_14 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_15 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_16 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_17 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_18 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_19 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_20 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_21 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_22 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_23 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_24 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_25 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_26 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_27 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_28 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_29 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_30 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_31 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_32 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_33 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_34 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_35 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_36 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_37 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_38 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_39 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_40 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_41 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_42 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_43 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_44 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_45 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_46 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_47 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_48 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_49 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_50 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_51 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_52 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_53 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_54 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_55 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_56 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_57 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_58 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_59 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_60 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_61 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_62 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_63 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_64 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_65 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_66 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_67 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_68 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_69 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_70 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_71 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_72 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_73 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_74 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_75 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_76 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_77 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_78 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_79 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_80 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_81 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_82 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_83 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_84 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_85 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_86 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_87 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_88 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_89 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_90 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_91 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_92 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_93 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_94 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_95 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_96 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_97 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_98 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; +ALTER TABLE wx_all_bill_99 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年月' AFTER receive_date; + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index eecfb7f73..06286f91f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -159,6 +159,10 @@ public class WxAllBill extends TenantEntity { } return receiveDateStr; } + + @Excel(name = "所属年月", width = 20, orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value="所属年月",name="period") + private String period; @Excel(name = "欠缴金额(元)", width = 20, orderNum = "11") @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java index 305932d6c..64fc33ea8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java @@ -109,6 +109,7 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity { daily.setNeedPay(needPay); daily.setPay("0"); daily.setReceiveDate(starttime); + daily.setPeriod(calcute.getPeriod()); daily.setStarttime(starttime); daily.setEndtime(endtime); daily.setOwe(needPay); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index eb1da0049..067fa32ee 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -954,4 +954,8 @@ public class WxRentContractHelper { return vo; } } + + public static String getPeriod(Date date) { + return DateUtils.date2String(date, "yyyyMM"); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 8bfc5a956..1e3fe5133 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -58,6 +58,7 @@ import com.iformall.service.WxFinanceService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; +import com.iformall.service.helper.WxRentContractHelper; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import com.iformall.utils.StringContentUtils; @@ -1226,6 +1227,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { advanceBill.setStarttime(starttime); advanceBill.setEndtime(endtime); advanceBill.setReceiveDate(starttime); + advanceBill.setPeriod(WxRentContractHelper.getPeriod(starttime)); //advanceBill.setStatus(billStatus.getCode()); advanceBill.setEnergyFeesId(record.getEnergyFeesId()); advanceBill.setIsPreview(EnumYesOrNo.NO.getCode()); 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 cd7e7af20..0fbfb8de1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -853,6 +853,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setStarttime(start); wxBillProperty.setEndtime(end); wxBillProperty.setReceiveDate(receiveDate); + wxBillProperty.setPeriod(WxRentContractHelper.getPeriod(receiveDate)); wxBillProperty.setCanEdit(EnumYesOrNo.NO.getCode()); wxBillProperty.setNeedPay(needpay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index d955d5879..8a38f606a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -846,7 +846,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillDeposit.setStarttime(wxRentContract.getFirstBillDateStart()); wxBillDeposit.setEndtime(wxRentContract.getFirstBillDateEnd()); wxBillDeposit.setReceiveDate(wxRentContract.getFirstBillReceiveDate()); - + wxBillDeposit.setPeriod(WxRentContractHelper.getPeriod(wxRentContract.getFirstBillReceiveDate())); //wxBillDeposit.setExpiredDay(0L); wxBillDeposit.updateTenantInfo(wxRentContract); //wxBillDeposit.setIsDel(0); @@ -1286,6 +1286,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setStarttime(billTimeVo.getStartDate()); wxBillRent.setEndtime(billTimeVo.getEndDate()); wxBillRent.setReceiveDate(billTimeVo.getReceiveDate()); + wxBillRent.setPeriod(WxRentContractHelper.getPeriod(billTimeVo.getReceiveDate())); wxBillRent.setCanEdit(EnumYesOrNo.NO.getCode());; //wxBillRent.setContractNeedPay(needpay); //wxBillRent.setRentPriceInfo(getRentPriceInfo(wxRentContract,new BigDecimal(needpay))); @@ -1359,7 +1360,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { manage.setPay(wxBillRent.getPay()); manage.setStarttime(wxBillRent.getStarttime()); manage.setEndtime(wxBillRent.getEndtime()); - manage.setReceiveDate(wxBillRent.getReceiveDate());; + manage.setReceiveDate(wxBillRent.getReceiveDate()); + manage.setPeriod(wxBillRent.getPeriod()); manage.updateTenantInfo(wxBillRent); manage.setIsPreview(wxBillRent.getIsPreview()); manage.setMerchantId(wxBillRent.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 364727d18..7ef5a63ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -377,6 +377,8 @@ public class WxShopServiceImpl implements WxShopService { merchant.setLinkPerson("虚拟"); merchant.setLinkPhone("11111111111"); merchant.setStatus(EnumMerchantStatus.VALID.getCode()); + merchant.setImgUrl("https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png"); + merchant.setCoverPicture("[\"https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png\"]"); merchant.setCreateDate(new Date()); merchant.setUpdateDate(new Date()); merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index a5d86145f..010a81fb8 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -24,6 +24,7 @@ + @@ -50,7 +51,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`, `price_detail`,`need_pay`,`receive_pay`,`pay`,`bill_type`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,`return_pay`, - `bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`,`receive_date`, + `bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`,`receive_date`,`period`, `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`, `can_edit` @@ -354,7 +355,7 @@ #{item.needPay},#{item.receivePay},#{item.pay},#{item.billType},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney}, #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, - #{item.shopId},#{item.shopNumber},#{item.receiveDate},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, + #{item.shopId},#{item.shopNumber},#{item.receiveDate},#{item.period},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit} )