Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
7b1f026922
27 измененных файлов: 1063 добавлений и 578 удалений
  1. +58
    -62
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +628
    -23
      mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql
  3. +3
    -12
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java
  4. +0
    -80
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesCalcute.java
  5. +7
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java
  6. +38
    -46
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java
  8. +17
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java
  9. +0
    -37
      mallinkService/src/main/java/com/iformall/enums/EnumEnergyPublicCalcuteRule.java
  10. +0
    -21
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesCalcuteMapper.java
  11. +0
    -19
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesCalcuteShopMapper.java
  12. +19
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesShopMapper.java
  13. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesTimeShopMapper.java
  14. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java
  15. +19
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java
  16. +0
    -19
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java
  17. +11
    -13
      mallinkService/src/main/java/com/iformall/service/WxEnergyService.java
  18. +202
    -117
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  19. +1
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  20. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
  21. +4
    -4
      mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml
  22. +19
    -17
      mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml
  23. +6
    -0
      mallinkService/src/main/resources/mapper/WxEnergyFeesTimeShopMapper.xml
  24. +4
    -8
      mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml
  25. +2
    -1
      mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml
  26. +19
    -17
      mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml
  27. +0
    -58
      mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteShopMapper.xml

+ 58
- 62
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java Просмотреть файл

@@ -6,15 +6,13 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxEnergyFeesCalcute;
import com.iformall.domain.po.WxEnergyFeesCalcuteShop;
import com.iformall.domain.po.WxEnergyFeesShop;
import com.iformall.domain.po.WxEnergyFeesTime;
import com.iformall.domain.po.WxEnergyMeter;
import com.iformall.domain.po.WxEnergyMeterChild;
import com.iformall.domain.po.WxEnergyMeterReading;
import com.iformall.domain.po.WxEnergyMeterShopFloor;
import com.iformall.domain.po.WxEnergyReadingCalcute;
import com.iformall.domain.po.WxEnergyReadingCalcuteShop;
import com.iformall.domain.po.WxMallFloor;
import com.iformall.domain.po.WxShop;
import com.iformall.domain.po.WxUserDataRule;
@@ -23,7 +21,6 @@ import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumEnergyMeterPhysicsType;
import com.iformall.enums.EnumEnergyMeterShopFloorType;
import com.iformall.enums.EnumEnergyMeterType;
import com.iformall.enums.EnumEnergyPublicCalcuteRule;
import com.iformall.enums.EnumFeesStandardsCalcuteUnit;
import com.iformall.enums.EnumFeesStandardsTimeUnit;
import com.iformall.enums.EnumYesOrNo;
@@ -106,16 +103,6 @@ public class WxEnergyController extends BaseController {
return new ResultData(retMap);
}
@ApiOperation("公摊计费规则")
@GetMapping("publicCalcuteRules")
public ResultData publicCalcuteRules() {
Map<Integer,String> retMap = new HashMap<Integer,String>();
for (EnumEnergyPublicCalcuteRule mem : EnumEnergyPublicCalcuteRule.values()) {
retMap.put(mem.getCode(), mem.getMessage());
}
return new ResultData(retMap);
}
@ApiOperation("能源表列表")
@GetMapping("meterList")
@ApiImplicitParams({
@@ -353,12 +340,12 @@ public class WxEnergyController extends BaseController {
}
@ApiOperation("计算标准列表")
@GetMapping("feesCalcuteList")
@GetMapping("feesShopList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData shopFeesList(@ModelAttribute WxEnergyFeesCalcute record, Integer pageNum, Integer pageSize) {
public ResultData shopFeesList(@ModelAttribute WxEnergyFeesShop record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
if (StringUtils.isNotBlank(record.getFeesIdsStr())) {
@@ -371,74 +358,46 @@ public class WxEnergyController extends BaseController {
record.setFeesIds(feesIdList);
}
}
PageInfo<WxEnergyFeesCalcute> list = wxEnergyService.feesCalcuteListAsPage(record,pageNum,pageSize);
PageInfo<WxEnergyFeesShop> list = wxEnergyService.feesShopListAsPage(record,pageNum,pageSize);
return new ResultData(list);
}
@ApiOperation("计算公式组件")
@GetMapping("feesCalcuteComponentList")
public ResultData shopFeesList(@ModelAttribute WxEnergyFeesCalcute record) {
@GetMapping("feesShopComponentList")
public ResultData shopFeesList(@ModelAttribute WxEnergyFeesShop record) {
record.updateTenantInfo(getTenantInfo());
return new ResultData(wxEnergyService.getFeesCalcuteComponentList(record));
}
@ApiOperation("计费标准新增修改")
@PostMapping("saveFeesCalcute")
public ResultData saveFeesCalcute(@RequestBody WxEnergyFeesCalcute record) {
@PostMapping("createFeesShop")
public ResultData createFeesShop(@RequestBody WxEnergyFeesShop record) {
record.updateTenantInfo(getTenantInfo());
wxEnergyService.saveOrUpdateFeesCalcute(record);
return new ResultData();
}
@PostMapping("feesCalcuteUpdateIsDel")
public ResultData calcuteUpdateIsDel(@RequestBody WxEnergyFeesCalcute record) {
record.updateTenantInfo(getTenantInfo());
wxEnergyService.updateFeesCalcuteIsDel(record);
return new ResultData();
}
@ApiOperation("计费标准关联")
@PostMapping("aliasFeesCalcute")
public ResultData aliasCalcute(@RequestBody WxEnergyFeesCalcuteShop record) {
record.updateTenantInfo(getTenantInfo());
wxEnergyService.createFeesCalcuteAlias(record);
wxEnergyService.createFeesShop(record);
return new ResultData();
}
@ApiOperation("删除计费标准关联")
@PostMapping("deleteAliasFeesCalcute")
public ResultData deleteAliasFeesCalcute(@RequestBody WxEnergyFeesCalcuteShop record) {
wxEnergyService.deleteFeesCalcuteAlias(record);
@PostMapping("deleteFeesShop")
public ResultData deleteFeesShop(@RequestBody WxEnergyFeesShop record) {
wxEnergyService.deleteFeesShop(record);
return new ResultData();
}
@ApiOperation("店铺计费标准详情")
@GetMapping("shopfeesCalcuteDetail")
public ResultData shopfeesCalcuteDetail(@ModelAttribute WxEnergyFeesCalcuteShop record) {
@GetMapping("feesShopDetail")
public ResultData feesShopDetail(@ModelAttribute WxEnergyFeesShop record) {
record.updateTenantInfo(getTenantInfo());
return new ResultData(wxEnergyService.getShopFeesCalcute(record.getId(),record.getTenantId()));
}
@ApiOperation("店铺修改计费标准")
@PostMapping("updateShopFeesCalcute")
public ResultData updateShopFeesCalcute(@RequestBody WxEnergyFeesCalcuteShop record) {
@PostMapping("updateFeesShop")
public ResultData updateFeesShop(@RequestBody WxEnergyFeesShop record) {
wxEnergyService.saveOrUpdateShopFeesCalcute(record);
return new ResultData();
}
@ApiOperation("店铺费用列表")
@GetMapping("shopFeesCalcuteList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData shopFeesCalcuteList(@ModelAttribute WxEnergyFeesCalcuteShop record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_ASC);
PageInfo<WxEnergyFeesCalcuteShop> list = wxEnergyService.shopFeesCalcuteListAsPage(record,pageNum,pageSize);
return new ResultData(list);
}
@ApiOperation("费用区间所属年月")
@GetMapping("periodList")
public ResultData periodList() {
@@ -516,9 +475,6 @@ public class WxEnergyController extends BaseController {
if (null == record.getType()) {
return new ResultData(Result.ERROR,"请选择能源表类型");
}
if (null == record.getPublicCalcute()) {
return new ResultData(Result.ERROR,"请选择分摊计费规则");
}
if (null == record.getFixedPrice()) {
return new ResultData(Result.ERROR,"请选择是否是一次性费用");
}
@@ -586,10 +542,50 @@ public class WxEnergyController extends BaseController {
record.setShopIds(sids);
}
}
boolean hasPrice = false;
if (null != record.getTimeId()) {
WxEnergyFeesTime ftq = new WxEnergyFeesTime();
ftq.updateTenantInfo(record);
ftq.setId(record.getTimeId());
WxEnergyFeesTime time = wxEnergyService.getFeesTimeById(ftq);
record.setMeterType(time.getType());
record.setStartTime(time.getStartTime());
record.setEndTime(time.getEndTime());
}
PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}
@ApiOperation("科目抄表记录导出")
@GetMapping("readingExport")
public void readingExport(@ModelAttribute WxEnergyMeterReading record, HttpServletRequest request, HttpServletResponse response) {
record.updateTenantInfo(getTenantInfo());
if (null != record.getTimeId()) {
WxEnergyFeesTime ftq = new WxEnergyFeesTime();
ftq.updateTenantInfo(record);
ftq.setId(record.getTimeId());
WxEnergyFeesTime time = wxEnergyService.getFeesTimeById(ftq);
record.setMeterType(time.getType());
record.setStartTime(time.getStartTime());
record.setEndTime(time.getEndTime());
}
wxEnergyService.exportReading(record, request, response);
}
@ApiOperation("科目抄表计算记录导入")
@PostMapping(value = "/importReading", consumes = "multipart/*")
public void importReading(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) {
try {
//得到当前用户ID
MallUserInfo user = getUser();
//request.getParameter("timeId");
wxEnergyService.importReadingCalcute(mFile, user, request, response);
} catch (Exception e) {
logger.error("importReading error.",e);
throw new MallinkException(Result.ERROR,e.getMessage());
}
}
@ApiOperation("修改抄表数据")
@PostMapping("saveReading")
public ResultData saveReading(@RequestBody WxEnergyMeterReading record) {
@@ -655,8 +651,8 @@ public class WxEnergyController extends BaseController {
}
@ApiOperation("科目抄表计算记录导入-修改单价")
@PostMapping(value = "/importReading", consumes = "multipart/*")
public void importReading(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) {
@PostMapping(value = "/importReadingCalcute", consumes = "multipart/*")
public void importReadingCalcute(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) {
try {
//得到当前用户ID
MallUserInfo user = getUser();


+ 628
- 23
mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql Просмотреть файл

@@ -31,43 +31,24 @@ CREATE TABLE `wx_energy_meter_child` (
UNIQUE KEY `P_C` (`parent_meter_id`,`child_meter_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表';

CREATE TABLE `wx_energy_fees_calcute` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID',
`parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID',
`create_time` timestamp NULL DEFAULT NULL,
`update_time` timestamp NULL DEFAULT NULL,
`fees_id` bigint(20) NOT NULL COMMENT '科目',
`price` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '价格',
`physics_type` int(1) NOT NULL COMMENT '用户表,公摊总表',
`formula` text COLLATE utf8mb4_unicode_ci COMMENT '计算公式',
`formula_content` text COLLATE utf8mb4_unicode_ci COMMENT '计算公式显示内容',
`is_del` int(1) NOT NULL DEFAULT '0' COMMENT '是否已删除',
PRIMARY KEY (`id`),
UNIQUE KEY `id_UNIQUE` (`id`),
UNIQUE KEY `T_F` (`tenant_id`,`fees_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表';


CREATE TABLE `wx_energy_fees_calcute_shop` (
CREATE TABLE `wx_energy_fees_shop` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID',
`parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID',
`create_time` timestamp NULL DEFAULT NULL,
`update_time` timestamp NULL DEFAULT NULL,
`calcute_id` bigint(20) NOT NULL COMMENT '计费标准Id',
`price` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '价格',
`physics_type` int(1) NOT NULL COMMENT '用户表,公摊总表',
`is_public` int(1) NOT NULL DEFAULT '0' COMMENT '是否公摊',
`formula` text COLLATE utf8mb4_unicode_ci COMMENT '计算公式',
`formula_content` text COLLATE utf8mb4_unicode_ci COMMENT '计算公式显示内容',
`shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
`fees_id` bigint(20) NOT NULL COMMENT '科目编号',
PRIMARY KEY (`id`),
UNIQUE KEY `id_UNIQUE` (`id`),
UNIQUE KEY `T_F` (`tenant_id`,`calcute_id`)
UNIQUE KEY `T_F` (`tenant_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表';


alter table wx_energy_meter_reading_0 drop column time_id;
alter table wx_energy_meter_reading_1 drop column time_id;
alter table wx_energy_meter_reading_2 drop column time_id;
@@ -674,7 +655,6 @@ alter table wx_energy_meter_reading_97 drop column floor_id;
alter table wx_energy_meter_reading_98 drop column floor_id;
alter table wx_energy_meter_reading_99 drop column floor_id;

ALTER TABLE `wx_energy_reading_calcute` ADD COLUMN shop_size INT(6) NOT NULL DEFAULT 0 COMMENT '店铺数量';
ALTER TABLE wx_energy_fees_time DROP COLUMN NAME;
ALTER TABLE wx_energy_fees_time ADD COLUMN PERIOD VARCHAR(10) NOT NULL COMMENT '所属年月';
ALTER TABLE wx_energy_fees_time ADD COLUMN shop_size INT(6) NOT NULL DEFAULT 0 COMMENT '店铺数量';
@@ -732,6 +712,631 @@ CREATE TABLE `wx_energy_reading_calcute` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表';


alter table wx_energy_meter_reading_0 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_1 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_2 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_3 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_4 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_5 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_6 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_7 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_8 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_9 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_10 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_11 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_12 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_13 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_14 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_15 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_16 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_17 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_18 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_19 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_20 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_21 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_22 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_23 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_24 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_25 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_26 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_27 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_28 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_29 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_30 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_31 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_32 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_33 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_34 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_35 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_36 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_37 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_38 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_39 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_40 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_41 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_42 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_43 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_44 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_45 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_46 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_47 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_48 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_49 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_50 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_51 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_52 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_53 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_54 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_55 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_56 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_57 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_58 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_59 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_60 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_61 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_62 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_63 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_64 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_65 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_66 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_67 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_68 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_69 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_70 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_71 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_72 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_73 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_74 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_75 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_76 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_77 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_78 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_79 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_80 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_81 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_82 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_83 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_84 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_85 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_86 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_87 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_88 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_89 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_90 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_91 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_92 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_93 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_94 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_95 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_96 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_97 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_98 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';
alter table wx_energy_meter_reading_99 add column building_name varchar(100) comment '所属楼栋,有可能会是多个';

alter table wx_energy_meter_reading_0 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_1 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_2 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_3 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_4 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_5 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_6 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_7 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_8 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_9 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_10 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_11 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_12 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_13 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_14 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_15 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_16 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_17 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_18 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_19 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_20 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_21 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_22 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_23 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_24 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_25 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_26 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_27 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_28 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_29 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_30 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_31 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_32 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_33 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_34 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_35 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_36 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_37 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_38 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_39 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_40 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_41 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_42 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_43 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_44 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_45 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_46 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_47 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_48 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_49 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_50 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_51 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_52 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_53 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_54 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_55 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_56 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_57 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_58 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_59 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_60 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_61 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_62 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_63 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_64 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_65 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_66 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_67 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_68 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_69 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_70 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_71 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_72 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_73 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_74 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_75 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_76 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_77 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_78 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_79 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_80 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_81 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_82 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_83 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_84 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_85 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_86 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_87 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_88 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_89 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_90 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_91 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_92 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_93 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_94 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_95 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_96 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_97 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_98 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';
alter table wx_energy_meter_reading_99 add column floor_name varchar(100) comment '所属楼层,有可能会是多个';

alter table wx_energy_meter_reading_0 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_1 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_2 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_3 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_4 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_5 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_6 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_7 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_8 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_9 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_10 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_11 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_12 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_13 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_14 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_15 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_16 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_17 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_18 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_19 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_20 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_21 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_22 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_23 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_24 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_25 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_26 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_27 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_28 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_29 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_30 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_31 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_32 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_33 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_34 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_35 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_36 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_37 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_38 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_39 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_40 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_41 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_42 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_43 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_44 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_45 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_46 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_47 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_48 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_49 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_50 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_51 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_52 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_53 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_54 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_55 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_56 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_57 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_58 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_59 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_60 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_61 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_62 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_63 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_64 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_65 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_66 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_67 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_68 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_69 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_70 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_71 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_72 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_73 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_74 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_75 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_76 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_77 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_78 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_79 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_80 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_81 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_82 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_83 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_84 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_85 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_86 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_87 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_88 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_89 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_90 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_91 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_92 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_93 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_94 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_95 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_96 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_97 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_98 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';
alter table wx_energy_meter_reading_99 add column shop_name varchar(100) comment '所属店铺,有可能会是多个';

alter table wx_energy_meter_reading_0 drop column price;
alter table wx_energy_meter_reading_1 drop column price;
alter table wx_energy_meter_reading_2 drop column price;
alter table wx_energy_meter_reading_3 drop column price;
alter table wx_energy_meter_reading_4 drop column price;
alter table wx_energy_meter_reading_5 drop column price;
alter table wx_energy_meter_reading_6 drop column price;
alter table wx_energy_meter_reading_7 drop column price;
alter table wx_energy_meter_reading_8 drop column price;
alter table wx_energy_meter_reading_9 drop column price;
alter table wx_energy_meter_reading_10 drop column price;
alter table wx_energy_meter_reading_11 drop column price;
alter table wx_energy_meter_reading_12 drop column price;
alter table wx_energy_meter_reading_13 drop column price;
alter table wx_energy_meter_reading_14 drop column price;
alter table wx_energy_meter_reading_15 drop column price;
alter table wx_energy_meter_reading_16 drop column price;
alter table wx_energy_meter_reading_17 drop column price;
alter table wx_energy_meter_reading_18 drop column price;
alter table wx_energy_meter_reading_19 drop column price;
alter table wx_energy_meter_reading_20 drop column price;
alter table wx_energy_meter_reading_21 drop column price;
alter table wx_energy_meter_reading_22 drop column price;
alter table wx_energy_meter_reading_23 drop column price;
alter table wx_energy_meter_reading_24 drop column price;
alter table wx_energy_meter_reading_25 drop column price;
alter table wx_energy_meter_reading_26 drop column price;
alter table wx_energy_meter_reading_27 drop column price;
alter table wx_energy_meter_reading_28 drop column price;
alter table wx_energy_meter_reading_29 drop column price;
alter table wx_energy_meter_reading_30 drop column price;
alter table wx_energy_meter_reading_31 drop column price;
alter table wx_energy_meter_reading_32 drop column price;
alter table wx_energy_meter_reading_33 drop column price;
alter table wx_energy_meter_reading_34 drop column price;
alter table wx_energy_meter_reading_35 drop column price;
alter table wx_energy_meter_reading_36 drop column price;
alter table wx_energy_meter_reading_37 drop column price;
alter table wx_energy_meter_reading_38 drop column price;
alter table wx_energy_meter_reading_39 drop column price;
alter table wx_energy_meter_reading_40 drop column price;
alter table wx_energy_meter_reading_41 drop column price;
alter table wx_energy_meter_reading_42 drop column price;
alter table wx_energy_meter_reading_43 drop column price;
alter table wx_energy_meter_reading_44 drop column price;
alter table wx_energy_meter_reading_45 drop column price;
alter table wx_energy_meter_reading_46 drop column price;
alter table wx_energy_meter_reading_47 drop column price;
alter table wx_energy_meter_reading_48 drop column price;
alter table wx_energy_meter_reading_49 drop column price;
alter table wx_energy_meter_reading_50 drop column price;
alter table wx_energy_meter_reading_51 drop column price;
alter table wx_energy_meter_reading_52 drop column price;
alter table wx_energy_meter_reading_53 drop column price;
alter table wx_energy_meter_reading_54 drop column price;
alter table wx_energy_meter_reading_55 drop column price;
alter table wx_energy_meter_reading_56 drop column price;
alter table wx_energy_meter_reading_57 drop column price;
alter table wx_energy_meter_reading_58 drop column price;
alter table wx_energy_meter_reading_59 drop column price;
alter table wx_energy_meter_reading_60 drop column price;
alter table wx_energy_meter_reading_61 drop column price;
alter table wx_energy_meter_reading_62 drop column price;
alter table wx_energy_meter_reading_63 drop column price;
alter table wx_energy_meter_reading_64 drop column price;
alter table wx_energy_meter_reading_65 drop column price;
alter table wx_energy_meter_reading_66 drop column price;
alter table wx_energy_meter_reading_67 drop column price;
alter table wx_energy_meter_reading_68 drop column price;
alter table wx_energy_meter_reading_69 drop column price;
alter table wx_energy_meter_reading_70 drop column price;
alter table wx_energy_meter_reading_71 drop column price;
alter table wx_energy_meter_reading_72 drop column price;
alter table wx_energy_meter_reading_73 drop column price;
alter table wx_energy_meter_reading_74 drop column price;
alter table wx_energy_meter_reading_75 drop column price;
alter table wx_energy_meter_reading_76 drop column price;
alter table wx_energy_meter_reading_77 drop column price;
alter table wx_energy_meter_reading_78 drop column price;
alter table wx_energy_meter_reading_79 drop column price;
alter table wx_energy_meter_reading_80 drop column price;
alter table wx_energy_meter_reading_81 drop column price;
alter table wx_energy_meter_reading_82 drop column price;
alter table wx_energy_meter_reading_83 drop column price;
alter table wx_energy_meter_reading_84 drop column price;
alter table wx_energy_meter_reading_85 drop column price;
alter table wx_energy_meter_reading_86 drop column price;
alter table wx_energy_meter_reading_87 drop column price;
alter table wx_energy_meter_reading_88 drop column price;
alter table wx_energy_meter_reading_89 drop column price;
alter table wx_energy_meter_reading_90 drop column price;
alter table wx_energy_meter_reading_91 drop column price;
alter table wx_energy_meter_reading_92 drop column price;
alter table wx_energy_meter_reading_93 drop column price;
alter table wx_energy_meter_reading_94 drop column price;
alter table wx_energy_meter_reading_95 drop column price;
alter table wx_energy_meter_reading_96 drop column price;
alter table wx_energy_meter_reading_97 drop column price;
alter table wx_energy_meter_reading_98 drop column price;
alter table wx_energy_meter_reading_99 drop column price;

ALTER TABLE wx_energy_reading_calcute ADD COLUMN shop TEXT COMMENT '店铺编号';

alter table wx_energy_meter_reading_0 drop index T_T_F;
alter table wx_energy_meter_reading_1 drop index T_T_F;
alter table wx_energy_meter_reading_2 drop index T_T_F;
alter table wx_energy_meter_reading_3 drop index T_T_F;
alter table wx_energy_meter_reading_4 drop index T_T_F;
alter table wx_energy_meter_reading_5 drop index T_T_F;
alter table wx_energy_meter_reading_6 drop index T_T_F;
alter table wx_energy_meter_reading_7 drop index T_T_F;
alter table wx_energy_meter_reading_8 drop index T_T_F;
alter table wx_energy_meter_reading_9 drop index T_T_F;
alter table wx_energy_meter_reading_10 drop index T_T_F;
alter table wx_energy_meter_reading_11 drop index T_T_F;
alter table wx_energy_meter_reading_12 drop index T_T_F;
alter table wx_energy_meter_reading_13 drop index T_T_F;
alter table wx_energy_meter_reading_14 drop index T_T_F;
alter table wx_energy_meter_reading_15 drop index T_T_F;
alter table wx_energy_meter_reading_16 drop index T_T_F;
alter table wx_energy_meter_reading_17 drop index T_T_F;
alter table wx_energy_meter_reading_18 drop index T_T_F;
alter table wx_energy_meter_reading_19 drop index T_T_F;
alter table wx_energy_meter_reading_20 drop index T_T_F;
alter table wx_energy_meter_reading_21 drop index T_T_F;
alter table wx_energy_meter_reading_22 drop index T_T_F;
alter table wx_energy_meter_reading_23 drop index T_T_F;
alter table wx_energy_meter_reading_24 drop index T_T_F;
alter table wx_energy_meter_reading_25 drop index T_T_F;
alter table wx_energy_meter_reading_26 drop index T_T_F;
alter table wx_energy_meter_reading_27 drop index T_T_F;
alter table wx_energy_meter_reading_28 drop index T_T_F;
alter table wx_energy_meter_reading_29 drop index T_T_F;
alter table wx_energy_meter_reading_30 drop index T_T_F;
alter table wx_energy_meter_reading_31 drop index T_T_F;
alter table wx_energy_meter_reading_32 drop index T_T_F;
alter table wx_energy_meter_reading_33 drop index T_T_F;
alter table wx_energy_meter_reading_34 drop index T_T_F;
alter table wx_energy_meter_reading_35 drop index T_T_F;
alter table wx_energy_meter_reading_36 drop index T_T_F;
alter table wx_energy_meter_reading_37 drop index T_T_F;
alter table wx_energy_meter_reading_38 drop index T_T_F;
alter table wx_energy_meter_reading_39 drop index T_T_F;
alter table wx_energy_meter_reading_40 drop index T_T_F;
alter table wx_energy_meter_reading_41 drop index T_T_F;
alter table wx_energy_meter_reading_42 drop index T_T_F;
alter table wx_energy_meter_reading_43 drop index T_T_F;
alter table wx_energy_meter_reading_44 drop index T_T_F;
alter table wx_energy_meter_reading_45 drop index T_T_F;
alter table wx_energy_meter_reading_46 drop index T_T_F;
alter table wx_energy_meter_reading_47 drop index T_T_F;
alter table wx_energy_meter_reading_48 drop index T_T_F;
alter table wx_energy_meter_reading_49 drop index T_T_F;
alter table wx_energy_meter_reading_50 drop index T_T_F;
alter table wx_energy_meter_reading_51 drop index T_T_F;
alter table wx_energy_meter_reading_52 drop index T_T_F;
alter table wx_energy_meter_reading_53 drop index T_T_F;
alter table wx_energy_meter_reading_54 drop index T_T_F;
alter table wx_energy_meter_reading_55 drop index T_T_F;
alter table wx_energy_meter_reading_56 drop index T_T_F;
alter table wx_energy_meter_reading_57 drop index T_T_F;
alter table wx_energy_meter_reading_58 drop index T_T_F;
alter table wx_energy_meter_reading_59 drop index T_T_F;
alter table wx_energy_meter_reading_60 drop index T_T_F;
alter table wx_energy_meter_reading_61 drop index T_T_F;
alter table wx_energy_meter_reading_62 drop index T_T_F;
alter table wx_energy_meter_reading_63 drop index T_T_F;
alter table wx_energy_meter_reading_64 drop index T_T_F;
alter table wx_energy_meter_reading_65 drop index T_T_F;
alter table wx_energy_meter_reading_66 drop index T_T_F;
alter table wx_energy_meter_reading_67 drop index T_T_F;
alter table wx_energy_meter_reading_68 drop index T_T_F;
alter table wx_energy_meter_reading_69 drop index T_T_F;
alter table wx_energy_meter_reading_70 drop index T_T_F;
alter table wx_energy_meter_reading_71 drop index T_T_F;
alter table wx_energy_meter_reading_72 drop index T_T_F;
alter table wx_energy_meter_reading_73 drop index T_T_F;
alter table wx_energy_meter_reading_74 drop index T_T_F;
alter table wx_energy_meter_reading_75 drop index T_T_F;
alter table wx_energy_meter_reading_76 drop index T_T_F;
alter table wx_energy_meter_reading_77 drop index T_T_F;
alter table wx_energy_meter_reading_78 drop index T_T_F;
alter table wx_energy_meter_reading_79 drop index T_T_F;
alter table wx_energy_meter_reading_80 drop index T_T_F;
alter table wx_energy_meter_reading_81 drop index T_T_F;
alter table wx_energy_meter_reading_82 drop index T_T_F;
alter table wx_energy_meter_reading_83 drop index T_T_F;
alter table wx_energy_meter_reading_84 drop index T_T_F;
alter table wx_energy_meter_reading_85 drop index T_T_F;
alter table wx_energy_meter_reading_86 drop index T_T_F;
alter table wx_energy_meter_reading_87 drop index T_T_F;
alter table wx_energy_meter_reading_88 drop index T_T_F;
alter table wx_energy_meter_reading_89 drop index T_T_F;
alter table wx_energy_meter_reading_90 drop index T_T_F;
alter table wx_energy_meter_reading_91 drop index T_T_F;
alter table wx_energy_meter_reading_92 drop index T_T_F;
alter table wx_energy_meter_reading_93 drop index T_T_F;
alter table wx_energy_meter_reading_94 drop index T_T_F;
alter table wx_energy_meter_reading_95 drop index T_T_F;
alter table wx_energy_meter_reading_96 drop index T_T_F;
alter table wx_energy_meter_reading_97 drop index T_T_F;
alter table wx_energy_meter_reading_98 drop index T_T_F;
alter table wx_energy_meter_reading_99 drop index T_T_F;

alter table wx_energy_fees_0 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_1 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_2 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_3 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_4 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_5 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_6 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_7 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_8 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_9 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_10 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_11 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_12 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_13 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_14 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_15 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_16 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_17 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_18 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_19 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_20 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_21 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_22 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_23 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_24 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_25 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_26 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_27 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_28 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_29 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_30 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_31 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_32 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_33 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_34 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_35 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_36 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_37 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_38 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_39 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_40 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_41 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_42 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_43 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_44 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_45 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_46 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_47 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_48 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_49 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_50 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_51 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_52 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_53 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_54 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_55 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_56 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_57 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_58 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_59 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_60 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_61 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_62 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_63 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_64 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_65 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_66 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_67 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_68 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_69 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_70 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_71 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_72 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_73 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_74 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_75 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_76 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_77 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_78 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_79 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_80 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_81 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_82 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_83 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_84 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_85 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_86 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_87 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_88 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_89 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_90 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_91 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_92 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_93 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_94 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_95 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_96 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_97 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_98 add column is_public int(1) not null default 0 comment '是否公摊';
alter table wx_energy_fees_99 add column is_public int(1) not null default 0 comment '是否公摊';


CREATE TABLE `wx_energy_reading_calcute_result` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID',
`parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID',
`create_time` timestamp NULL DEFAULT NULL,
`update_time` timestamp NULL DEFAULT NULL,
`calcute_id` bigint(20) NOT NULL COMMENT '费用计算ID',
`shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
`fees_id` bigint(20) NOT NULL COMMENT '科目编号',
`fees_calcute_id` bigint(20) NOT NULL COMMENT '费用标准编号',
`meter_id` bigint(20) DEFAULT NULL COMMENT '表编号',
`money` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '金额',
PRIMARY KEY (`id`),
UNIQUE KEY `id_UNIQUE` (`id`),
UNIQUE KEY `T_T_F` (`tenant_id`,`calcute_id`,`shop_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表';





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

@@ -7,7 +7,6 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumContractReceivePeriodUnit;
import com.iformall.enums.EnumEnergyMeterType;
import com.iformall.enums.EnumEnergyPublicCalcuteRule;
import com.iformall.enums.EnumFeesStandardsCalcuteUnit;
import com.iformall.enums.EnumFeesStandardsTimeUnit;
import com.iformall.enums.EnumRentDayPriceCalcute;
@@ -59,17 +58,6 @@ public class WxEnergyFees extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "税率", name = "taxRate")
private String taxRate;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算规则EnumEnergyPublicCalcuteRule", name = "publicCalcute")
private Integer publicCalcute;
@TableField(exist = false)
private String publicCalcuteName;
public String getPublicCalcuteName() {
if (null != publicCalcute) {
return EnumEnergyPublicCalcuteRule.getEnum(publicCalcute).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "表类型EnumEnergyMeterType", name = "type")
private Integer type;
@TableField(exist = false)
@@ -81,6 +69,9 @@ public class WxEnergyFees extends TenantEntity {
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "是否公摊", name = "isPublic")
private Integer isPublic;
@io.swagger.annotations.ApiModelProperty(value = "所属账单类型EnumBillAllType", name = "billType")
private Integer billType;
@TableField(exist = false)


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

@@ -1,80 +0,0 @@
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.EnumEnergyMeterPhysicsType;
import com.iformall.enums.EnumEnergyMeterType;
import com.iformall.enums.EnumRentShopType;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Date;
import java.util.List;

/**
*/
@TableName(value = "wx_energy_fees_calcute")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxEnergyFeesCalcute extends TenantEntity {

private static final long serialVersionUID = 7009117540201976664L;

@io.swagger.annotations.ApiModelProperty(value="id",name="id")
private Long id;

@io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime")
private Date createTime;
@io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime")
private Date updateTime;
@io.swagger.annotations.ApiModelProperty(value="是否已删除",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId")
private Long feesId;
@io.swagger.annotations.ApiModelProperty(value = "表分组EnumEnergyMeterPhysicsType", name = "physicsType")
private Integer physicsType;
@TableField(exist = false)
private String physicsTypeName;
public String getPhysicsTypeName() {
if (null != physicsType) {
return EnumEnergyMeterPhysicsType.getEnum(physicsType).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "单价", name = "price")
private String price;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formula")
private String formula;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent")
private String formulaContent;
@TableField(exist = false)
private List<Long> shopIds;
@TableField(exist = false)
private List<Long> feesIds;
@TableField(exist = false)
private String feesName;
@TableField(exist = false)
private Integer feesType;
@TableField(exist = false)
private String feesTypeName;
@TableField(exist = false)
private String fixedPriceName;
@TableField(exist = false)
private String calcuteUnitName;
@TableField(exist = false)
private String timeUnitName;
@TableField(exist = false)
private String feesIdsStr;
}

mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesCalcuteShop.java → mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java Просмотреть файл

@@ -15,11 +15,11 @@ import java.util.List;

/**
*/
@TableName(value = "wx_energy_fees_calcute_shop")
@TableName(value = "wx_energy_fees_shop")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxEnergyFeesCalcuteShop extends TenantEntity {
public class WxEnergyFeesShop extends TenantEntity {

private static final long serialVersionUID = 7009117540201976664L;

@@ -32,22 +32,11 @@ public class WxEnergyFeesCalcuteShop extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime")
private Date updateTime;
@io.swagger.annotations.ApiModelProperty(value="计费标准编号",name="calcuteId")
private Long calcuteId;
@io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId")
private Long feesId;
@io.swagger.annotations.ApiModelProperty(value = "表分组EnumEnergyMeterPhysicsType", name = "physicsType")
private Integer physicsType;
@TableField(exist = false)
private String physicsTypeName;
public String getPhysicsTypeName() {
if (null != physicsType) {
return EnumEnergyMeterPhysicsType.getEnum(physicsType).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "是否公摊", name = "isPublic")
private Integer isPublic;
@io.swagger.annotations.ApiModelProperty(value = "单价", name = "price")
private String price;
@@ -78,4 +67,7 @@ public class WxEnergyFeesCalcuteShop extends TenantEntity {
private List<Long> calcuteIds;
@TableField(exist = false)
private String feesName;
@TableField(exist = false)
private String feesIdsStr;
private List<Long> feesIds;
}

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

@@ -100,12 +100,18 @@ public class WxEnergyMeterReading extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="表名",name="meterName")
private String meterName;
@io.swagger.annotations.ApiModelProperty(value="单价",name="price")
private String price;
@io.swagger.annotations.ApiModelProperty(value="是否删除",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="所属楼栋,有可能会是多个",name="buildingName")
private String buildingName;
@io.swagger.annotations.ApiModelProperty(value="所属楼层,有可能会是多个",name="floorName")
private String floorName;
@io.swagger.annotations.ApiModelProperty(value="所属店铺,有可能会是多个",name="shopName")
private String shopName;
@TableField(exist = false)
private List<WxEnergyMeterReading> meterReadingList;
@@ -113,54 +119,38 @@ public class WxEnergyMeterReading extends TenantEntity {
private List<Long> shopIds;
@TableField(exist = false)
private String shopIdsStr;
@TableField(exist = false)
private Long timeId;
public static Map<String,String> generateExcelTitle() {
Map<String,String> excelTitle = new LinkedHashMap<String,String>();
excelTitle.put("calcuteId", "编码");
excelTitle.put("id", "抄表数据编码");
excelTitle.put("timeId", "时间区间");
excelTitle.put("startTime", "开始日期");
excelTitle.put("endTime", "截止日期");
excelTitle.put("feesId", "科目");
excelTitle.put("buildingId", "楼座");
excelTitle.put("floorId", "楼层");
excelTitle.put("shopId", "店铺号");
excelTitle.put("meterId", "表号");
excelTitle.put("isPublic", "表类型");
excelTitle.put("meterType", "表类型");
excelTitle.put("preNumber", "上次抄表数");
excelTitle.put("preTime", "上次抄表时间");
excelTitle.put("curNumber", "本次抄表数");
excelTitle.put("price", "单价(*)");
return excelTitle;
}
public Map<String,Object> generateExcelData(Map<Long, String> buildingMap,Map<Long, String> floorMap,WxEnergyFeesTime time,WxEnergyFees fees,WxEnergyReadingCalcute calcute) {
public Map<String,Object> generateExcelData() {
Map<String,Object> excelObject = new HashMap<String,Object>();
// excelObject.put("calcuteId", calcute.getId());
// excelObject.put("id", this.getId());
// excelObject.put("timeId", time.getName());
// excelObject.put("startTime", DateUtils.formatDateTime(this.getStartTime()));
// excelObject.put("endTime", DateUtils.formatDateTime(this.getEndTime()));
// excelObject.put("feesId", fees.getName());
// String buildingName = buildingMap.get(this.getBuildingId());
// excelObject.put("buildingId", buildingName);
// String floorName = floorMap.get(this.getFloorId());
// 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());
// if (calcute.getIsImported().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
// excelObject.put("price", this.getPrice());
// }else {
// excelObject.put("price", fees.getPrice());
// }
excelObject.put("id", this.getId());
excelObject.put("startTime", DateUtils.formatDateTime(this.getStartTime()));
excelObject.put("endTime", DateUtils.formatDateTime(this.getEndTime()));
excelObject.put("buildingId", this.getBuildingName());
excelObject.put("floorId", this.getFloorName());
excelObject.put("shopId", this.getShopName());
excelObject.put("meterId", this.getMeterName());
excelObject.put("meterType", this.getMeterTypeName());
excelObject.put("preNumber", this.getPreNumber());
excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime()));
excelObject.put("curNumber", this.getCurNumber());
return excelObject;
}
@@ -197,21 +187,23 @@ public class WxEnergyMeterReading extends TenantEntity {
}
public WxAllBill generateUserBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,MallUserInfo user,WxEnergyMeter meter) {
BigDecimal dx = new BigDecimal(this.curNumber).subtract(new BigDecimal(this.preNumber));
BigDecimal needPay = new BigDecimal(this.price).multiply(dx).divide(new BigDecimal(meter.getRate())).setScale(2,RoundingMode.HALF_UP);
if (needPay.compareTo(new BigDecimal(0)) <= 0 ) {
return null;
}
String detail = "单价:"+this.price+",上次读数:"+this.preNumber+",本次读数:"+this.curNumber+",读数差:"+dx.toPlainString()+",表倍率:"+meter.getRate()+",费用:"+needPay.toPlainString();
return generateBill(calcute,merchant, user, needPay.toPlainString(), detail, "抄表计算自动生成");
// BigDecimal dx = new BigDecimal(this.curNumber).subtract(new BigDecimal(this.preNumber));
// BigDecimal needPay = new BigDecimal(this.price).multiply(dx).divide(new BigDecimal(meter.getRate())).setScale(2,RoundingMode.HALF_UP);
// if (needPay.compareTo(new BigDecimal(0)) <= 0 ) {
// return null;
// }
// String detail = "单价:"+this.price+",上次读数:"+this.preNumber+",本次读数:"+this.curNumber+",读数差:"+dx.toPlainString()+",表倍率:"+meter.getRate()+",费用:"+needPay.toPlainString();
// return generateBill(calcute,merchant, user, needPay.toPlainString(), detail, "抄表计算自动生成");
return null;
}
public WxAllBill generatePublicBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,MallUserInfo user,String needPay) {
if (new BigDecimal(needPay).compareTo(new BigDecimal(0)) <= 0 ) {
return null;
}
String detail = "单价:"+this.price+",费用:"+needPay;
return generateBill(calcute,merchant, user, needPay, detail, "抄表计算自动生成公摊");
// if (new BigDecimal(needPay).compareTo(new BigDecimal(0)) <= 0 ) {
// return null;
// }
// String detail = "单价:"+this.price+",费用:"+needPay;
// return generateBill(calcute,merchant, user, needPay, detail, "抄表计算自动生成公摊");
return null;
}
}

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

@@ -80,6 +80,9 @@ public class WxEnergyReadingCalcute extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "店铺数", name = "shopSize")
private Integer shopSize;
@io.swagger.annotations.ApiModelProperty(value="所属年月",name="period")
private String shop;
@TableField(exist = false)
private List<Long> shopIds;
@TableField(exist = false)


mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteShop.java → mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java Просмотреть файл

@@ -17,11 +17,11 @@ import java.util.Map;

/**
*/
@TableName(value = "wx_energy_reading_calcute_shop")
@TableName(value = "wx_energy_reading_calcute_result")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxEnergyReadingCalcuteShop extends TenantEntity {
public class WxEnergyReadingCalcuteResult extends TenantEntity {

private static final long serialVersionUID = 7009117540201976664L;

@@ -40,6 +40,21 @@ public class WxEnergyReadingCalcuteShop extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="店铺ID",name="shopId")
private Long shopId;
@io.swagger.annotations.ApiModelProperty(value="科目ID",name="feesId")
private Long feesId;
@io.swagger.annotations.ApiModelProperty(value="费用标准ID",name="feesCalcuteId")
private Long feesCalcuteId;
@io.swagger.annotations.ApiModelProperty(value="表ID",name="meterId")
private Long meterId;
@io.swagger.annotations.ApiModelProperty(value="抄表数据ID",name="readingId")
private Long readingId;
@io.swagger.annotations.ApiModelProperty(value="金额",name="money")
private String money;
@TableField(exist = false)
private List<Long> shopIds;

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

@@ -1,37 +0,0 @@
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;
}
}

+ 0
- 21
mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesCalcuteMapper.java Просмотреть файл

@@ -1,21 +0,0 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxEnergyFeesCalcute;
import org.apache.ibatis.annotations.Param;
import java.util.List;

/**
*/
public interface WxEnergyFeesCalcuteMapper extends CommonMapper<WxEnergyFeesCalcute, Long> {

List<WxEnergyFeesCalcute> findList(WxEnergyFeesCalcute wxBillRent);
List<Long> findFeesIdList(WxEnergyFeesCalcute wxBillRent);

WxEnergyFeesCalcute selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel);

}

+ 0
- 19
mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesCalcuteShopMapper.java Просмотреть файл

@@ -1,19 +0,0 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxEnergyFeesCalcuteShop;

import org.apache.ibatis.annotations.Param;
import java.util.List;

/**
*/
public interface WxEnergyFeesCalcuteShopMapper extends CommonMapper<WxEnergyFeesCalcuteShop, Long> {

List<WxEnergyFeesCalcuteShop> findList(WxEnergyFeesCalcuteShop wxBillRent);
List<Long> findFeesIdList(WxEnergyFeesCalcuteShop wxBillRent);

WxEnergyFeesCalcuteShop selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
}

+ 19
- 0
mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesShopMapper.java Просмотреть файл

@@ -0,0 +1,19 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxEnergyFeesShop;

import org.apache.ibatis.annotations.Param;
import java.util.List;

/**
*/
public interface WxEnergyFeesShopMapper extends CommonMapper<WxEnergyFeesShop, Long> {

List<WxEnergyFeesShop> findList(WxEnergyFeesShop wxBillRent);
List<Long> findFeesIdList(WxEnergyFeesShop wxBillRent);
WxEnergyFeesShop selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
}

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

@@ -19,5 +19,7 @@ public interface WxEnergyFeesTimeShopMapper extends CommonMapper<WxEnergyFeesTim
void deleteByTimeId(@Param("timeId")Long timeId,@Param("tenantId")String tenantId);
List<Long> findShopIdList(WxEnergyFeesTimeShop wxBillRent);
List<Long> findTimeIdList(WxEnergyFeesTimeShop wxBillRent);
}

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

@@ -15,7 +15,5 @@ public interface WxEnergyMeterReadingMapper extends CommonMapper<WxEnergyMeterRe

WxEnergyMeterReading selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
String findAllSumMoney(WxEnergyMeterReading wxBillRent);
void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel);
}

+ 19
- 0
mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java Просмотреть файл

@@ -0,0 +1,19 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxEnergyReadingCalcuteResult;

import org.apache.ibatis.annotations.Param;
import java.util.List;

/**
*/
public interface WxEnergyReadingCalcuteResultMapper extends CommonMapper<WxEnergyReadingCalcuteResult, Long> {

List<WxEnergyReadingCalcuteResult> findList(WxEnergyReadingCalcuteResult wxBillRent);
List<Long> findShopIdList(WxEnergyReadingCalcuteResult wxBillRent);

WxEnergyReadingCalcuteResult selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
}

+ 0
- 19
mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java Просмотреть файл

@@ -1,19 +0,0 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxEnergyReadingCalcuteShop;

import org.apache.ibatis.annotations.Param;
import java.util.List;

/**
*/
public interface WxEnergyReadingCalcuteShopMapper extends CommonMapper<WxEnergyReadingCalcuteShop, Long> {

List<WxEnergyReadingCalcuteShop> findList(WxEnergyReadingCalcuteShop wxBillRent);
List<Long> findShopIdList(WxEnergyReadingCalcuteShop wxBillRent);

WxEnergyReadingCalcuteShop selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
}

+ 11
- 13
mallinkService/src/main/java/com/iformall/service/WxEnergyService.java Просмотреть файл

@@ -13,15 +13,14 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxEnergyFeesSetoff;
import com.iformall.domain.po.WxEnergyFeesCalcute;
import com.iformall.domain.po.WxEnergyFeesCalcuteShop;
import com.iformall.domain.po.WxEnergyFeesShop;
import com.iformall.domain.po.WxEnergyFeesTime;
import com.iformall.domain.po.WxEnergyMeter;
import com.iformall.domain.po.WxEnergyMeterChild;
import com.iformall.domain.po.WxEnergyMeterReading;
import com.iformall.domain.po.WxEnergyMeterShopFloor;
import com.iformall.domain.po.WxEnergyReadingCalcute;
import com.iformall.domain.po.WxEnergyReadingCalcuteShop;
import com.iformall.domain.po.WxEnergyReadingCalcuteResult;
import com.iformall.domain.po.base.TenantEntity;
/**
*/
@@ -51,7 +50,7 @@ public interface WxEnergyService {
//费用科目
PageInfo<WxEnergyFees> feesListAsPage(WxEnergyFees record, Integer pageIndex, Integer pageSize,boolean isSetOff);
void saveOrUpdateFees(WxEnergyFees record);
WxEnergyFees getFeesById(WxEnergyFees record);
WxEnergyFees getFeesById(Long id,String tenantId);
void setFeesIsDel(WxEnergyFees record);
Map<Long,WxEnergyFees> getFeesMap(WxEnergyFees record);
void initEnergyFees(TenantEntity tenantEntity);
@@ -59,15 +58,12 @@ public interface WxEnergyService {
List<Long> getFeesIdList(WxEnergyFees record);
//计算标砖
PageInfo<WxEnergyFeesCalcute> feesCalcuteListAsPage(WxEnergyFeesCalcute record, Integer pageIndex, Integer pageSize);
List<Map> getFeesCalcuteComponentList(WxEnergyFeesCalcute record);
void saveOrUpdateFeesCalcute(WxEnergyFeesCalcute record);
void updateFeesCalcuteIsDel(WxEnergyFeesCalcute record);
void createFeesCalcuteAlias(WxEnergyFeesCalcuteShop record);
void deleteFeesCalcuteAlias(WxEnergyFeesCalcuteShop record);
WxEnergyFeesCalcuteShop getShopFeesCalcute(Long id,String tenantId);
void saveOrUpdateShopFeesCalcute(WxEnergyFeesCalcuteShop record);
PageInfo<WxEnergyFeesCalcuteShop> shopFeesCalcuteListAsPage(WxEnergyFeesCalcuteShop record, Integer pageIndex, Integer pageSize);
List<Map> getFeesCalcuteComponentList(WxEnergyFeesShop record);
void createFeesShop(WxEnergyFeesShop record);
void deleteFeesShop(WxEnergyFeesShop record);
WxEnergyFeesShop getShopFeesCalcute(Long id,String tenantId);
void saveOrUpdateShopFeesCalcute(WxEnergyFeesShop record);
PageInfo<WxEnergyFeesShop> feesShopListAsPage(WxEnergyFeesShop record, Integer pageIndex, Integer pageSize);
//抄表数据
PageInfo<WxEnergyMeterReading> readingListAsPage(WxEnergyMeterReading record, Integer pageIndex, Integer pageSize);
@@ -76,6 +72,8 @@ public interface WxEnergyService {
void commitReading(WxEnergyMeterReading record,MallUserInfo userInfo);
WxEnergyMeterReading getReadingById(WxEnergyMeterReading record);
void setReadingIsDel(WxEnergyMeterReading record);
void exportReading(WxEnergyMeterReading record,HttpServletRequest request, HttpServletResponse response);
void importReading(MultipartFile mFile, MallUserInfo user, HttpServletRequest request, HttpServletResponse response);
//抄表科目计算数据
PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize);


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

@@ -1,5 +1,7 @@
package com.iformall.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
@@ -14,12 +16,12 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumEnergyMeterPhysicsType;
import com.iformall.enums.EnumEnergyMeterShopFloorType;
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.service.helper.WxEnergyHelper;
import com.iformall.utils.DateUtils;

import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams;
@@ -57,8 +59,6 @@ public class WxEnergyServiceImpl implements WxEnergyService {
@Autowired
WxEnergyMeterChildMapper wxEnergyMeterChildMapper;
@Autowired
WxEnergyFeesCalcuteMapper wxEnergyFeesCalcuteMapper;
@Autowired
WxEnergyMeterReadingMapper wxEnergyMeterReadingMapper;
@Autowired
WxEnergyFeesTimeMapper wxEnergyFeesTimeMapper;
@@ -67,13 +67,13 @@ public class WxEnergyServiceImpl implements WxEnergyService {
@Autowired
WxEnergyFeesMapper wxEnergyFeesMapper;
@Autowired
WxEnergyFeesCalcuteShopMapper wxEnergyFeesCalcuteShopMapper;
WxEnergyFeesShopMapper wxEnergyFeesShopMapper;
@Autowired
WxEnergyFeesSetoffMapper wxEnergyFeesSetoffMapper;
@Autowired
WxEnergyReadingCalcuteMapper wxEnergyReadingCalcuteMapper;
@Autowired
WxEnergyReadingCalcuteShopMapper wxEnergyReadingCalcuteShopMapper;
WxEnergyReadingCalcuteResultMapper wxEnergyReadingCalcuteResultMapper;
@Lazy
@Autowired
@@ -339,7 +339,6 @@ public class WxEnergyServiceImpl implements WxEnergyService {
@Override
public void timeDel(WxEnergyFeesTime record) {
//TODO 如果是已经有过计算的,不让删除
wxEnergyFeesTimeMapper.deleteById(record.getId());
wxEnergyFeesTimeShopMapper.deleteByTimeId(record.getId(),record.getTenantId());
}
@@ -414,7 +413,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
}
} else {
WxEnergyFees fees = this.getFeesById(record);
WxEnergyFees fees = this.getFeesById(record.getId(),record.getTenantId());
if (null == fees) {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到");
}
@@ -456,13 +455,13 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
@Override
public WxEnergyFees getFeesById(WxEnergyFees record) {
return wxEnergyFeesMapper.selectById(record.getId(), record.getTenantId());
public WxEnergyFees getFeesById(Long id,String tenantId) {
return wxEnergyFeesMapper.selectById(id, tenantId);
}

@Override
public void setFeesIsDel(WxEnergyFees record) {
WxEnergyFees fees = this.getFeesById(record);
WxEnergyFees fees = this.getFeesById(record.getId(),record.getTenantId());
if (null == fees) {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到");
}
@@ -508,33 +507,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
@Override
public PageInfo<WxEnergyFeesCalcute> feesCalcuteListAsPage(WxEnergyFeesCalcute record, Integer pageIndex, Integer pageSize) {
PageInfo<WxEnergyFeesCalcute> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyFeesCalcuteMapper.findList(record));
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(record);
fq.setIsDel(EnumYesOrNo.NO.getCode());
Map<Long, WxEnergyFees> feesMap = this.getFeesMap(fq);
for (int i = 0 ; i < page.getList().size() ; i++) {
WxEnergyFeesCalcute fs = page.getList().get(i);
if (null != feesMap && null != fs.getFeesId()) {
WxEnergyFees fee = feesMap.get(fs.getFeesId());
if (null != fee) {
fs.setFeesName(fee.getName());
fs.setFeesType(fee.getType());
fs.setFeesTypeName(fee.getTypeName());
fs.setFixedPriceName(fee.getFixedPriceName());
fs.setCalcuteUnitName(fee.getCalcuteUnitName());
fs.setTimeUnitName(fee.getTimeUnitName());
}
}
}
}
return page;
}
@Override
public List<Map> getFeesCalcuteComponentList(WxEnergyFeesCalcute record) {
public List<Map> getFeesCalcuteComponentList(WxEnergyFeesShop record) {
List<Map> retList = WxEnergyHelper.generateCalcuteComponent();
//公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数
WxEnergyMeter mq = new WxEnergyMeter();
@@ -554,88 +527,66 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
@Override
public void saveOrUpdateFeesCalcute(WxEnergyFeesCalcute record) {
Date date = new Date();
final IdWorker idWorker = IdWorker.get();
if (record.getId() == null) {
record.setId(idWorker.nextId());
record.setCreateTime(date);
record.setUpdateTime(date);
wxEnergyFeesCalcuteMapper.insert(record);
}else {
record.setUpdateTime(date);
wxEnergyFeesCalcuteMapper.updateById(record);
}
}
@Override
public void updateFeesCalcuteIsDel(WxEnergyFeesCalcute record) {
wxEnergyFeesCalcuteMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel());
}
@Override
public void createFeesCalcuteAlias(WxEnergyFeesCalcuteShop record) {
public void createFeesShop(WxEnergyFeesShop record) {
//新增关联
final IdWorker idWorker = IdWorker.get();
Date date = new Date();
WxEnergyFees fees = this.getFeesById(record.getFeesId(),record.getTenantId());
for (int i = 0 ; i < record.getShopIds().size(); i ++) {
Long shopId = record.getShopIds().get(i);
for (int j = 0 ; j < record.getCalcuteIds().size(); j ++) {
Long calcuteId = record.getCalcuteIds().get(j);
WxEnergyFeesCalcuteShop msf = new WxEnergyFeesCalcuteShop();
WxEnergyFeesShop msf = new WxEnergyFeesShop();
msf.updateTenantInfo(record);
msf.setId(idWorker.nextId());
msf.setCreateTime(date);
msf.setUpdateTime(date);
msf.setCalcuteId(calcuteId);
msf.setShopId(shopId);
WxEnergyFeesCalcute calcute = wxEnergyFeesCalcuteMapper.selectById(calcuteId, record.getTenantId());
msf.setPhysicsType(calcute.getPhysicsType());
msf.setFeesId(calcute.getFeesId());
msf.setPrice(calcute.getPrice());
msf.setFormula(calcute.getFormula());
msf.setFormulaContent(calcute.getFormulaContent());
wxEnergyFeesCalcuteShopMapper.insert(msf);
msf.setIsPublic(fees.getIsPublic());
msf.setFeesId(fees.getId());
msf.setPrice(fees.getPrice());
msf.setFormula(record.getFormula());
msf.setFormulaContent(record.getFormulaContent());
wxEnergyFeesShopMapper.insert(msf);
}
}
}
@Override
public void deleteFeesCalcuteAlias(WxEnergyFeesCalcuteShop record) {
wxEnergyFeesCalcuteShopMapper.deleteById(record.getId());
public void deleteFeesShop(WxEnergyFeesShop record) {
wxEnergyFeesShopMapper.deleteById(record.getId());
}
@Override
public WxEnergyFeesCalcuteShop getShopFeesCalcute(Long id,String tenantId) {
return wxEnergyFeesCalcuteShopMapper.selectById(id,tenantId);
public WxEnergyFeesShop getShopFeesCalcute(Long id,String tenantId) {
return wxEnergyFeesShopMapper.selectById(id,tenantId);
}
@Override
public void saveOrUpdateShopFeesCalcute(WxEnergyFeesCalcuteShop record) {
public void saveOrUpdateShopFeesCalcute(WxEnergyFeesShop record) {
Date date = new Date();
final IdWorker idWorker = IdWorker.get();
if (record.getId() == null) {
record.setId(idWorker.nextId());
record.setCreateTime(date);
record.setUpdateTime(date);
wxEnergyFeesCalcuteShopMapper.insert(record);
wxEnergyFeesShopMapper.insert(record);
}else {
record.setUpdateTime(date);
wxEnergyFeesCalcuteShopMapper.updateById(record);
wxEnergyFeesShopMapper.updateById(record);
}
}
@Override
public PageInfo<WxEnergyFeesCalcuteShop> shopFeesCalcuteListAsPage(WxEnergyFeesCalcuteShop record, Integer pageIndex, Integer pageSize) {
PageInfo<WxEnergyFeesCalcuteShop> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyFeesCalcuteShopMapper.findList(record));
public PageInfo<WxEnergyFeesShop> feesShopListAsPage(WxEnergyFeesShop record, Integer pageIndex, Integer pageSize) {
PageInfo<WxEnergyFeesShop> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyFeesShopMapper.findList(record));
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(record);
fq.setIsDel(EnumYesOrNo.NO.getCode());
Map<Long, WxEnergyFees> feesMap = this.getFeesMap(fq);
for (int i = 0 ; i < page.getList().size() ; i++) {
WxEnergyFeesCalcuteShop fs = page.getList().get(i);
WxEnergyFeesShop fs = page.getList().get(i);
if (null != feesMap && null != fs.getFeesId()) {
WxEnergyFees fee = feesMap.get(fs.getFeesId());
if (null != fee) {
@@ -661,30 +612,6 @@ public class WxEnergyServiceImpl implements WxEnergyService {
public PageInfo<WxEnergyMeterReading> readingListAsPage(WxEnergyMeterReading record, Integer pageIndex,
Integer pageSize) {
PageInfo<WxEnergyMeterReading> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyMeterReadingMapper.findList(record));
if (null != page && null != page.getList()) {
WxEnergyFeesTime tq = new WxEnergyFeesTime();
tq.updateTenantInfo(record);
Map<Long, WxEnergyFeesTime> timeMap = this.getTimeMap(tq);
Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(record);
Map<Long, String> floorMap = wxMallFloorService.getFloorMap(record);
for (int i = 0 ; i < page.getList().size() ; i ++) {
// WxEnergyMeterReading m = page.getList().get(i);
// if (null != timeMap) {
// WxEnergyFeesTime time = timeMap.get(m.getTimeId());
// if (null != time) {
// m.setTimeName(time.getName());
// }
// }
// if (null != buildingMap && null != m.getBuildingId()) {
// String buildingName = buildingMap.get(m.getBuildingId());
// m.setBuildingName(buildingName);
// }
// if (null != floorMap && null != m.getFloorId()) {
// String floorName = floorMap.get(m.getFloorId());
// m.setFloorName(floorName);
// }
}
}
return page;
}

@@ -745,6 +672,12 @@ public class WxEnergyServiceImpl implements WxEnergyService {
@Override
public void commitReading(WxEnergyMeterReading record, MallUserInfo userInfo) {
if (null != record.getMeterReadingList() && record.getMeterReadingList().size() > 0) {
Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(record);
Map<Long, String> floorMap = wxMallFloorService.getFloorMap(record);
WxShop shopq = new WxShop();
shopq.updateTenantInfo(record);
shopq.setIsDel(EnumYesOrNo.NO.getCode());
Map<Long,WxShop> shopMap = wxShopService.findShopMap(shopq);
for (int i = 0 ; i < record.getMeterReadingList().size(); i ++) {
WxEnergyMeterReading r = record.getMeterReadingList().get(i);
//获取上一次的数据
@@ -757,11 +690,51 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}else {
r.setPreNumber("0");
}
r.setStartTime(record.getStartTime());
r.setEndTime(record.getEndTime());
//根据表id获取表名
WxEnergyMeter meter = wxEnergyMeterMapper.selectById(r.getMeterId(), record.getTenantId());
r.setMeterName(meter.getName());
r.setMeterType(meter.getType());
r.setMeterRate(meter.getRate());
//根据表查询所属
WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor();
sfq.updateTenantInfo(record);
sfq.setMeterId(meter.getId());
List<WxEnergyMeterShopFloor> merterAliasList = wxEnergyMeterShopFloorMapper.findList(sfq);
StringBuffer shopname = new StringBuffer("");
StringBuffer floorname = new StringBuffer("");
StringBuffer buildingname = new StringBuffer("");
if (null != merterAliasList) {
for (int j = 0 ; j < merterAliasList.size() ; j ++) {
WxEnergyMeterShopFloor msf = merterAliasList.get(j);
if(msf.getType() == EnumEnergyMeterShopFloorType.SHOP.getCode()) {
if (null != shopMap) {
WxShop shop = shopMap.get(msf.getAliseId());
if (null != shop) {
shopname.append(shop.getShopNumber()).append(",");
}
}
}else if (msf.getType() == EnumEnergyMeterShopFloorType.FLOOR.getCode()) {
if (null != floorMap) {
String floor = floorMap.get(msf.getAliseId());
if (StringUtils.isNotBlank(floor)) {
floorname.append(floor).append(",");
}
}
}else if (msf.getType() == EnumEnergyMeterShopFloorType.BUILDING.getCode()) {
if (null != buildingMap) {
String building = buildingMap.get(msf.getAliseId());
if (StringUtils.isNotBlank(building)) {
buildingname.append(building).append(",");
}
}
}
}
}
r.setShopName(shopname.toString());
r.setFloorName(floorname.toString());
r.setBuildingName(buildingname.toString());
createReading(r, userInfo);
}
}
@@ -781,6 +754,63 @@ public class WxEnergyServiceImpl implements WxEnergyService {
wxEnergyMeterReadingMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel());
}
@Override
public void exportReading(WxEnergyMeterReading record, HttpServletRequest request, HttpServletResponse response) {
List<Map<String,Object>> execlList = new ArrayList<Map<String,Object>>();
WxEnergyMeterReading rq = new WxEnergyMeterReading();
rq.updateTenantInfo(record);
//rq.setTimeId(tq.getId());
PageInfo<WxEnergyMeterReading> page = this.readingListAsPage(rq, 1, 10000);
if (null != page && null != page.getList()) {
for (int i = 0 ; i < page.getList().size(); i++) {
WxEnergyMeterReading r = page.getList().get(i);
execlList.add(r.generateExcelData());
}
}
excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "抄表数据.xlsx","sheet1", response);
}
@Override
public void importReading(MultipartFile mFile, MallUserInfo user, HttpServletRequest request,
HttpServletResponse response) {
File file = handlerImportFile(mFile,"energyReadingImport");
// 需要验证
Map<String,String> excelTitle = WxEnergyMeterReading.generateExcelTitle();
String[] needFields = new String[excelTitle.size()];
int index = 0;
for (Iterator<String> it = excelTitle.keySet().iterator(); it.hasNext();) {
String fi = excelTitle.get(it.next());
needFields[index] = fi;
index = index + 1;
}
ExcelImportResult<Map> datalist = handleImportFile(file,Map.class,needFields,needFields,new ReadingExcelHandler());
if (null == datalist) {
return ;
}

List<Map> successList = datalist.getList();
if(successList.size() > 0) {
boolean allSuccess = true;
try {
successList.parallelStream().forEach(reading -> {
String id = (String) reading.get("抄表数据编码");
WxEnergyMeterReading r = new WxEnergyMeterReading();
r.updateTenantInfo(user);
r.setId(Long.parseLong(id));
r.setCurNumber((String)reading.get("本次抄表数"));
r.setStartTime(DateUtils.stringToDate((String)reading.get("开始日期"),DateUtils.DATE_TIME_PATTERN));
r.setEndTime(DateUtils.stringToDate((String)reading.get("截止日期"),DateUtils.DATE_TIME_PATTERN));
r.setUpdateBy(user.getId());
r.setUpdateByName(user.getName());
r.setUpdateTime(new Date());
wxEnergyMeterReadingMapper.updateById(r);
});
} catch (Exception e) {
logger.error("导入模板失败:"+e.getMessage(),e);
allSuccess = false;
}
}
}
@@ -824,12 +854,19 @@ public class WxEnergyServiceImpl implements WxEnergyService {
record.setUpdateBy(userInfo.getId());
record.setUpdateByName(userInfo.getName());
record.setShopSize(record.getShopIds().size());
record.setShop(JSON.toJSONString(record.getShopIds()));
try {
wxEnergyReadingCalcuteMapper.insert(record);
for (int i = 0 ; i < record.getShopIds().size() ; i ++) {
Long shopId = record.getShopIds().get(i);
//111111
}
// wxEnergyReadingCalcuteMapper.insert(record);
// WxEnergyFees fees = this.getFeesById(record.getFeesId(),record.getTenantId());
// if (fees.getIsPublic() == EnumYesOrNo.YES.getCode()) {
//
// }else {
// for (int i = 0 ; i < record.getShopIds().size() ; i ++) {
// Long shopId = record.getShopIds().get(i);
// WxEnergyReadingCalcuteResult cs = generateCalcuteResult();
// wxEnergyReadingCalcuteResultMapper.insert(cs);
// }
// }
} catch (Exception e) {
logger.error("保存租赁账单失败,e:" + e.getMessage());
@@ -843,6 +880,51 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
}
public void generateUserTypeCalcuteResult(WxEnergyFees fees,WxEnergyReadingCalcute record,List<Long> shopIds) {
// for (int i = 0 ; i < shopIds.size(); i ++) {
// Long shopId= shopIds.get(i);
// //根据店铺,所属年月去查询时间区间.根据店铺,时间区间去查对应的抄表数据,根据表来计算总和
// WxEnergyFeesTimeShop sq = new WxEnergyFeesTimeShop();
// sq.updateTenantInfo(record);
// sq.setShopId(shopId);
// List<Long> timeIds = wxEnergyFeesTimeShopMapper.findTimeIdList(sq);
// if (null == timeIds || timeIds.size() <= 0 ) {
// return;
// }
// //一个年月,一个店铺应该只有一个周期
// WxEnergyFeesTime tq = new WxEnergyFeesTime();
// tq.updateTenantInfo(record);
// tq.setIds(timeIds);
// tq.setPeriod(record.getPeriod());
// List<WxEnergyFeesTime> timelist = wxEnergyFeesTimeMapper.findList(tq);
// if (null == timelist || timelist.size() <= 0 ) {
// return;
// }
// WxEnergyFeesTime time = timelist.get(0);
//
// //根据店铺查询计费标准
// WxEnergyFeesShop csq = new WxEnergyFeesShop();
// csq.updateTenantInfo(record);
// csq.setShopId(shopId);
// wxEnergyFeesCalcuteShopMapper.findCalcuteIdList();
//
// //根据店铺去查询表
// WxEnergyMeter mq = new WxEnergyMeter();
// mq.updateTenantInfo(record);
// mq.setType(fees.getType());
// mq.setPhysicsType(EnumEnergyMeterPhysicsType.USER.getCode());
// List<WxEnergyMeter> meterList = wxEnergyMeterMapper.findList(mq);
//
// WxEnergyReadingCalcuteResult cs = new WxEnergyReadingCalcuteResult();
// cs.updateTenantInfo(record);
// cs.setId(idWorker.nextId());
// cs.setCalcuteId(record.getId());
// cs.setShopId(shopId);
// cs.setCreateTime(date);
// cs.setUpdateTime(date);
// }
}
@Override
public WxEnergyReadingCalcute getReadingCalcuteById(WxEnergyReadingCalcute record) {
return wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId());
@@ -1265,17 +1347,20 @@ public class WxEnergyServiceImpl implements WxEnergyService {

@Override
public List<String> getReadingCalcuteShopNumber(WxEnergyReadingCalcute record) {
WxEnergyReadingCalcuteShop ts = new WxEnergyReadingCalcuteShop();
ts.updateTenantInfo(record);
ts.setCalcuteId(record.getId());
List<Long> shopIds = wxEnergyReadingCalcuteShopMapper.findShopIdList(ts);
if (null == shopIds || shopIds.size() <= 0 ) {
return null;
if (StringUtils.isNotBlank(record.getShop())) {
JSONArray sj = JSON.parseArray(record.getShop());
if (null != sj) {
List<Long> shopIds = new ArrayList<Long>();
for (int i = 0 ; i < sj.size(); i++) {
shopIds.add(sj.getLong(i));
}
WxShop sq = new WxShop();
sq.updateTenantInfo(record);
sq.setIds(shopIds);
return wxShopService.getShopNumberList(sq);
}
}
WxShop sq = new WxShop();
sq.updateTenantInfo(record);
sq.setIds(shopIds);
return wxShopService.getShopNumberList(sq);
return null;
}

}

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

@@ -969,10 +969,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
@Override
public void createTempFees(WxAllBill record,MallUserInfo user) {
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(record);
fq.setId(record.getEnergyFeesId());
WxEnergyFees fees = wxEnergyService.getFeesById(fq) ;
WxEnergyFees fees = wxEnergyService.getFeesById(record.getEnergyFeesId(),record.getTenantId()) ;
record.setBillType(fees.getBillType());
WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId());
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) {


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

@@ -226,7 +226,7 @@
sum(CAST(ifnull(pay,'0') AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date,
sum(CAST(ifnull(set_off,'0)' AS DECIMAL(20,2))) set_off ,
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off ,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay
from wx_all_bill
<include refid="dynamicWhereConditions"/>


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

@@ -10,7 +10,6 @@
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="public_calcute" jdbcType="INTEGER" property="publicCalcute"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="bill_type" jdbcType="INTEGER" property="billType"/>
<result column="is_system" jdbcType="INTEGER" property="isSystem"/>
@@ -19,11 +18,12 @@
<result column="time_unit" jdbcType="INTEGER" property="timeUnit"/>
<result column="tax_rate" jdbcType="VARCHAR" property="taxRate"/>
<result column="is_despoit" jdbcType="INTEGER" property="isDespoit"/>
<result column="is_public" jdbcType="INTEGER" property="isPublic"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`public_calcute`,`type`,`bill_type`,`is_system`,
`fixed_price`,`calcute_unit`,`time_unit`,`tax_rate`,`is_despoit`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`type`,`bill_type`,`is_system`,
`fixed_price`,`calcute_unit`,`time_unit`,`tax_rate`,`is_despoit`,`is_public`
</sql>

<sql id="dynamicWhereConditions">
@@ -36,7 +36,6 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != publicCalcute ">and `public_calcute` = #{publicCalcute}</if>
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != billType ">and `bill_type` = #{billType}</if>
<if test=" null != notSetOff ">and `bill_type` != 6</if>
@@ -46,6 +45,7 @@
<if test=" null != timeUnit ">and `time_unit` = #{timeUnit}</if>
<if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if>
<if test=" null != isDespoit ">and `is_despoit` = #{isDespoit}</if>
<if test=" null != isPublic ">and `is_public` = #{isPublic}</if>
<if test=" null != billTypeList ">
and bill_type in
<foreach collection="billTypeList" index="index" item="billTypeItem" open="(" separator="," close=")">


mallinkService/src/main/resources/mapper/WxEnergyFeesCalcuteMapper.xml → mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml Просмотреть файл

@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxEnergyFeesCalcuteMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxEnergyFeesCalcute">
<mapper namespace="com.iformall.mapper.WxEnergyFeesShopMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxEnergyFeesShop">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="physics_type" jdbcType="INTEGER" property="physicsType"/>
<result column="is_public" jdbcType="INTEGER" property="isPublic"/>
<result column="formula" jdbcType="VARCHAR" property="formula"/>
<result column="formula_content" jdbcType="VARCHAR" property="formulaContent"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`fees_id`,`price`,`physics_type`,`formula`,`formula_content`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`price`,`is_public`,`formula`,`formula_content`,`shop_id`,`fees_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -28,9 +28,15 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != physicsType ">and `physics_type` = #{physicsType}</if>
<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
<if test=" null != isPublic ">and `is_public` = #{isPublic}</if>
<if test=" null != shopIds ">
and shop_id in
<foreach collection="shopIds" index="index" item="sidItem" open="(" separator="," close=")">
#{sidItem}
</foreach>
</if>
<if test=" null != feesIds ">
and fees_id in
<foreach collection="feesIds" index="index" item="fidItem" open="(" separator="," close=")">
@@ -46,28 +52,24 @@
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxEnergyFeesCalcute" resultMap="BaseResultMap">
<select id="findList" parameterType="com.iformall.domain.po.WxEnergyFeesShop" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_fees_calcute
from wx_energy_fees_shop
<include refid="dynamicWhereConditions"/>
</select>
<select id="selectById" parameterType="HashMap" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_fees_calcute where id = #{id} and `tenant_id` = #{tenantId}
from wx_energy_fees_shop where id = #{id} and `tenant_id` = #{tenantId}
</select>
<select id="findFeesIdList" parameterType="com.iformall.domain.po.WxEnergyFeesCalcute" resultType="Long">
<select id="findFeesIdList" parameterType="com.iformall.domain.po.WxEnergyFeesShop" resultType="Long">
select distinct fees_id
from wx_energy_fees_calcute
from wx_energy_fees_shop
<include refid="dynamicWhereConditions"/>
</select>
<update id = "setIsDel" parameterType="HashMap">
update wx_energy_fees_calcute set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId}
</update>
</mapper>


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

@@ -76,5 +76,11 @@
<include refid="dynamicWhereConditions"/>
</select>
<select id="findTimeIdList" parameterType="com.iformall.domain.po.WxEnergyFeesTimeShop" resultType="Long">
select distinct time_id
from wx_energy_fees_time_shop
<include refid="dynamicWhereConditions"/>
</select>
</mapper>


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

@@ -23,13 +23,15 @@
<result column="meter_type" jdbcType="INTEGER" property="meterType"/>
<result column="meter_rate" jdbcType="VARCHAR" property="meterRate"/>
<result column="meter_name" jdbcType="VARCHAR" property="meterName"/>
<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="building_name" jdbcType="VARCHAR" property="buildingName"/>
<result column="floor_name" jdbcType="VARCHAR" property="floorName"/>
<result column="shop_name" jdbcType="VARCHAR" property="shopName"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`cur_number`,`pre_number`,`pre_time`,`pre_by`,`pre_by_name`,`start_time`,`end_time`,`create_by`,`create_by_name`,
`update_by`,`update_by_name`,`remark`,`meter_id`,`meter_type`,`meter_rate`,`meter_name`,`price`,`is_del`
`update_by`,`update_by_name`,`remark`,`meter_id`,`meter_type`,`meter_rate`,`meter_name`,`is_del`,`building_name`,`floor_name`,`shop_name`
</sql>

<sql id="dynamicWhereConditions">
@@ -75,12 +77,6 @@
from wx_energy_meter_reading where id = #{id} and `tenant_id` = #{tenantId}
</select>
<select id="findAllSumMoney" parameterType="com.iformall.domain.po.WxEnergyMeterReading" resultType="string">
select sum((CAST(cur_number AS DECIMAL(20,4)) - CAST(pre_number AS DECIMAL(20,4)))*(CAST(price AS DECIMAL(20,4))) / (CAST(meter_rate AS DECIMAL(20,4)))) as money
from wx_energy_meter_reading
<include refid="dynamicWhereConditions"/>
</select>
<update id = "setIsDel" parameterType="HashMap">
update wx_energy_meter_reading set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId}
</update>


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

@@ -18,11 +18,12 @@
<result column="calcute_success" jdbcType="INTEGER" property="calcuteSuccess"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="shop_size" jdbcType="INTEGER" property="shopSize"/>
<result column="shop" jdbcType="VARCHAR" property="shop"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`,
`update_by`,`update_by_name`,`remark`,`period`,`fees_id`,`is_calcuted`,`calcute_success`,`is_del`,`shop_size`
`update_by`,`update_by_name`,`remark`,`period`,`fees_id`,`is_calcuted`,`calcute_success`,`is_del`,`shop_size`,`shop`
</sql>

<sql id="dynamicWhereConditions">


mallinkService/src/main/resources/mapper/WxEnergyFeesCalcuteShopMapper.xml → mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml Просмотреть файл

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxEnergyFeesCalcuteShopMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxEnergyFeesCalcuteShop">
<mapper namespace="com.iformall.mapper.WxEnergyReadingCalcuteResultMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxEnergyReadingCalcuteResult">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="calcute_id" jdbcType="BIGINT" property="calcuteId"/>
<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="physics_type" jdbcType="INTEGER" property="physicsType"/>
<result column="formula" jdbcType="VARCHAR" property="formula"/>
<result column="formula_content" jdbcType="VARCHAR" property="formulaContent"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/>
<result column="calcute_id" jdbcType="BIGINT" property="calcuteId"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="fees_calcute_id" jdbcType="BIGINT" property="feesCalcuteId"/>
<result column="meter_id" jdbcType="BIGINT" property="meterId"/>
<result column="reading_id" jdbcType="BIGINT" property="readingId"/>
<result column="money" jdbcType="VARCHAR" property="money" />
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`price`,`physics_type`,`formula`,`formula_content`,`shop_id`,`fees_id`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`shop_id`,`fees_id`,`fees_calcute_id`,`meter_id`,`reading_id`,`money`
</sql>

<sql id="dynamicWhereConditions">
@@ -30,9 +30,11 @@
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != calcuteId ">and `calcute_id` = #{calcuteId}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
<if test=" null != physicsType ">and `physics_type` = #{physicsType}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != feesCalcuteId ">and `fees_calcute_id` = #{feesCalcuteId}</if>
<if test=" null != meterId ">and `meter_id` = #{meterId}</if>
<if test=" null != readingId ">and `reading_id` = #{readingId}</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -42,22 +44,22 @@
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxEnergyFeesCalcuteShop" resultMap="BaseResultMap">
<select id="findList" parameterType="com.iformall.domain.po.WxEnergyReadingCalcuteResult" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_fees_calcute_shop
from wx_energy_reading_calcute_result
<include refid="dynamicWhereConditions"/>
</select>
<select id="selectById" parameterType="HashMap" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_fees_calcute_shop where id = #{id} and `tenant_id` = #{tenantId}
from wx_energy_reading_calcute_result where id = #{id} and `tenant_id` = #{tenantId}
</select>
<select id="findFeesIdList" parameterType="com.iformall.domain.po.WxEnergyFeesCalcuteShop" resultType="Long">
select distinct fees_id
from wx_energy_fees_calcute_shop
<select id="findShopIdList" parameterType="com.iformall.domain.po.WxEnergyReadingCalcuteResult" resultType="Long">
select distinct shop_id
from wx_energy_reading_calcute_result
<include refid="dynamicWhereConditions"/>
</select>

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

@@ -1,58 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxEnergyReadingCalcuteShopMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxEnergyReadingCalcuteShop">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="calcute_id" jdbcType="BIGINT" property="calcuteId"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`shop_id`
</sql>

<sql id="dynamicWhereConditions">
where 1=1
<if test=" null != id ">and `id` = #{id}</if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != calcuteId ">and `calcute_id` = #{calcuteId}</if>
<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxEnergyReadingCalcuteShop" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_reading_calcute_shop
<include refid="dynamicWhereConditions"/>
</select>
<select id="selectById" parameterType="HashMap" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_energy_reading_calcute_shop where id = #{id} and `tenant_id` = #{tenantId}
</select>
<select id="findShopIdList" parameterType="com.iformall.domain.po.WxEnergyReadingCalcuteShop" resultType="Long">
select distinct shop_id
from wx_energy_reading_calcute_shop
<include refid="dynamicWhereConditions"/>
</select>
</mapper>


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