winter 1 год назад
Родитель
Сommit
73aed942d5
17 измененных файлов: 1102 добавлений и 115 удалений
  1. +909
    -0
      mallinkAdmin/src/main/resources/db/migration/V202407018.sql
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +7
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java
  5. +3
    -3
      mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java
  6. +3
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  8. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  9. +94
    -68
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  10. +7
    -4
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  11. +23
    -2
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  12. +6
    -2
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  13. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  14. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  15. +12
    -12
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  16. +7
    -4
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  17. +7
    -4
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 909
- 0
mallinkAdmin/src/main/resources/db/migration/V202407018.sql Просмотреть файл

@@ -1605,6 +1605,915 @@ CREATE TABLE `wx_finance_advance_type` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表';


alter table wx_bill_rent_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_rent_manage_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_manage_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_rent_deposit_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_rent_deposit_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_property_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_property_0 drop column fees_standars_id;
alter table wx_bill_property_1 drop column fees_standars_id;
alter table wx_bill_property_2 drop column fees_standars_id;
alter table wx_bill_property_3 drop column fees_standars_id;
alter table wx_bill_property_4 drop column fees_standars_id;
alter table wx_bill_property_5 drop column fees_standars_id;
alter table wx_bill_property_6 drop column fees_standars_id;
alter table wx_bill_property_7 drop column fees_standars_id;
alter table wx_bill_property_8 drop column fees_standars_id;
alter table wx_bill_property_9 drop column fees_standars_id;
alter table wx_bill_property_10 drop column fees_standars_id;
alter table wx_bill_property_11 drop column fees_standars_id;
alter table wx_bill_property_12 drop column fees_standars_id;
alter table wx_bill_property_13 drop column fees_standars_id;
alter table wx_bill_property_14 drop column fees_standars_id;
alter table wx_bill_property_15 drop column fees_standars_id;
alter table wx_bill_property_16 drop column fees_standars_id;
alter table wx_bill_property_17 drop column fees_standars_id;
alter table wx_bill_property_18 drop column fees_standars_id;
alter table wx_bill_property_19 drop column fees_standars_id;
alter table wx_bill_property_20 drop column fees_standars_id;
alter table wx_bill_property_21 drop column fees_standars_id;
alter table wx_bill_property_22 drop column fees_standars_id;
alter table wx_bill_property_23 drop column fees_standars_id;
alter table wx_bill_property_24 drop column fees_standars_id;
alter table wx_bill_property_25 drop column fees_standars_id;
alter table wx_bill_property_26 drop column fees_standars_id;
alter table wx_bill_property_27 drop column fees_standars_id;
alter table wx_bill_property_28 drop column fees_standars_id;
alter table wx_bill_property_29 drop column fees_standars_id;
alter table wx_bill_property_30 drop column fees_standars_id;
alter table wx_bill_property_31 drop column fees_standars_id;
alter table wx_bill_property_32 drop column fees_standars_id;
alter table wx_bill_property_33 drop column fees_standars_id;
alter table wx_bill_property_34 drop column fees_standars_id;
alter table wx_bill_property_35 drop column fees_standars_id;
alter table wx_bill_property_36 drop column fees_standars_id;
alter table wx_bill_property_37 drop column fees_standars_id;
alter table wx_bill_property_38 drop column fees_standars_id;
alter table wx_bill_property_39 drop column fees_standars_id;
alter table wx_bill_property_40 drop column fees_standars_id;
alter table wx_bill_property_41 drop column fees_standars_id;
alter table wx_bill_property_42 drop column fees_standars_id;
alter table wx_bill_property_43 drop column fees_standars_id;
alter table wx_bill_property_44 drop column fees_standars_id;
alter table wx_bill_property_45 drop column fees_standars_id;
alter table wx_bill_property_46 drop column fees_standars_id;
alter table wx_bill_property_47 drop column fees_standars_id;
alter table wx_bill_property_48 drop column fees_standars_id;
alter table wx_bill_property_49 drop column fees_standars_id;
alter table wx_bill_property_50 drop column fees_standars_id;
alter table wx_bill_property_51 drop column fees_standars_id;
alter table wx_bill_property_52 drop column fees_standars_id;
alter table wx_bill_property_53 drop column fees_standars_id;
alter table wx_bill_property_54 drop column fees_standars_id;
alter table wx_bill_property_55 drop column fees_standars_id;
alter table wx_bill_property_56 drop column fees_standars_id;
alter table wx_bill_property_57 drop column fees_standars_id;
alter table wx_bill_property_58 drop column fees_standars_id;
alter table wx_bill_property_59 drop column fees_standars_id;
alter table wx_bill_property_60 drop column fees_standars_id;
alter table wx_bill_property_61 drop column fees_standars_id;
alter table wx_bill_property_62 drop column fees_standars_id;
alter table wx_bill_property_63 drop column fees_standars_id;
alter table wx_bill_property_64 drop column fees_standars_id;
alter table wx_bill_property_65 drop column fees_standars_id;
alter table wx_bill_property_66 drop column fees_standars_id;
alter table wx_bill_property_67 drop column fees_standars_id;
alter table wx_bill_property_68 drop column fees_standars_id;
alter table wx_bill_property_69 drop column fees_standars_id;
alter table wx_bill_property_70 drop column fees_standars_id;
alter table wx_bill_property_71 drop column fees_standars_id;
alter table wx_bill_property_72 drop column fees_standars_id;
alter table wx_bill_property_73 drop column fees_standars_id;
alter table wx_bill_property_74 drop column fees_standars_id;
alter table wx_bill_property_75 drop column fees_standars_id;
alter table wx_bill_property_76 drop column fees_standars_id;
alter table wx_bill_property_77 drop column fees_standars_id;
alter table wx_bill_property_78 drop column fees_standars_id;
alter table wx_bill_property_79 drop column fees_standars_id;
alter table wx_bill_property_80 drop column fees_standars_id;
alter table wx_bill_property_81 drop column fees_standars_id;
alter table wx_bill_property_82 drop column fees_standars_id;
alter table wx_bill_property_83 drop column fees_standars_id;
alter table wx_bill_property_84 drop column fees_standars_id;
alter table wx_bill_property_85 drop column fees_standars_id;
alter table wx_bill_property_86 drop column fees_standars_id;
alter table wx_bill_property_87 drop column fees_standars_id;
alter table wx_bill_property_88 drop column fees_standars_id;
alter table wx_bill_property_89 drop column fees_standars_id;
alter table wx_bill_property_90 drop column fees_standars_id;
alter table wx_bill_property_91 drop column fees_standars_id;
alter table wx_bill_property_92 drop column fees_standars_id;
alter table wx_bill_property_93 drop column fees_standars_id;
alter table wx_bill_property_94 drop column fees_standars_id;
alter table wx_bill_property_95 drop column fees_standars_id;
alter table wx_bill_property_96 drop column fees_standars_id;
alter table wx_bill_property_97 drop column fees_standars_id;
alter table wx_bill_property_98 drop column fees_standars_id;
alter table wx_bill_property_99 drop column fees_standars_id;

alter table wx_bill_property_deposit_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_property_deposit_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_daily_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_daily_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_other_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;

alter table wx_bill_other_deposit_0 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_1 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_2 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_3 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_4 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_5 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_6 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_7 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_8 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_9 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_10 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_11 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_12 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_13 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_14 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_15 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_16 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_17 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_18 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_19 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_20 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_21 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_22 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_23 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_24 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_25 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_26 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_27 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_28 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_29 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_30 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_31 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_32 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_33 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_34 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_35 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_36 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_37 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_38 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_39 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_40 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_41 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_42 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_43 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_44 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_45 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_46 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_47 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_48 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_49 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_50 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_51 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_52 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_53 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_54 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_55 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_56 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_57 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_58 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_59 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_60 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_61 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_62 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_63 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_64 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_65 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_66 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_67 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_68 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_69 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_70 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_71 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_72 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_73 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_74 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_75 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_76 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_77 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_78 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_79 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_80 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_81 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_82 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_83 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_84 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_85 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_86 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_87 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_88 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_89 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_90 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_91 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_92 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_93 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_94 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_95 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_96 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_97 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_98 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;
alter table wx_bill_other_deposit_99 add column energy_fees_id bigint(20) NOT NULL COMMENT '科目编号';;





+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java Просмотреть файл

@@ -98,8 +98,6 @@ public class WxBillProperty extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="主物业账单ID",name="parentBillId")
private Long parentBillId;
@io.swagger.annotations.ApiModelProperty(value="标准费用ID",name="feesStandarsId")
private Long feesStandarsId;

@TableField(exist = false)
private Integer allPeriod;


+ 7
- 8
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -521,24 +522,22 @@ public class WxRentContract extends TenantEntity {
return sb.toString();
}
public String getDepositDetail(Map<Long,WxEnergyFees> typeMap) {
StringBuffer sb = new StringBuffer("");
public Map<Long,String> getDepositEnergyFees() {
String dsdstr = this.getCashtypeContentLsit();
if (!StringUtils.isBlank(dsdstr) && null != typeMap) {
if (!StringUtils.isBlank(dsdstr)) {
JSONArray rentInfoArray = JSONArray.parseArray(dsdstr);
Map<Long,String> retMap = new HashMap<Long,String>();
int size = rentInfoArray.size();
for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
String depositType = rentInfoObject.getString("value");
String deposit = rentInfoObject.getString("deposit");
Long dt = Long.parseLong(depositType);
WxEnergyFees dtt = typeMap.get(dt);
if (null != dtt) {
sb.append(dtt.getName()).append(":").append(deposit).append(",");
}
retMap.put(dt, deposit);
}
return retMap;
}
return sb.toString();
return null;
}
@TableField(exist = false)


+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java Просмотреть файл

@@ -97,6 +97,12 @@ public class WxBillBaseEntity extends TenantEntity {
public Integer status;
@TableField(exist = false)
public List<Integer> statusList;
@io.swagger.annotations.ApiModelProperty(value = "费用科目", name = "energyFeesId")
public Long energyFeesId;
@Excel(name = "费用科目", width = 20, orderNum = "8")
@TableField(exist = false)
public String energyFeesName;

//@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value="实际应收金额(加上了滞纳金服务费等费用)",name="realReceivePay")


+ 3
- 3
mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java Просмотреть файл

@@ -8,7 +8,7 @@ public enum EnumBillAllType {
RENT(1,"租金",1L,false),
RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false),
RENT_OPERATION_MANAGE(12,"运营管理费",3L,false),
RENT_DEPOSIT(13,"租赁押金",4L,true),
RENT_DEPOSIT(13,"租赁押金",null,true),
PROPERTY(2,"物业费",5L,false),
PROPERTY_DEPOSIT(21,"物业押金",6L,true),
DAILY(3, "日常(水电空调)费",null,false),
@@ -27,7 +27,7 @@ public enum EnumBillAllType {

private Integer code;
private String message;
private Long energyFeesId;//wx_energy_fees(费用科目)里的id,系统内置的有这个
private Long energyFeesId;//wx_energy_fees(费用科目)里的id,不可配置的有这个
private boolean isFixedPrice;//是否强制为一次性费用

EnumBillAllType(Integer code, String message,Long energyFeesId,boolean isFixedPrice) {
@@ -54,7 +54,7 @@ public enum EnumBillAllType {
}

public static EnumBillAllType[] getSystemTypes() {
EnumBillAllType[] ret = new EnumBillAllType[] {RENT,RENT_BUSSINESS_MANAGE,RENT_OPERATION_MANAGE,RENT_DEPOSIT,
EnumBillAllType[] ret = new EnumBillAllType[] {RENT,RENT_BUSSINESS_MANAGE,RENT_OPERATION_MANAGE,
PROPERTY,PROPERTY_DEPOSIT};
return ret;
}


+ 3
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java Просмотреть файл

@@ -3,7 +3,6 @@ package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxBillDeposit;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
@@ -47,4 +46,7 @@ public interface WxBillDepositMapper extends CommonMapper<WxBillDeposit, Long> {
WxBillDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void insertBills(@Param("tenantId")String tenantId, @Param("list") List<WxBillDeposit> resultList);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java Просмотреть файл

@@ -828,6 +828,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
WxEnergyMeter meter = meterMap.get(mr.getMeterId());
WxShop shop = shopMap.get(mr.getShopId());
WxBillDaily userBill = mr.generateUserBill(record, merchant, user, meter);
userBill.setEnergyFeesId(fees.getId());
if (null != userBill) {
billList.add(userBill);
}
@@ -866,6 +867,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
if (null != publicBill) {
publicBill.setEnergyFeesId(fees.getId());
billList.add(publicBill);
}
}catch(Exception e) {


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -567,6 +567,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType());
wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract));
wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId());
try {
wxBillPropertyDepositMapper.insert(wxBillDeposit);
} catch (Exception e) {
@@ -775,6 +776,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
++billcount;
//物业主账单
WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null);
//设置物业科目
wxBillProperty.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
//非一次性账单
wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList);
List<WxBillProperty> childList = null;
@@ -785,6 +788,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
WxBillFeesStandardsListVo svo = unFixedList.get(j);
svo.setParentBillId(wxBillProperty.getId());
WxBillProperty property = generateBillPropertyByBillStandards(wxPayAccountBill,wxPropertyContract,isPreview,user,svo,billcount,shopInfo);
//设置科目
property.setEnergyFeesId(svo.getFeeStandards().getId());
allResultList.add(property);
childList.add(property);
}
@@ -863,7 +868,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString());
wxBillProperty.setComments(remark);
wxBillProperty.setParentBillId(parentBillId);
wxBillProperty.setFeesStandarsId(feesStandardsId);
wxBillProperty.setEnergyFeesId(feesStandardsId);

//计算手续费
BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP);


+ 94
- 68
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -704,6 +704,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (null != shopIds && shopIds.size() == 1) {
bill.setShopId(shopIds.get(0));
}
bill.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId());
//setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod());
if (bill.getReceivePay().equals("0")) {
bill.setStatus(EnumBillStatus.PAID.getCode());
@@ -784,6 +785,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setStatus(EnumBillStatus.PAID.getCode());
bill.setPayDate(date);
}
if (feeType.getCode() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()) {
bill.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId());
}else if (feeType.getCode() == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()) {
bill.setEnergyFeesId(EnumBillAllType.RENT_OPERATION_MANAGE.getEnergyFeesId());
}
//计算手续费
BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), record.getDecimalSize(), BigDecimal.ROUND_HALF_UP);
bill.setServiceChargePay(servicePay.toPlainString());
@@ -939,80 +947,98 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId);
if (wxRentContract != null && StringUtils.isNotBlank(wxRentContract.getDeposit())
&& new BigDecimal(wxRentContract.getDeposit()).compareTo(new BigDecimal(0)) > 0 ) {
//根据不同的科目生成不同的押金账单
Map<Long,String> feesMap = wxRentContract.getDepositEnergyFees();
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(fq);
fq.updateTenantInfo(user);
fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
Map<Long,WxEnergyFees> typeMap = wxEnergyService.getFeesMap(fq);
List<WxBillDeposit> insertList = new ArrayList<WxBillDeposit>();
for (Iterator<Long> it = feesMap.keySet().iterator();it.hasNext();){
Long energyFeesId = it.next();
String deposit = feesMap.get(energyFeesId);
WxEnergyFees fees = typeMap.get(energyFeesId);
final IdWorker idWorker = IdWorker.get();
WxBillDeposit wxBillDeposit = new WxBillDeposit();
wxBillDeposit.setId(idWorker.nextId());
wxBillDeposit.setRentContractId(wxRentContract.getId());
if (null != fees) {
wxBillDeposit.setContractDepoistDetail("合同押金项["+fees.getName()+"]"+deposit+"元");
}
wxBillDeposit.setPay("0");
//String needpay = wxRentContract.getDeposit();
String needpay = deposit;
wxBillDeposit.setReceivePay(needpay);
wxBillDeposit.setNeedPay(needpay);
//wxBillDeposit.setOwe(needpay);
//找到计租方式
int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
Date date = new Date();
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.DAY_OF_MONTH, -1);
Date time = instance.getTime();
wxBillDeposit.setReceiveDate(time);
//账单开始时间
instance.clear();
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(Calendar.DAY_OF_MONTH, 1);
wxBillDeposit.setStarttime(instance.getTime());
//账单结束时间
instance.clear();
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(dayType, wxRentContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());
wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
wxBillDeposit.setReceiveDate(time);
wxBillDeposit.updateTenantInfo(wxRentContract);
wxBillDeposit.setIsDel(0);
wxBillDeposit.setMerchantId(wxRentContract.getMerchantId());
if (null != user) {
wxBillDeposit.setUserId(user.getId());
}
if (wxRentContract.shopIdsByRentInfo().size()==1) {
wxBillDeposit.setShopId(wxRentContract.shopIdsByRentInfo().get(0));
}
wxBillDeposit.setCreatetime(date);
if (null != user) {
wxBillDeposit.setCreateBy(user.getId());
wxBillDeposit.setCreateByName(user.getName());
}
wxBillDeposit.setUpdatetime(date);
if (null != user) {
wxBillDeposit.setUpdateBy(user.getId());
wxBillDeposit.setUpdateByName(user.getName());
}
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillDeposit.setRentShopType(wxRentContract.getRentShopType());
if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) {
String rentInfo = wxRentContract.getRentInfo();
if (rentInfo != null) {
JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
Map<String, Object> shopInfo = new HashMap<>();
for (int i = 0, size = rentInfoArray.size(); i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit"));
}
wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo));
}
}
wxBillDeposit.setEnergyFeesId(energyFeesId);
insertList.add(wxBillDeposit);
}
final IdWorker idWorker = IdWorker.get();
WxBillDeposit wxBillDeposit = new WxBillDeposit();
wxBillDeposit.setId(idWorker.nextId());
wxBillDeposit.setRentContractId(wxRentContract.getId());
wxBillDeposit.setContractDepoistDetail(wxRentContract.getDepositDetail(typeMap));
wxBillDeposit.setPay("0");
String needpay = wxRentContract.getDeposit();
wxBillDeposit.setReceivePay(needpay);
wxBillDeposit.setNeedPay(needpay);
//wxBillDeposit.setOwe(needpay);
//找到计租方式
int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
Date date = new Date();
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.DAY_OF_MONTH, -1);
Date time = instance.getTime();
wxBillDeposit.setReceiveDate(time);
//账单开始时间
instance.clear();
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(Calendar.DAY_OF_MONTH, 1);
wxBillDeposit.setStarttime(instance.getTime());
//账单结束时间
instance.clear();
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(dayType, wxRentContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());
wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
wxBillDeposit.setReceiveDate(time);
wxBillDeposit.updateTenantInfo(wxRentContract);
wxBillDeposit.setIsDel(0);
wxBillDeposit.setMerchantId(wxRentContract.getMerchantId());
if (null != user) {
wxBillDeposit.setUserId(user.getId());
}
if (wxRentContract.shopIdsByRentInfo().size()==1) {
wxBillDeposit.setShopId(wxRentContract.shopIdsByRentInfo().get(0));
}
wxBillDeposit.setCreatetime(date);
if (null != user) {
wxBillDeposit.setCreateBy(user.getId());
wxBillDeposit.setCreateByName(user.getName());
}
wxBillDeposit.setUpdatetime(date);
if (null != user) {
wxBillDeposit.setUpdateBy(user.getId());
wxBillDeposit.setUpdateByName(user.getName());
}
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillDeposit.setRentShopType(wxRentContract.getRentShopType());
if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) {
String rentInfo = wxRentContract.getRentInfo();
if (rentInfo != null) {
JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
Map<String, Object> shopInfo = new HashMap<>();
for (int i = 0, size = rentInfoArray.size(); i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit"));
}
wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo));
}
}
try {
wxBillDepositMapper.insert(wxBillDeposit);
if (insertList.size() > 0 ) {
wxBillDepositMapper.insertBills(user.getTenantId(),insertList);
}
} catch (Exception e) {
logger.error("添加押金账单失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());


+ 7
- 4
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml Просмотреть файл

@@ -41,13 +41,14 @@
<result column="energy_reading_calcuteId" jdbcType="BIGINT" property="energyReadingCalcuteId" />
<result column="energy_reading_id" jdbcType="BIGINT" property="energyReadingId" />
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>
<sql id="allColumns">
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`,
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`remark`,`last_owe_call_user`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -69,6 +70,7 @@
<if test=" null != applyStatus ">and `apply_status` = #{applyStatus}</if>
<if test=" null != isDel "> and `is_del` = #{isDel} </if>
<if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != userId "> and `user_id` = #{userId} </if>
<if test=" null != updatetime "> and `updatetime` = #{updatetime} </if>
<if test=" null != type "> and `type` = #{type} </if>
@@ -122,6 +124,7 @@
<if test=" null != freeze ">and br.`freeze` = #{freeze}</if>
<if test=" null != id ">and br.`id` = #{id}</if>
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != status ">and br.`status` = #{status}</if>
<if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
@@ -168,7 +171,7 @@
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark`,br.`energy_fees_id`,
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_reading_calcuteId`,br.`energy_reading_id`
from wx_bill_daily br
<include refid="queryBillDailyListConditions" />
@@ -260,14 +263,14 @@
INSERT INTO wx_bill_daily (`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`status`,`is_del`,
`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`rent_shop_type`,`apply_status`,`pay_way`,`price_detail`,
`starttime`,`endtime`,`freeze`,`build_way`,`service_charge_pay`,`apply_pay_img`,`apply_update_time`,`remark`,`create_by`,`update_by`,
`create_by_name`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`)
`create_by_name`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id`,`energy_fees_id`)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},#{item.tenantId},#{item.parentTenantId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime},#{item.expiredDay},#{item.status},#{item.isDel},
#{item.merchantId},#{item.userId},#{item.shopId},#{item.shopName},#{item.updatetime},#{item.type},#{item.rentShopType},#{item.applyStatus},#{item.payWay},#{item.priceDetail},
#{item.starttime},#{item.endtime},#{item.freeze},#{item.buildWay},#{item.serviceChargePay},#{item.applyPayImg},#{item.applyUpdateTime},#{item.remark},#{item.createBy},#{item.updateBy},
#{item.createByName},#{item.updateByName},#{item.energyReadingCalcuteId},#{item.energyReadingId}
#{item.createByName},#{item.updateByName},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.energyFeesId}
)
</foreach>
</insert>


+ 23
- 2
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml Просмотреть файл

@@ -37,11 +37,12 @@
<result column="contract_depoist_detail" property="contractDepoistDetail"/>
<result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/>
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`,
`expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,`energy_fees_id`,
`last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,contract_depoist_detail,`create_by`,`create_by_name`,`update_by`,`update_by_name`
</sql>

@@ -55,6 +56,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != rentContractId "> and `rent_contract_id` = #{rentContractId} </if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != receivePay "> and `receive_pay` = #{receivePay} </if>
<if test=" null != pay "> and `pay` = #{pay} </if>
<if test=" null != receiveDate "> and `receive_date` = #{receiveDate} </if>
@@ -132,7 +134,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`rent_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_time`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,br.`last_owe_call_user`,
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
order by br.id desc
@@ -154,6 +156,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != contractDepoistDetail and '' != contractDepoistDetail">
and br.`contract_depoist_detail` like concat('%', #{contractDepoistDetail},'%')
@@ -357,5 +360,23 @@
delete from wx_bill_rent_deposit where id = #{id} and tenant_id = #{tenantId}
</delete>
<insert id="insertBills" parameterType="hashmap">
INSERT INTO wx_bill_rent_deposit (id,rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime,
expired_day,tenant_id, parent_tenant_id,status,is_del,need_pay, merchant_id, user_id, shop_id, updatetime, starttime,
endtime,rent_shop_type,return_price,shop_info,pay_way,freeze,service_charge_pay,
contract_depoist_detail,create_by,create_by_name,update_by,update_by_name,energy_fees_id
)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},#{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime},
#{item.expiredDay},#{item.tenantId},#{item.parentTenantId},#{item.status},#{item.isDel},#{item.needPay},
#{item.merchantId},#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},
#{item.endtime},#{item.rentShopType},#{item.returnPrice},#{item.shopInfo},#{item.payWay},#{item.freeze},#{item.serviceChargePay},
#{item.contractDepoistDetail},#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName},#{item.energyFeesId}
)
</foreach>
</insert>
</mapper>


+ 6
- 2
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml Просмотреть файл

@@ -38,12 +38,14 @@
<result column="endtime" property="endtime"/>
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_time`,`last_owe_call_user`,
`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,`create_by`,`create_by_name`,`update_by`,`update_by_name`
`rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
`energy_fees_id`
</sql>
<sql id="dynamicWhereConditions">
@@ -62,6 +64,7 @@
<if test=" null != createtime ">and `createtime` = #{createtime}</if>
<if test=" null != expiredDay ">and `expired_day` = #{expiredDay}</if>
<if test=" null != status ">and `status` = #{status}</if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != applyStatus ">and `apply_status` = #{applyStatus}</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
@@ -122,6 +125,7 @@
<if test=" null != status ">and br.`status` = #{status}</if>
<if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != name and ''!=name">and br.`name` = #{name}</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
@@ -164,7 +168,7 @@
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`,
br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`last_owe_call_time`,
br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`last_owe_call_time`,br.`energy_fees_id`,
br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
from wx_bill_other_deposit br
<include refid="queryBillListConditions"/>


+ 5
- 2
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml Просмотреть файл

@@ -38,13 +38,14 @@
<result column="endtime" property="endtime"/>
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_user`,
`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`last_owe_call_time`,
`rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -66,6 +67,7 @@
<if test=" null != applyStatus ">and `apply_status` = #{applyStatus}</if>
<if test=" null != isDel "> and `is_del` = #{isDel} </if>
<if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != userId "> and `user_id` = #{userId} </if>
<if test=" null != shopId "> and `shop_id` = #{shopId} </if>
<if test=" null != updatetime "> and `updatetime` = #{updatetime} </if>
@@ -117,6 +119,7 @@
<if test=" null != status ">and br.`status` = #{status}</if>
<if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != name and ''!=name">and br.`name` like concat('%',#{name},'%')</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
@@ -158,7 +161,7 @@
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,
br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.`energy_fees_id`,
br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
from wx_bill_other br
<include refid="queryBillListConditions" />


+ 5
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml Просмотреть файл

@@ -38,13 +38,14 @@
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="merchant_name" property="merchantName"/>
<result column="shop_number" property="shopNumber"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`starttime`,`endtime`,
`pay_date`,`createtime`,`expired_day`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_user`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,
`create_by`,`create_by_name`,`update_by`,`update_by_name`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -57,6 +58,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != propertyContractId "> and `property_contract_id` = #{propertyContractId} </if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != receivePay "> and `receive_pay` = #{receivePay} </if>
<if test=" null != pay "> and `pay` = #{pay} </if>
<if test=" null != receiveDate "> and `receive_date` = #{receiveDate} </if>
@@ -125,6 +127,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != starttime">and br.`starttime` &lt;= #{starttime}</if>
<if test=" null != endtime">and br.`endtime` &gt;= #{endtime}</if>
@@ -156,7 +159,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`property_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`status`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>
order by id desc


+ 12
- 12
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Просмотреть файл

@@ -38,7 +38,6 @@
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>
<result column="parent_bill_id" jdbcType="BIGINT" property="parentBillId"/>
<result column="fees_standars_id" jdbcType="BIGINT" property="feesStandarsId"/>
<result column="starttime" property="starttime"/>
<result column="endtime" property="endtime"/>
<result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/>
@@ -52,6 +51,7 @@
<result column="late_pay_ratio" property="latePayRatio"/>
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>

<sql id="allColumns">
@@ -59,7 +59,7 @@
`createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`fees_standars_id`
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -72,6 +72,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != propertyContractId ">and `property_contract_id` = #{propertyContractId}</if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if>
<if test=" null != pay ">and `pay` = #{pay}</if>
<if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if>
@@ -91,11 +92,10 @@
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>
<if test=" null != parentBillId ">and `parent_bill_id` = #{parentBillId}</if>
<if test=" null != feesStandarsId ">and `fees_standars_id` = #{feesStandarsId}</if>
<if test=" 1 == hasParentBillId ">and `parent_bill_id` is not null</if>
<if test=" 0 == hasParentBillId ">and `parent_bill_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and `fees_standars_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and `fees_standars_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and `energy_fees_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and `energy_fees_id` is null</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != propertyContractIds ">
@@ -151,6 +151,7 @@
<if test=" null != freeze ">and br.`freeze` = #{freeze}</if>
<if test=" null != id ">and br.`id` = #{id}</if>
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != status ">and br.`status` = #{status}</if>
<if test=" null != applyStatus ">and br.`apply_status` = #{applyStatus}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
@@ -170,11 +171,10 @@
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
<if test=" null != parentBillId ">and br.`parent_bill_id` = #{parentBillId}</if>
<if test=" null != feesStandarsId ">and br.`fees_standars_id` = #{feesStandarsId}</if>
<if test=" 1 == hasParentBillId ">and br.`parent_bill_id` is not null</if>
<if test=" 0 == hasParentBillId ">and br.`parent_bill_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and br.`fees_standars_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and br.`fees_standars_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and br.`energy_fees_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and br.`energy_fees_id` is null</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != propertyContractIds ">
@@ -203,9 +203,9 @@
<select id="queryBillPropertyList" parameterType="com.iformall.domain.po.WxBillProperty" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status,
br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status,br.`energy_fees_id`,
br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay,
br.`late_pay_ratio`,br.`parent_bill_id`,br.`fees_standars_id`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
br.`late_pay_ratio`,br.`parent_bill_id`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
from wx_bill_property br
<include refid="queryBillPropertyListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -386,7 +386,7 @@
tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime,
endtime,
rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info,
pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id,fees_standars_id)
pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id,energy_fees_id)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -395,7 +395,7 @@
#{item.tenantId},#{item.parentTenantId},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId},
#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue},
#{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo},
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.feesStandarsId}
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.energyFeesId}
)
</foreach>
</insert>


+ 7
- 4
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml Просмотреть файл

@@ -43,6 +43,7 @@
<result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/>
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>

<sql id="allColumns">
@@ -50,7 +51,7 @@
`createtime`,`expired_day`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`is_preview`,`need_pay`,
`last_owe_call_time`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`,
`late_pay_price`,`period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type,
`create_by`,`create_by_name`,`update_by`,`update_by_name`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -63,6 +64,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != rentContractId ">and `rent_contract_id` = #{rentContractId}</if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if>
<if test=" null != pay ">and `pay` = #{pay}</if>
<if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if>
@@ -133,6 +135,7 @@
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
<if test=" null != starttime">and br.`starttime` &lt;= #{starttime}</if>
@@ -169,7 +172,7 @@
br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,br.`last_owe_call_time`,br.`last_owe_call_user`,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`,br.`energy_fees_id`
from wx_bill_rent_manage br
<include refid="queryBillManageListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -299,7 +302,7 @@
rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,
status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime,
rent_shop_type, late_pay_ratio, late_pay_time, late_pay_price, period, shop_info,
pay_way, late_pay_status, service_charge_pay,manage_fee_type,create_by,create_by_name,update_by,update_by_name)
pay_way, late_pay_status, service_charge_pay,manage_fee_type,create_by,create_by_name,update_by,update_by_name,energy_fees_id)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -309,7 +312,7 @@
#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},
#{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.shopInfo},
#{item.payWay},#{item.latePayStatus},#{item.serviceChargePay},#{item.manageFeeType},
#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName}
#{item.createBy},#{item.createByName},#{item.updateBy},#{item.updateByName,#{item.energyFeesId}}
)
</foreach>
</insert>


+ 7
- 4
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Просмотреть файл

@@ -60,6 +60,7 @@
<result column="bus_discount_ratio" property="busDiscountRatio"/>
<result column="join_rent_price" property="joinRentPrice"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>

<sql id="allColumns">
@@ -67,7 +68,7 @@
`createtime`,`expired_day`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,`energy_fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -80,6 +81,7 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != rentContractId ">and `rent_contract_id` = #{rentContractId}</if>
<if test=" null != energyFeesId ">and `energy_fees_id` = #{energyFeesId}</if>
<if test=" null != receivePay ">and `receive_pay` = #{receivePay}</if>
<if test=" null != pay ">and `pay` = #{pay}</if>
<if test=" null != receiveDate ">and `receive_date` = #{receiveDate}</if>
@@ -149,6 +151,7 @@
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != energyFeesId ">and br.`energy_fees_id` = #{energyFeesId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
<if test=" null != starttime">and br.`starttime` &lt;= #{starttime}</if>
@@ -189,7 +192,7 @@
br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`,br.`last_owe_call_time`,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay,
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`
br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_rent br
<include refid="queryBillRentListCondition"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>
@@ -372,7 +375,7 @@
rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,create_by,create_by_name,update_by,update_by_name,
status, is_del, contract_need_pay,rent_price_info,need_pay,bussiness_manage_fee_need_pay,operating_manage_fee_need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime,
rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info,
pay_way, late_pay_status, comments,service_charge_pay)
pay_way, late_pay_status, comments,service_charge_pay,energy_fees_id)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -381,7 +384,7 @@
#{item.status},#{item.isDel},#{item.contractNeedPay},#{item.rentPriceInfo},#{item.needPay},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},#{item.merchantId},
#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue},
#{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo},
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay}
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.energyFeesId}
)
</foreach>
</insert>


Загрузка…
Отмена
Сохранить