diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 725915030..df911fd8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumEnergyMeterType; +import com.iformall.enums.EnumEnergyPublicCalcuteRule; import com.iformall.exception.MallinkException; import com.iformall.service.AliBusinessCircleOrderService; import com.iformall.service.WxEnergyService; @@ -73,6 +74,18 @@ public class WxEnergyController extends BaseController { return new ResultData(retMap); } + @ApiOperation("公摊计费规则") + @GetMapping("publicCalcuteRules") + public ResultData publicCalcuteRules() { + Map retMap = new HashMap(); + for (EnumEnergyPublicCalcuteRule mem : EnumEnergyPublicCalcuteRule.values()) { + retMap.put(mem.getCode(), mem.getMessage()); + } + return new ResultData(retMap); + } + + + @ApiOperation("费用区间列表") @GetMapping("timeList") @ApiImplicitParams({ @@ -206,6 +219,18 @@ public class WxEnergyController extends BaseController { } } + @ApiOperation("计算") + @PostMapping("calcute") + public ResultData calcute(@RequestBody WxEnergyReadingCalcute record) { + record.updateTenantInfo(getTenantInfo()); + WxEnergyReadingCalcute wrc = wxEnergyService.getReadingCalcuteById(record); + if (null == wrc) { + return new ResultData(Result.ERROR,"id错误"); + } + + return new ResultData(); + } + } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql index 5019b197b..0495fc0ca 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql @@ -22,9 +22,11 @@ CREATE TABLE `wx_energy_meter_user` ( `update_time` timestamp NULL DEFAULT NULL, `user_id` bigint(20) NOT NULL COMMENT '使用者id,商铺id或者楼层id', `user_type` int(3) NOT NULL COMMENT '使用者类型', + `meter_id` bigint(20) NOT NULL COMMENT '表ID', PRIMARY KEY (`id`), - UNIQUE KEY `id_UNIQUE` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表使用者'; + UNIQUE KEY `id_UNIQUE` (`id`), + UNIQUE KEY `T_U_T` (`tenant_id`,`user_id`,`user_type`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; CREATE TABLE `wx_energy_meter_reading` ( `id` bigint(20) NOT NULL COMMENT '主键ID', @@ -48,9 +50,11 @@ CREATE TABLE `wx_energy_meter_reading` ( `is_public` int(3) NOT NULL COMMENT '是否总表', `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID', `shop_number` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '店铺编号', - `building_id` bigint(20) DEFAULT NULL COMMENT '楼座ID', - `floor_id` bigint(20) DEFAULT NULL COMMENT '楼层ID', + `building_id` bigint(20) NOT NULL COMMENT '楼座ID', + `floor_id` bigint(20) NOT NULL COMMENT '楼层ID', `price` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '单价', + `meter_type` int(3) NOT NULL COMMENT '表类型', + `meter_rate` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '表倍率', PRIMARY KEY (`id`), UNIQUE KEY `id_UNIQUE` (`id`), KEY `T_T_F` (`tenant_id`,`time_id`,`meter_id`) @@ -80,9 +84,8 @@ CREATE TABLE `wx_energy_fees` ( `update_time` timestamp NULL DEFAULT NULL, `is_del` int(1) NOT NULL DEFAULT '0', `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称', - `type` int(3) NOT NULL COMMENT '表类型', - `is_public` int(1) NOT NULL DEFAULT '0' COMMENT '是否公摊', `price` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '单价', + `public_calcute` int(1) NOT NULL COMMENT '公摊计费规则', PRIMARY KEY (`id`), UNIQUE KEY `id_UNIQUE` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; @@ -102,10 +105,217 @@ CREATE TABLE `wx_energy_reading_calcute` ( `fees_id` bigint(20) NOT NULL COMMENT '科目ID', `is_calcuted` int(1) NOT NULL DEFAULT '0' COMMENT '是否已计算过', `is_imported` int(1) NOT NULL DEFAULT '0' COMMENT '是否导入过', + `import_success` int(1) DEFAULT '0' COMMENT '导入是否成功', + `calcute_success` int(1) DEFAULT '0' COMMENT '计算是否成功', PRIMARY KEY (`id`), UNIQUE KEY `id_UNIQUE` (`id`), UNIQUE KEY `T_T_F` (`tenant_id`,`time_id`,`fees_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表'; +ALTER TABLE wx_bill_daily_0 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_1 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_2 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_3 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_4 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_5 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_6 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_7 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_8 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_9 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_10 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_11 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_12 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_13 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_14 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_15 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_16 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_17 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_18 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_19 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_20 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_21 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_22 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_23 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_24 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_25 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_26 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_27 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_28 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_29 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_30 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_31 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_32 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_33 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_34 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_35 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_36 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_37 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_38 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_39 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_40 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_41 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_42 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_43 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_44 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_45 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_46 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_47 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_48 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_49 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_50 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_51 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_52 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_53 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_54 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_55 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_56 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_57 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_58 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_59 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_60 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_61 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_62 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_63 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_64 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_65 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_66 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_67 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_68 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_69 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_70 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_71 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_72 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_73 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_74 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_75 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_76 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_77 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_78 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_79 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_80 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_81 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_82 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_83 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_84 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_85 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_86 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_87 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_88 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_89 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_90 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_91 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_92 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_93 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_94 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_95 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_96 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_97 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_98 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; +ALTER TABLE wx_bill_daily_99 ADD COLUMN energy_reading_calcuteId BIGINT(20) COMMENT '能源抄表计算ID' ; + +ALTER TABLE wx_bill_daily_0 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_1 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_2 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_3 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_4 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_5 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_6 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_7 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_8 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_9 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_10 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_11 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_12 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_13 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_14 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_15 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_16 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_17 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_18 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_19 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_20 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_21 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_22 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_23 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_24 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_25 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_26 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_27 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_28 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_29 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_30 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_31 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_32 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_33 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_34 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_35 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_36 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_37 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_38 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_39 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_40 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_41 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_42 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_43 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_44 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_45 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_46 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_47 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_48 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_49 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_50 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_51 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_52 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_53 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_54 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_55 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_56 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_57 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_58 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_59 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_60 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_61 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_62 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_63 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_64 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_65 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_66 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_67 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_68 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_69 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_70 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_71 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_72 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_73 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_74 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_75 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_76 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_77 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_78 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_79 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_80 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_81 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_82 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_83 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_84 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_85 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_86 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_87 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_88 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_89 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_90 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_91 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_92 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_93 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_94 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_95 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_96 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_97 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_98 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; +ALTER TABLE wx_bill_daily_99 ADD COLUMN energy_reading_id BIGINT(20) COMMENT '能源抄表ID' ; + + + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 7fd51641d..6b2d092f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -88,7 +88,7 @@ public class WxBillDaily extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") private Integer freeze; - @io.swagger.annotations.ApiModelProperty(value = "创建方式1手动2自动3导入", name = "buildWay") + @io.swagger.annotations.ApiModelProperty(value = "创建方式1手动2自动3导入EnumBillDailyBuildWay", name = "buildWay") private Integer buildWay; @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") @@ -96,6 +96,12 @@ public class WxBillDaily extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "serviceChargePay") private String remark; + + @io.swagger.annotations.ApiModelProperty(value = "能源抄表计算ID", name = "energyReadingCalcuteId") + private Long energyReadingCalcuteId; + + @io.swagger.annotations.ApiModelProperty(value = "能源抄表ID", name = "energyReadingId") + private Long energyReadingId; @TableField(exist = false) private String serviceChargePayBefore; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java index 12e7348ff..4b740800f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java @@ -32,13 +32,10 @@ public class WxEnergyFees extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "isDel", name = "isDel") private Integer isDel; - @io.swagger.annotations.ApiModelProperty(value = "表类型EnumEnergyMeterType", name = "type") - private Integer type; - - @io.swagger.annotations.ApiModelProperty(value = "是否总表", name = "isPublic") - private Integer isPublic; - @io.swagger.annotations.ApiModelProperty(value = "单价", name = "price") private String price; + @io.swagger.annotations.ApiModelProperty(value = "公摊计算规则EnumEnergyPublicCalcuteRule", name = "publicCalcute") + private Integer publicCalcute; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java index 033ba2bc8..4c28f4ca9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java @@ -3,6 +3,10 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumBillDailyBuildWay; +import com.iformall.enums.EnumBillRentApplyStatus; +import com.iformall.enums.EnumBillStatus; +import com.iformall.enums.EnumEnergyMeterType; import com.iformall.enums.EnumYesOrNo; import com.iformall.utils.DateUtils; @@ -10,6 +14,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; @@ -72,6 +79,12 @@ public class WxEnergyMeterReading extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="表ID",name="meterId") private Long meterId; + @io.swagger.annotations.ApiModelProperty(value="表类型EnumEnergyMeterType",name="meterId") + private Integer meterType; + + @io.swagger.annotations.ApiModelProperty(value="表倍率",name="meterRate") + private String meterRate; + @io.swagger.annotations.ApiModelProperty(value="是否总表",name="isPublic") private Integer isPublic; @@ -113,6 +126,7 @@ public class WxEnergyMeterReading extends TenantEntity { excelTitle.put("floorId", "楼层"); excelTitle.put("shopId", "店铺号"); excelTitle.put("meterId", "表号"); + excelTitle.put("isPublic", "表类型"); excelTitle.put("preNumber", "上次抄表数"); excelTitle.put("preTime", "上次抄表时间"); excelTitle.put("curNumber", "本次抄表数"); @@ -134,6 +148,11 @@ public class WxEnergyMeterReading extends TenantEntity { excelObject.put("floorId", floorName); excelObject.put("shopId", this.getShopNumber()); excelObject.put("meterId", this.getMeterName()); + if (null != this.isPublic && this.isPublic.intValue() == EnumYesOrNo.YES.getCode().intValue()) { + excelObject.put("isPublic", "总表"); + }else { + excelObject.put("isPublic", "用户表"); + } excelObject.put("preNumber", this.getPreNumber()); excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime())); excelObject.put("curNumber", this.getCurNumber()); @@ -145,4 +164,50 @@ public class WxEnergyMeterReading extends TenantEntity { return excelObject; } + private WxBillDaily generateBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,MallUserInfo user,String needPay,String detail,String remark) { + WxBillDaily daily = new WxBillDaily(); + daily.updateTenantInfo(this); + daily.setMerchantId(merchant.getId()); + daily.setRentShopType(merchant.getType()); + daily.setCreatetime(new Date()); + daily.setCreateBy(user.getId()); + daily.setCreateByName(user.getName()); + daily.setUpdateBy(user.getId()); + daily.setUpdateByName(user.getName()); + daily.setUpdatetime(new Date()); + daily.setReceivePay(needPay); + daily.setPay("0"); + daily.setStarttime(this.startTime); + daily.setEndtime(this.endTime); + daily.setOwe(needPay); + daily.setStatus(EnumBillStatus.WAIT_PAY.getCode()); + daily.setReceiveDate(this.startTime); + daily.setApplyStatus(EnumBillRentApplyStatus.NO_APPLY.getCode()); + daily.setIsDel(EnumYesOrNo.NO.getCode()); + daily.setUserId(user.getId()); + daily.setShopId(this.shopId); + daily.setShopName(this.shopNumber); + daily.setType(EnumEnergyMeterType.getEnum(meterType).getBillDailyType()); + daily.setPriceDetail(detail); + daily.setFreeze(EnumYesOrNo.NO.getCode()); + daily.setBuildWay(EnumBillDailyBuildWay.AUTO.getCode()); + daily.setServiceChargePay("0"); + daily.setRemark(remark); + daily.setEnergyReadingCalcuteId(calcute.getId()); + daily.setEnergyReadingId(id); + return daily; + } + + public WxBillDaily generateUserBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,MallUserInfo user,WxEnergyMeter meter) { + BigDecimal dx = new BigDecimal(this.curNumber).subtract(new BigDecimal(this.preNumber)); + String needPay = new BigDecimal(this.price).multiply(dx).divide(new BigDecimal(meter.getRate())).setScale(2,RoundingMode.HALF_UP).toPlainString(); + String detail = "单价:"+this.price+",上次读数:"+this.preNumber+",本次读数:"+this.curNumber+",读数差:"+dx.toPlainString()+",表倍率:"+meter.getRate()+",费用:"+needPay; + return generateBill(calcute,merchant, user, needPay, detail, "抄表计算自动生成"); + } + + public WxBillDaily generatePublicBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,MallUserInfo user,String needPay) { + String detail = "单价:"+this.price+",费用:"+needPay; + return generateBill(calcute,merchant, user, needPay, detail, "抄表计算自动生成公摊"); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java index f1759d0b7..dca7edb19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java @@ -34,4 +34,8 @@ public class WxEnergyMeterUser extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "EnumEnergyMeterUserType", name = "userType") private Integer userType; + + @io.swagger.annotations.ApiModelProperty(value = "表ID", name = "meterId") + private Long meterId; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java index 64dac4b3a..383964016 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java @@ -56,7 +56,13 @@ public class WxEnergyReadingCalcute extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "isImported", name = "isImported") private Integer isImported; + @io.swagger.annotations.ApiModelProperty(value = "importSuccess", name = "importSuccess") + private Integer importSuccess; + @io.swagger.annotations.ApiModelProperty(value = "isCalcuted", name = "isCalcuted") private Integer isCalcuted; + @io.swagger.annotations.ApiModelProperty(value = "importSuccess", name = "importSuccess") + private Integer calcuteSuccess; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumEnergyPublicCalcuteRule.java b/mallinkService/src/main/java/com/iformall/enums/EnumEnergyPublicCalcuteRule.java new file mode 100644 index 000000000..55f344f82 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumEnergyPublicCalcuteRule.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + */ + +public enum EnumEnergyPublicCalcuteRule { + + ALL(1,"按所有楼栋面积公摊"), + BUILDING(2,"按所在楼栋面积公摊"), + FLOOR(3, "按所在楼层面积公摊"), + ; + + public static EnumEnergyPublicCalcuteRule getEnum(Integer code) { + for (EnumEnergyPublicCalcuteRule value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumEnergyPublicCalcuteRule(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java index 8e6b0c1c2..d73660882 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxEnergyMeterReading; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** */ @@ -13,4 +14,10 @@ public interface WxEnergyMeterReadingMapper extends CommonMapper findList(WxEnergyMeterReading wxBillRent); WxEnergyMeterReading selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + String findAllSumMoney(WxEnergyMeterReading wxBillRent); + + Map findBuildingSumMoney(WxEnergyMeterReading wxBillRent); + + Map findFloorSumMoney(WxEnergyMeterReading wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java index d8531e5d2..5f4ebdd69 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java @@ -6,11 +6,12 @@ import com.iformall.domain.po.WxEnergyMeterUser; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** */ public interface WxEnergyMeterUserMapper extends CommonMapper { List findList(WxEnergyMeterUser wxBillRent); - + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index d9a7463eb..89d02fc49 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -21,6 +21,13 @@ import com.iformall.domain.po.base.TenantEntity; */ public interface WxEnergyService { + //能源表 + PageInfo meterListAsPage(WxEnergyMeter record, Integer pageIndex, Integer pageSize); + WxEnergyMeter getMeterById(TenantEntity tenantEntity,Long id); + void saveOrUpdateMeter(WxEnergyMeter record); + void updateMeterIsDel(WxEnergyMeter record); + Map getMeterMap(WxEnergyMeter record); + //费用区间 PageInfo timeListAsPage(WxEnergyFeesTime record, Integer pageIndex, Integer pageSize); void saveOrUpdateTime(WxEnergyFeesTime record); @@ -32,6 +39,7 @@ public interface WxEnergyService { void saveOrUpdateFees(WxEnergyFees record); WxEnergyFees getFeesById(WxEnergyFees record); void setFeesIsDel(WxEnergyFees record); + Map getFeesMap(WxEnergyFees record); //抄表数据 PageInfo readingListAsPage(WxEnergyMeterReading record, Integer pageIndex, Integer pageSize); @@ -44,31 +52,7 @@ public interface WxEnergyService { WxEnergyReadingCalcute getReadingCalcuteById(WxEnergyReadingCalcute record); void exportReadingCalcute(WxEnergyReadingCalcute record,HttpServletRequest request, HttpServletResponse response); void importReadingCalcute(MultipartFile mFile, MallUserInfo user, HttpServletRequest request, HttpServletResponse response); - /** - * 根据实体查询列表 - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxEnergyMeter record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEnergyMeter getById(TenantEntity tenantEntity,Long id); - - /** - * 保存或更新实体 - * - * @param record - * @param user - */ - void saveOrUpdate(WxEnergyMeter record); + void calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); - void updateIsDel(WxEnergyMeter record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java index 56c735829..96087e3a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java @@ -49,4 +49,6 @@ public interface WxMallFloorService { void deleteByTenantId(String tenantId); Map getFloorMap(TenantEntity tenantInfo); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 8a29146e5..d00ee80fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantCorp; import com.iformall.domain.po.WxPark; +import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import org.springframework.web.bind.annotation.ModelAttribute; @@ -225,4 +226,6 @@ public interface WxMerchantService { WxMerchant initMerchantByPoi(MallUserInfo user,String poiName,String poiId,String phone) throws Exception; List listMerchant(TenantEntity tenantEntity, ListMerchantDTO dto); + + Map getShopMerchantMap(WxShop wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 3ddc667a3..308af426d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -8,10 +8,13 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumEnergyMeterUserType; +import com.iformall.enums.EnumEnergyPublicCalcuteRule; import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; +import com.iformall.utils.Constant; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; @@ -31,6 +34,8 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.TimeUnit; @@ -68,7 +73,63 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Autowired private String fmUploadDir; + + @Lazy + @Autowired + WxMerchantService wxMerchantService; + @Lazy + @Autowired + WxShopService wxShopService; + + @Override + public PageInfo meterListAsPage(WxEnergyMeter record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyMeterMapper.findList(record)); + } + + @Override + public WxEnergyMeter getMeterById(TenantEntity tenantEntity,Long id) { + return wxEnergyMeterMapper.selectById(id, tenantEntity.getTenantId()); + } + + @Override + public void saveOrUpdateMeter(WxEnergyMeter record) { + Date date = new Date(); + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + record.setCreateTime(date); + record.setUpdateTime(date); + try { + wxEnergyMeterMapper.insert(record); + } catch (Exception e) { + logger.error("保存租赁账单失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + } else { + record.setUpdateTime(date); + wxEnergyMeterMapper.updateById(record); + } + } + @Override + public void updateMeterIsDel(WxEnergyMeter record) { + wxEnergyMeterMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + } + + @Override + public Map getMeterMap(WxEnergyMeter record) { + List list = wxEnergyMeterMapper.findList(record); + if (null != list && list.size() > 0 ) { + Map retMap = new HashMap(); + for (int i = 0 ; i timeListAsPage(WxEnergyFeesTime record, Integer pageIndex, Integer pageSize) { @@ -141,6 +202,20 @@ public class WxEnergyServiceImpl implements WxEnergyService { public void setFeesIsDel(WxEnergyFees record) { wxEnergyFeesMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); } + + @Override + public Map getFeesMap(WxEnergyFees record) { + List list = wxEnergyFeesMapper.findList(record); + if (null != list && list.size() > 0 ) { + Map retMap = new HashMap(); + for (int i = 0 ; i successList = datalist.getList(); if(successList.size() > 0) { + boolean allSuccess = true; + Long cuteId = (Long)successList.get(0).get("calcuteId"); try { - Long cuteId = (Long)successList.get(0).get("calcuteId"); successList.parallelStream().forEach(reading -> { Long id = (Long) reading.get("id"); WxEnergyMeterReading r = new WxEnergyMeterReading(); @@ -419,58 +497,137 @@ public class WxEnergyServiceImpl implements WxEnergyService { r.setUpdateTime(new Date()); wxEnergyMeterReadingMapper.updateById(r); }); - if (null != cuteId) { - WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); - c.updateTenantInfo(user); - c.setId(cuteId); - c.setIsImported(EnumYesOrNo.YES.getCode()); - c.setUpdateTime(new Date()); - c.setUpdateBy(user.getId()); - c.setUpdateByName(user.getName()); - wxEnergyReadingCalcuteMapper.updateById(c); - } } catch (Exception e) { logger.error("导入模板失败:"+e.getMessage(),e); + allSuccess = false; } + if (null != cuteId) { + WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); + c.updateTenantInfo(user); + c.setId(cuteId); + c.setIsImported(EnumYesOrNo.YES.getCode()); + c.setUpdateTime(new Date()); + c.setUpdateBy(user.getId()); + c.setUpdateByName(user.getName()); + if (allSuccess) { + c.setImportSuccess(EnumYesOrNo.YES.getCode()); + }else { + c.setImportSuccess(EnumYesOrNo.NO.getCode()); + } + wxEnergyReadingCalcuteMapper.updateById(c); + } + } } - - @Override - public PageInfo listAsPage(WxEnergyMeter record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyMeterMapper.findList(record)); - } - - @Override - public WxEnergyMeter getById(TenantEntity tenantEntity,Long id) { - return wxEnergyMeterMapper.selectById(id, tenantEntity.getTenantId()); - } + @Override + public void calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user) { + //根据科目计算生成账单。 + WxEnergyMeterReading reading = new WxEnergyMeterReading(); + reading.updateTenantInfo(record); + reading.setTimeId(record.getTimeId()); + reading.setIsPublic(EnumYesOrNo.NO.getCode()); + //用户表列表 + List readingList = wxEnergyMeterReadingMapper.findList(reading); + if (null != readingList && readingList.size() > 0 ) { + + + WxShop sq = new WxShop(); + sq.updateTenantInfo(record); + Map shopMerchantMap = wxMerchantService.getShopMerchantMap(sq); + Map shopMap = wxShopService.findShopMap(sq); + + WxEnergyMeter mq = new WxEnergyMeter(); + mq.updateTenantInfo(record); + mq.setIsDel(EnumYesOrNo.NO.getCode()); + Map meterMap = this.getMeterMap(mq); + + WxEnergyFees fq = new WxEnergyFees(); + fq.updateTenantInfo(record); + fq.setIsDel(EnumYesOrNo.NO.getCode()); + fq.setId(record.getFeesId()); + WxEnergyFees fees = this.getFeesById(fq); + String publicTotalArea = "1"; + String publicTotalMoney = "0"; + Map buildingMoney = null; + if (fees.getPublicCalcute().intValue() == EnumEnergyPublicCalcuteRule.ALL.getCode().intValue()) { + //全部就查询所有公共表的费用 + publicTotalMoney = wxEnergyMeterReadingMapper.findAllSumMoney(reading); + //公摊总面积 + WxEnergyMeterUser mu = new WxEnergyMeterUser(); + mu.updateTenantInfo(record); + List mulist = wxEnergyMeterUserMapper.findList(mu); + if (null == mulist || mulist.size() <= 0 ) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"公摊总面积未配置。"); + } + publicTotalArea = mulist.get(0).getPublicArea(); + if (StringUtils.isBlank(publicTotalArea)) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"公摊总面积未配置。"); + } + }else if (fees.getPublicCalcute().intValue() == EnumEnergyPublicCalcuteRule.BUILDING.getCode().intValue()) { + //如果是按楼栋计算,则要把每个楼栋的金额都要算出来 + buildingMoney = wxEnergyMeterReadingMapper.findBuildingSumMoney(reading); + //各楼座总面积 + + } + + + + + boolean allSuccess = true; + for (int i = 0 ; i< readingList.size() ; i ++) { + WxEnergyMeterReading mr = readingList.get(i); + try { + //用户表账单 + WxMerchant merchant = shopMerchantMap.get(mr.getShopId()); + WxEnergyMeter meter = meterMap.get(mr.getMeterId()); + WxShop shop = shopMap.get(mr.getShopId()); + WxBillDaily userBill = mr.generateUserBill(record, merchant, user, meter); + /* + * 总表(分摊账单) + * 如果科目是根据总面积公摊,则根据总面积计算 + * 如果科目是根据楼栋公摊,则根据当前记录的楼栋面积计算 + * 如果科目是根据楼层公摊,则根据当前记录的楼层面积计算 + */ + if (fees.getPublicCalcute().intValue() == EnumEnergyPublicCalcuteRule.ALL.getCode().intValue()) { + String needPay = new BigDecimal(publicTotalMoney).multiply(new BigDecimal(shop.getRentArea())).divide(new BigDecimal(publicTotalArea)).setScale(2,RoundingMode.HALF_UP).toPlainString(); + mr.generatePublicBill(record, merchant, user, needPay); + }else if (fees.getPublicCalcute().intValue() == EnumEnergyPublicCalcuteRule.BUILDING.getCode().intValue()) { + + } + + + }catch(Exception e) { + logger.error("计算失败:"+mr.getId(),e); + allSuccess = false; + } + } + + WxEnergyReadingCalcute c = new WxEnergyReadingCalcute(); + c.updateTenantInfo(record); + c.setId(record.getId()); + c.setIsCalcuted(EnumYesOrNo.YES.getCode()); + c.setUpdateTime(new Date()); + c.setUpdateBy(user.getId()); + c.setUpdateByName(user.getName()); + if (allSuccess) { + c.setCalcuteSuccess(EnumYesOrNo.YES.getCode()); + }else { + c.setCalcuteSuccess(EnumYesOrNo.NO.getCode()); + } + wxEnergyReadingCalcuteMapper.updateById(c); + } + + + } + + + + + - @Override - public void saveOrUpdate(WxEnergyMeter record) { - Date date = new Date(); - if (record.getId() == null) { - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - record.setCreateTime(date); - record.setUpdateTime(date); - try { - wxEnergyMeterMapper.insert(record); - } catch (Exception e) { - logger.error("保存租赁账单失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); - } - } else { - record.setUpdateTime(date); - wxEnergyMeterMapper.updateById(record); - } - } - @Override - public void updateIsDel(WxEnergyMeter record) { - wxEnergyMeterMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index ba786e36e..c2311a94c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2304,4 +2304,44 @@ public class WxMerchantServiceImpl implements WxMerchantService { return vo; }).collect(Collectors.toList()); } + + + @Override + public Map getShopMerchantMap(WxShop wxShop) { + WxMerchantShop merchantShopQ = new WxMerchantShop(); + merchantShopQ.updateTenantInfo(wxShop); + merchantShopQ.setShopId(wxShop.getId()); + merchantShopQ.setShopIdList(wxShop.getIds()); + merchantShopQ.setIsDel(0); + List merchantShopList = wxMerchantShopMapper.findList(merchantShopQ); + if (null != merchantShopList && merchantShopList.size() > 0) { + Map shopMerchantIdMap = new HashMap(); + List merchantIdList = new ArrayList(); + for (int i = 0 ;i < merchantShopList.size() ; i ++) { + WxMerchantShop ms = merchantShopList.get(i); + if (null != ms ) { + shopMerchantIdMap.put(ms.getShopId(), ms.getMerchantId()); + merchantIdList.add(ms.getMerchantId()); + } + } + + WxMerchant mq = new WxMerchant(); + mq.updateTenantInfo(wxShop); + mq.setIds(merchantIdList); + Map merchantMap = this.findMerchantMap(mq); + Map retMap = new HashMap(); + for (Iterator it = shopMerchantIdMap.keySet().iterator(); it.hasNext(); ){ + Long shopId = it.next(); + Long merchantId = shopMerchantIdMap.get(shopId); + if (null != merchantMap) { + WxMerchant ms = merchantMap.get(merchantId); + if (null != ms ) { + retMap.put(shopId, ms); + } + } + } + return retMap; + } + return null; + } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 29b1631c1..629a7749a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -761,7 +761,7 @@ public class WxShopServiceImpl implements WxShopService { } return null; } - + @Override public List getFloorBuildShopIds(TenantEntity tenantEntity, String floorRule, Long building, Long floor,Integer shopDel) { if (null != floorRule || null != building || null != floor) { diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 9a45db14a..562b566fd 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -38,13 +38,16 @@ + + + `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` + `create_by`,`create_by_name`,`update_by`,`update_by_name`,`energy_reading_calcuteId`,`energy_reading_id` @@ -72,6 +75,8 @@ and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} and `build_way` = #{buildWay} + and `energy_reading_calcuteId` = #{energyReadingCalcuteId} + and `energy_reading_id` = #{energyReadingId} and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) @@ -135,6 +140,8 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) and br.`build_way` = #{buildWay} + and br.`energy_reading_calcuteId` = #{energyReadingCalcuteId} + and br.`energy_reading_id` = #{energyReadingId} and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in @@ -162,7 +169,7 @@ 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.`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_reading_calcuteId`,br.`energy_reading_id` from wx_bill_daily br order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml index 3b208f267..b9d6c0ed4 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml @@ -8,14 +8,13 @@ - - + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`is_public`,`price` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`public_calcute` @@ -28,8 +27,7 @@ and `parent_tenant_id` = #{parentTenantId} and `is_del` = #{isDel} - and `type` = #{type} - and `is_public` = #{isPublic} + and `public_calcute` = #{publicCalcute} and name like concat('%', #{name},'%') and id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml index 8bd9a6646..a26ace3b8 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml @@ -19,6 +19,8 @@ + + @@ -30,7 +32,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`cur_number`,`pre_number`,`pre_time`,`start_time`,`end_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`time_id`,`meter_id`,`is_public`,`meter_name`,`shop_id`,`shop_number`,`building_id`,`floor_id`,`price` + `update_by`,`update_by_name`,`remark`,`time_id`,`meter_id`,`meter_type`,`meter_rate`,`is_public`,`meter_name`,`shop_id`,`shop_number`,`building_id`,`floor_id`,`price` @@ -45,6 +47,7 @@ and `create_by` = #{createBy} and `time_id` = #{timeId} and `meter_id` = #{meterId} + and `meter_type` = #{meterType} and `is_public` = #{isPublic} and meter_name like concat('%', #{meterName},'%') and `shop_id` = #{shopId} @@ -79,6 +82,26 @@ from wx_energy_meter_reading where id = #{id} and `tenant_id` = #{tenantId} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml index 39ac7700c..60c77b505 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml @@ -9,10 +9,11 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`user_id`,`user_type` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`user_id`,`user_type`,`meter_id` @@ -26,6 +27,7 @@ and `user_id` = #{userId} and `user_type` = #{userType} + and `meter_id` = #{meterId} and id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml index c52b3edfe..e4fcc5450 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml @@ -16,11 +16,13 @@ + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`time_id`,`fees_id`,`is_calcuted`,`is_imported` + `update_by`,`update_by_name`,`remark`,`time_id`,`fees_id`,`is_calcuted`,`is_imported`,`import_success`,`calcute_success` @@ -37,6 +39,8 @@ and `fees_id` = #{feesId} and `is_calcuted` = #{isCalcuted} and `is_imported` = #{isImported} + and `import_success` = #{importSuccess} + and `calcute_success` = #{calcuteSuccess} and id in