From 6e5fe040944e8d2fc2b2efd59d05c47865e56a54 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 25 Aug 2024 23:06:14 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 54 +++- .../db/migration/V202408000000005.sql | 56 ++++ .../controller/WxMallAdminController.java | 1 - .../iformall/domain/po/WxEnergyFeesTime.java | 27 +- .../domain/po/WxEnergyFeesTimeShop.java | 55 ++++ .../domain/po/WxEnergyReadingCalcute.java | 25 +- .../domain/po/WxEnergyReadingCalcuteShop.java | 46 +++ .../mapper/WxEnergyFeesTimeShopMapper.java | 23 ++ .../mapper/WxEnergyMeterReadingMapper.java | 4 - .../WxEnergyReadingCalcuteShopMapper.java | 19 ++ .../com/iformall/mapper/WxShopMapper.java | 2 + .../com/iformall/service/WxEnergyService.java | 6 +- .../com/iformall/service/WxShopService.java | 2 + .../service/impl/WxEnergyServiceImpl.java | 289 +++++++++++------- .../service/impl/WxShopServiceImpl.java | 5 + .../mapper/WxEnergyFeesTimeMapper.xml | 11 +- .../mapper/WxEnergyFeesTimeShopMapper.xml | 80 +++++ .../mapper/WxEnergyMeterReadingMapper.xml | 14 - .../mapper/WxEnergyReadingCalcuteMapper.xml | 22 +- .../WxEnergyReadingCalcuteShopMapper.xml | 58 ++++ .../main/resources/mapper/WxShopMapper.xml | 5 + 21 files changed, 626 insertions(+), 178 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTimeShop.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteShop.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesTimeShopMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxEnergyFeesTimeShopMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteShopMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 298911f3c..ffd81b984 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -14,6 +14,7 @@ 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; @@ -30,6 +31,7 @@ import com.iformall.exception.MallinkException; import com.iformall.service.WxEnergyService; import com.iformall.service.WxMallFloorService; import com.iformall.service.WxShopService; +import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -50,6 +52,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -258,6 +261,7 @@ public class WxEnergyController extends BaseController { WxShop s = new WxShop(); s.setId(meter.getId()); s.setShopNumber(meter.getName()); + s.setTreeType(meter.getTreeType()); s.setTreeParentId(record.getShopId()); s.setTreeParentType("shop"); retList.add(s); @@ -435,6 +439,19 @@ public class WxEnergyController extends BaseController { return new ResultData(list); } + @ApiOperation("费用区间所属年月") + @GetMapping("periodList") + public ResultData periodList() { + Calendar calendar = Calendar.getInstance(); + int year = calendar.get(Calendar.YEAR); + String[] months = new String[] {"01","02","03","04","05","06","07","08","09","10","11","12"}; + String[] peroids = new String[months.length+1]; + peroids[0] = (year-1)+"12"; + for (int i = 0 ; i < months.length; i++) { + peroids[i+1]=year+months[i]; + } + return new ResultData(peroids); + } @ApiOperation("费用区间列表") @GetMapping("timeList") @@ -449,6 +466,12 @@ public class WxEnergyController extends BaseController { return new ResultData(page); } + @ApiOperation("费用区间自动时间") + @GetMapping("periodAutoTimes") + public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { + return new ResultData(); + } + @ApiOperation("费用区间列表") @PostMapping("saveTime") public ResultData saveTime(@RequestBody WxEnergyFeesTime record) { @@ -457,13 +480,20 @@ public class WxEnergyController extends BaseController { return new ResultData(); } - @PostMapping("timeUpdateIsDel") + @PostMapping("timeDel") public ResultData timeUpdateIsDel(@RequestBody WxEnergyFeesTime record) { record.updateTenantInfo(getTenantInfo()); - wxEnergyService.setTimeIsDel(record); + wxEnergyService.timeDel(record); return new ResultData(); } + @ApiOperation("区间店铺列表") + @GetMapping("timeShopList") + public ResultData timeShopList(@ModelAttribute WxEnergyFeesTime record) { + record.updateTenantInfo(getTenantInfo()); + return new ResultData(wxEnergyService.getTimeShopNumber(record)); + } + @ApiOperation("能源科目列表") @GetMapping("feesList") @ApiImplicitParams({ @@ -592,10 +622,27 @@ public class WxEnergyController extends BaseController { public ResultData readingCalcuteList(@ModelAttribute WxEnergyReadingCalcute record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + if(StringUtils.isNotBlank(record.getFeesIdsStr())) { + String[] shids = record.getFeesIdsStr().split(","); + if (null != shids ) { + List sids = new ArrayList(); + for (int i = 0 ; i < shids.length ; i ++) { + sids.add(Long.parseLong(shids[i])); + } + record.setFeesIds(sids); + } + } PageInfo page = wxEnergyService.readingCalcuteListAsPage(record, pageNum, pageSize); return new ResultData(page); } + @ApiOperation("科目抄表计算店铺列表") + @GetMapping("readingCalcuteShopList") + public ResultData readingCalcuteShopList(@ModelAttribute WxEnergyReadingCalcute record) { + record.updateTenantInfo(getTenantInfo()); + return new ResultData(wxEnergyService.getReadingCalcuteShopNumber(record)); + } + @ApiOperation("科目抄表计算记录导出") @GetMapping("readingCalcuteExport") public void readingCalcuteExport(@ModelAttribute WxEnergyReadingCalcute record, HttpServletRequest request, HttpServletResponse response) { @@ -628,9 +675,6 @@ public class WxEnergyController extends BaseController { if (null == wrc) { return new ResultData(Result.ERROR,"id错误"); } - if (null == wrc.getImportSuccess() || wrc.getImportSuccess().intValue() != EnumYesOrNo.YES.getCode().intValue()) { - return new ResultData(Result.ERROR,"导入未完全成功,不能计算!"); - } Integer number = wxEnergyService.calcuteReading(wrc, getUser()); return new ResultData(number); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql index 74cd4e0d8..20222c3f3 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql @@ -675,6 +675,62 @@ 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 '店铺数量'; +ALTER TABLE wx_energy_fees_time DROP COLUMN is_del; + +CREATE TABLE `wx_energy_fees_time_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, + `time_id` bigint(20) NOT NULL COMMENT '时间区间id', + `shop_id` bigint(20) NOT NULL COMMENT '店铺编号', + `period` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属年月', + `type` int(1) NOT NULL COMMENT '表类型', + PRIMARY KEY (`id`), + UNIQUE KEY `id_UNIQUE` (`id`), + KEY `T_P_S` (`tenant_id`,`shop_id`,`period`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; + +CREATE TABLE `wx_energy_reading_calcute_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', + `shop_id` bigint(20) NOT NULL COMMENT '店铺ID', + 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='能耗表抄表'; + +drop TABLE wx_energy_reading_calcute; +CREATE TABLE `wx_energy_reading_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, + `create_by` bigint(20) DEFAULT NULL, + `create_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `update_by` bigint(20) DEFAULT NULL, + `update_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `period` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属年月', + `fees_id` bigint(20) NOT NULL COMMENT '科目ID', + `is_calcuted` int(1) NOT NULL DEFAULT '0' COMMENT '是否已计算过', + `calcute_success` int(1) DEFAULT '0' COMMENT '计算是否成功', + `is_del` int(1) NOT NULL DEFAULT '0' COMMENT '是否已删除', + `shop_size` int(6) NOT NULL DEFAULT '0' COMMENT '店铺数量', + PRIMARY KEY (`id`), + UNIQUE KEY `id_UNIQUE` (`id`), + UNIQUE KEY `T_P_F` (`tenant_id`,`period`,`fees_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表'; + diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index fd155204c..5c9bfa8f7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -351,7 +351,6 @@ public class WxMallAdminController extends BaseController { @GetMapping("timeList") public ResultData timeList(@ModelAttribute WxEnergyFeesTime record) { setQueryDataRule(record); - record.setIsDel(EnumYesOrNo.NO.getCode()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); PageInfo page = wxEnergyService.timeListAsPage(record, 1, 1000); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java index 81a113637..31b2b8c9c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java @@ -1,11 +1,15 @@ 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.EnumEnergyMeterType; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; /** */ @@ -20,20 +24,28 @@ public class WxEnergyFeesTime extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="id",name="id") private Long id; - @io.swagger.annotations.ApiModelProperty(value="name",name="name") - private String name; - @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 = "isDel", name = "isDel") - private Integer isDel; - @io.swagger.annotations.ApiModelProperty(value = "表类型EnumEnergyMeterType", name = "type") private Integer type; + @TableField(exist = false) + private String typeName; + public String getTypeName() { + if (null != type) { + return EnumEnergyMeterType.getEnum(type).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value = "所属年月", name = "period") + private String period; + + @io.swagger.annotations.ApiModelProperty(value = "店铺数量", name = "shopSize") + private Integer shopSize; @io.swagger.annotations.ApiModelProperty(value="startTime",name="startTime") private Date startTime; @@ -41,4 +53,7 @@ public class WxEnergyFeesTime extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="endTime",name="endTime") private Date endTime; + @TableField(exist = false) + List shopIds; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTimeShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTimeShop.java new file mode 100644 index 000000000..88720e35d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTimeShop.java @@ -0,0 +1,55 @@ +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.EnumEnergyMeterType; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +/** + */ +@TableName(value = "wx_energy_fees_time_shop") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxEnergyFeesTimeShop 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 = "period") + private String period; + + @io.swagger.annotations.ApiModelProperty(value = "表类型EnumEnergyMeterType", name = "type") + private Integer type; + @TableField(exist = false) + private String typeName; + public String getTypeName() { + if (null != type) { + return EnumEnergyMeterType.getEnum(type).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value = "时间区间编号", name = "timeId") + private Long timeId; + + @io.swagger.annotations.ApiModelProperty(value="店铺编号",name="shopId") + private Long shopId; + + @TableField(exist = false) + private List shopIds; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java index f846d8164..23f73834e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java @@ -49,30 +49,15 @@ public class WxEnergyReadingCalcute extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") private String remark; - @io.swagger.annotations.ApiModelProperty(value="区间ID",name="timeId") - private Long timeId; - @TableField(exist = false) - private String timeName; + @io.swagger.annotations.ApiModelProperty(value="所属年月",name="period") + private String period; @io.swagger.annotations.ApiModelProperty(value="科目ID",name="feesId") private Long feesId; @TableField(exist = false) private String feesName; - - @io.swagger.annotations.ApiModelProperty(value = "isImported", name = "isImported") - private Integer isImported; - - @io.swagger.annotations.ApiModelProperty(value = "importSuccess", name = "importSuccess") - private Integer importSuccess; @TableField(exist = false) - private String importSuccessName; - public String getImportSuccessName() { - if (null != importSuccess && importSuccess.intValue() == EnumYesOrNo.YES.getCode().intValue()) { - return "成功"; - }else { - return "未完成导入"; - } - } + private String feesPhysicsTypeName; @io.swagger.annotations.ApiModelProperty(value = "isCalcuted", name = "isCalcuted") private Integer isCalcuted; @@ -97,5 +82,9 @@ public class WxEnergyReadingCalcute extends TenantEntity { @TableField(exist = false) private List shopIds; + @TableField(exist = false) + private List feesIds; + @TableField(exist = false) + private String feesIdsStr; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteShop.java new file mode 100644 index 000000000..4b537c566 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteShop.java @@ -0,0 +1,46 @@ +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.EnumYesOrNo; +import com.iformall.utils.DateUtils; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + */ +@TableName(value = "wx_energy_reading_calcute_shop") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxEnergyReadingCalcuteShop 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="计算ID",name="calcuteId") + private Long calcuteId; + + @io.swagger.annotations.ApiModelProperty(value="店铺ID",name="shopId") + private Long shopId; + + @TableField(exist = false) + private List shopIds; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesTimeShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesTimeShopMapper.java new file mode 100644 index 000000000..1630fe7c1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyFeesTimeShopMapper.java @@ -0,0 +1,23 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxEnergyFeesTimeShop; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxEnergyFeesTimeShopMapper extends CommonMapper { + + List findList(WxEnergyFeesTimeShop wxBillRent); + + Integer findCount(WxEnergyFeesTimeShop wxBillRent); + + WxEnergyFeesTimeShop selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void deleteByTimeId(@Param("timeId")Long timeId,@Param("tenantId")String tenantId); + + List findShopIdList(WxEnergyFeesTimeShop wxBillRent); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java index 9fe576084..883d7b2c7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java @@ -17,9 +17,5 @@ public interface WxEnergyMeterReadingMapper extends CommonMapper findBuildingSumMoney(WxEnergyMeterReading wxBillRent); - - List findFloorSumMoney(WxEnergyMeterReading wxBillRent); - void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java new file mode 100644 index 000000000..e156a986d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteShopMapper.java @@ -0,0 +1,19 @@ +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 { + + List findList(WxEnergyReadingCalcuteShop wxBillRent); + + List findShopIdList(WxEnergyReadingCalcuteShop wxBillRent); + + WxEnergyReadingCalcuteShop selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 3f7487fa4..0566c399f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -56,4 +56,6 @@ public interface WxShopMapper extends CommonMapper { * @return {@link List}<{@link CountShopByStatusDTO}> */ List countShopByStatus(@Param("tenantIds") List tenantIds); + + List findShopNumberList(WxShop wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index b70f525e5..d154fc428 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -21,6 +21,7 @@ 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.base.TenantEntity; /** */ @@ -44,7 +45,8 @@ public interface WxEnergyService { void saveOrUpdateTime(WxEnergyFeesTime record); WxEnergyFeesTime getFeesTimeById(WxEnergyFeesTime record); Map getTimeMap(WxEnergyFeesTime record); - void setTimeIsDel(WxEnergyFeesTime record); + void timeDel(WxEnergyFeesTime record); + List getTimeShopNumber(WxEnergyFeesTime record); //费用科目 PageInfo feesListAsPage(WxEnergyFees record, Integer pageIndex, Integer pageSize,boolean isSetOff); @@ -83,4 +85,6 @@ public interface WxEnergyService { void importReadingCalcute(MultipartFile mFile, MallUserInfo user, HttpServletRequest request, HttpServletResponse response); Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); + List getReadingCalcuteShopNumber(WxEnergyReadingCalcute record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 016c6282b..c06e81e43 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -116,5 +116,7 @@ public interface WxShopService { List getFloorBuildShopIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer shopDel) ; List getMerchantIds(WxShop wxShop); + + List getShopNumberList(WxShop wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 700d9b77b..54d572504 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -31,6 +31,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.BufferedInputStream; import java.io.File; @@ -61,6 +63,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Autowired WxEnergyFeesTimeMapper wxEnergyFeesTimeMapper; @Autowired + WxEnergyFeesTimeShopMapper wxEnergyFeesTimeShopMapper; + @Autowired WxEnergyFeesMapper wxEnergyFeesMapper; @Autowired WxEnergyFeesCalcuteShopMapper wxEnergyFeesCalcuteShopMapper; @@ -68,6 +72,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { WxEnergyFeesSetoffMapper wxEnergyFeesSetoffMapper; @Autowired WxEnergyReadingCalcuteMapper wxEnergyReadingCalcuteMapper; + @Autowired + WxEnergyReadingCalcuteShopMapper wxEnergyReadingCalcuteShopMapper; @Lazy @Autowired @@ -166,7 +172,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { record.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); aliasIds = record.getShopIds(); if (null == aliasIds || aliasIds.size() <= 0 ) { - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"请选择有效的店铺"); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"用户表类型,必须选择店铺"); } }else if (record.getPhysicsType() == EnumEnergyMeterPhysicsType.PUBLIC.getCode() || record.getPhysicsType() == EnumEnergyMeterPhysicsType.SUMMARY.getCode()) { List floorIds = record.getFloorIds(); @@ -263,16 +269,43 @@ public class WxEnergyServiceImpl implements WxEnergyService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyFeesTimeMapper.findList(record)); } + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override public void saveOrUpdateTime(WxEnergyFeesTime record) { + if (null == record.getShopIds() || record.getShopIds().size() <= 0 ) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"请选择店铺"); + } Date date = new Date(); if (record.getId() == null) { + + //查询是不是已经有了 + WxEnergyFeesTimeShop tsq = new WxEnergyFeesTimeShop(); + tsq.setPeriod(record.getPeriod()); + tsq.setShopIds(record.getShopIds()); + tsq.setType(record.getType()); + Integer scount = wxEnergyFeesTimeShopMapper.findCount(tsq); + if (null != scount && scount > 0 ) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"所选店铺已存在该年月的"+record.getTypeName()+"区间"); + } + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateTime(date); record.setUpdateTime(date); try { wxEnergyFeesTimeMapper.insert(record); + for (int i = 0 ; i < record.getShopIds().size(); i ++) { + Long shopId = record.getShopIds().get(i); + WxEnergyFeesTimeShop ts = new WxEnergyFeesTimeShop(); + ts.updateTenantInfo(record); + ts.setId(idWorker.nextId()); + ts.setTimeId(record.getId()); + ts.setShopId(shopId); + ts.setPeriod(record.getPeriod()); + ts.setType(record.getType()); + wxEnergyFeesTimeShopMapper.insert(ts); + } + } catch (Exception e) { logger.error("保存租赁账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -305,8 +338,25 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override - public void setTimeIsDel(WxEnergyFeesTime record) { - wxEnergyFeesTimeMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + public void timeDel(WxEnergyFeesTime record) { + //TODO 如果是已经有过计算的,不让删除 + wxEnergyFeesTimeMapper.deleteById(record.getId()); + wxEnergyFeesTimeShopMapper.deleteByTimeId(record.getId(),record.getTenantId()); + } + + @Override + public List getTimeShopNumber(WxEnergyFeesTime record) { + WxEnergyFeesTimeShop ts = new WxEnergyFeesTimeShop(); + ts.updateTenantInfo(record); + ts.setTimeId(record.getId()); + List shopIds = wxEnergyFeesTimeShopMapper.findShopIdList(ts); + if (null == shopIds || shopIds.size() <= 0 ) { + return null; + } + WxShop sq = new WxShop(); + sq.updateTenantInfo(record); + sq.setIds(shopIds); + return wxShopService.getShopNumberList(sq); } @@ -741,22 +791,16 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (null != page && null != page.getList()) { WxEnergyFeesTime tq = new WxEnergyFeesTime(); tq.updateTenantInfo(record); - Map timeMap = this.getTimeMap(tq); WxEnergyFees fq = new WxEnergyFees(); fq.updateTenantInfo(record); Map fessMap = this.getFeesMap(fq); for (int i = 0 ; i < page.getList().size(); i++) { WxEnergyReadingCalcute c = page.getList().get(i); - if (null != timeMap) { - WxEnergyFeesTime time = timeMap.get(c.getTimeId()); - if (null != time) { - c.setTimeName(time.getName()); - } - } if (null != fessMap) { WxEnergyFees fees = fessMap.get(c.getFeesId()); if (null != fees) { c.setFeesName(fees.getName()); + c.setFeesPhysicsTypeName(null); } } } @@ -806,37 +850,37 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public void exportReadingCalcute(WxEnergyReadingCalcute record, HttpServletRequest request, HttpServletResponse response) { - WxEnergyFeesTime tq = new WxEnergyFeesTime(); - tq.updateTenantInfo(record); - tq.setId(record.getTimeId()); - WxEnergyFeesTime time = this.getFeesTimeById(tq); - if (null == time) { - return; - } - - WxEnergyFees fq = new WxEnergyFees(); - fq.updateTenantInfo(record); - fq.setId(record.getFeesId()); - WxEnergyFees fees = this.getFeesById(fq); - if (null == fees) { - return; - } - - Map buildingMap = wxMallBuildingService.getBuildingMap(record); - Map floorMap = wxMallFloorService.getFloorMap(record); - - List> execlList = new ArrayList>(); - WxEnergyMeterReading rq = new WxEnergyMeterReading(); - rq.updateTenantInfo(record); - //rq.setTimeId(tq.getId()); - PageInfo 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(buildingMap, floorMap, time, fees, record)); - } - } - excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "科目抄表_"+time.getName()+"_"+fees.getName()+".xlsx","sheet1", response); +// WxEnergyFeesTime tq = new WxEnergyFeesTime(); +// tq.updateTenantInfo(record); +// tq.setId(record.getTimeId()); +// WxEnergyFeesTime time = this.getFeesTimeById(tq); +// if (null == time) { +// return; +// } +// +// WxEnergyFees fq = new WxEnergyFees(); +// fq.updateTenantInfo(record); +// fq.setId(record.getFeesId()); +// WxEnergyFees fees = this.getFeesById(fq); +// if (null == fees) { +// return; +// } +// +// Map buildingMap = wxMallBuildingService.getBuildingMap(record); +// Map floorMap = wxMallFloorService.getFloorMap(record); +// +// List> execlList = new ArrayList>(); +// WxEnergyMeterReading rq = new WxEnergyMeterReading(); +// rq.updateTenantInfo(record); +// //rq.setTimeId(tq.getId()); +// PageInfo 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(buildingMap, floorMap, time, fees, record)); +// } +// } +// excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "科目抄表_"+time.getName()+"_"+fees.getName()+".xlsx","sheet1", response); } private File handlerImportFile(MultipartFile mFile,String fileNamePre) { @@ -930,83 +974,83 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public void importReadingCalcute(MultipartFile mFile, MallUserInfo user, HttpServletRequest request, HttpServletResponse response) { - File file = handlerImportFile(mFile,"energyReading"); - // 需要验证 - Map excelTitle = WxEnergyMeterReading.generateExcelTitle(); - String[] needFields = new String[excelTitle.size()]; - int index = 0; - for (Iterator it = excelTitle.keySet().iterator(); it.hasNext();) { - String fi = excelTitle.get(it.next()); - needFields[index] = fi; - index = index + 1; - } - ExcelImportResult datalist = handleImportFile(file,Map.class,needFields,needFields,new ReadingExcelHandler()); - if (null == datalist) { - return ; - } - - List successList = datalist.getList(); - if(successList.size() > 0) { - boolean allSuccess = true; - String cuteId = (String)successList.get(0).get("编码"); - try { - successList.parallelStream().forEach(reading -> { - String id = (String) reading.get("抄表数据编码"); - WxEnergyMeterReading r = new WxEnergyMeterReading(); - r.updateTenantInfo(user); - r.setId(Long.parseLong(id)); - r.setPrice((String)reading.get("单价(*)")); - r.setCurNumber((String)reading.get("本次抄表数")); - 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; - } - if (StringUtils.isNotBlank(cuteId)) { - WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); - c.updateTenantInfo(user); - c.setId(Long.parseLong(cuteId)); - c.setIsImported(EnumYesOrNo.YES.getCode()); - c.setUpdateTime(new Date()); - c.setUpdateBy(user.getId()); - c.setUpdateByName(user.getName()); - if (allSuccess) { - c.setImportSuccess(EnumYesOrNo.YES.getCode()); - }else { - c.setImportSuccess(EnumYesOrNo.NO.getCode()); - } - wxEnergyReadingCalcuteMapper.updateById(c); - } - - } +// File file = handlerImportFile(mFile,"energyReading"); +// // 需要验证 +// Map excelTitle = WxEnergyMeterReading.generateExcelTitle(); +// String[] needFields = new String[excelTitle.size()]; +// int index = 0; +// for (Iterator it = excelTitle.keySet().iterator(); it.hasNext();) { +// String fi = excelTitle.get(it.next()); +// needFields[index] = fi; +// index = index + 1; +// } +// ExcelImportResult datalist = handleImportFile(file,Map.class,needFields,needFields,new ReadingExcelHandler()); +// if (null == datalist) { +// return ; +// } +// +// List successList = datalist.getList(); +// if(successList.size() > 0) { +// boolean allSuccess = true; +// String cuteId = (String)successList.get(0).get("编码"); +// try { +// successList.parallelStream().forEach(reading -> { +// String id = (String) reading.get("抄表数据编码"); +// WxEnergyMeterReading r = new WxEnergyMeterReading(); +// r.updateTenantInfo(user); +// r.setId(Long.parseLong(id)); +// r.setPrice((String)reading.get("单价(*)")); +// r.setCurNumber((String)reading.get("本次抄表数")); +// 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; +// } +// if (StringUtils.isNotBlank(cuteId)) { +// WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); +// c.updateTenantInfo(user); +// c.setId(Long.parseLong(cuteId)); +// c.setIsImported(EnumYesOrNo.YES.getCode()); +// c.setUpdateTime(new Date()); +// c.setUpdateBy(user.getId()); +// c.setUpdateByName(user.getName()); +// if (allSuccess) { +// c.setImportSuccess(EnumYesOrNo.YES.getCode()); +// }else { +// c.setImportSuccess(EnumYesOrNo.NO.getCode()); +// } +// wxEnergyReadingCalcuteMapper.updateById(c); +// } +// +// } } private Map getFloorBuildingMoney(WxEnergyMeterReading reading,boolean isFloor) { - List list = null; - if (isFloor) { - list = wxEnergyMeterReadingMapper.findFloorSumMoney(reading); - }else { - wxEnergyMeterReadingMapper.findBuildingSumMoney(reading); - } - - if (null != list && list.size() > 0 ) { - Map buildinMap = new HashMap(); - for (int i = 0 ; i < list.size() ; i++) { - Map bup = list.get(i); - BigDecimal are = (BigDecimal)bup.get("money"); - if (null != are) { - buildinMap.put((Long)bup.get("building_id"), are.toPlainString()); - }else { - buildinMap.put((Long)bup.get("building_id"), "0"); - } - - } - return buildinMap; - } +// List list = null; +// if (isFloor) { +// list = wxEnergyMeterReadingMapper.findFloorSumMoney(reading); +// }else { +// wxEnergyMeterReadingMapper.findBuildingSumMoney(reading); +// } +// +// if (null != list && list.size() > 0 ) { +// Map buildinMap = new HashMap(); +// for (int i = 0 ; i < list.size() ; i++) { +// Map bup = list.get(i); +// BigDecimal are = (BigDecimal)bup.get("money"); +// if (null != are) { +// buildinMap.put((Long)bup.get("building_id"), are.toPlainString()); +// }else { +// buildinMap.put((Long)bup.get("building_id"), "0"); +// } +// +// } +// return buildinMap; +// } return null; } @@ -1219,4 +1263,19 @@ public class WxEnergyServiceImpl implements WxEnergyService { wxEnergyReadingCalcuteMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); } + @Override + public List getReadingCalcuteShopNumber(WxEnergyReadingCalcute record) { + WxEnergyReadingCalcuteShop ts = new WxEnergyReadingCalcuteShop(); + ts.updateTenantInfo(record); + ts.setCalcuteId(record.getId()); + List shopIds = wxEnergyReadingCalcuteShopMapper.findShopIdList(ts); + if (null == shopIds || shopIds.size() <= 0 ) { + return null; + } + WxShop sq = new WxShop(); + sq.updateTenantInfo(record); + sq.setIds(shopIds); + return wxShopService.getShopNumberList(sq); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 3eaa0dfdf..e89dbece1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -798,4 +798,9 @@ public class WxShopServiceImpl implements WxShopService { merchantShopQ.setShopIdList(shopIds); return wxMerchantShopMapper.findMerchantIdList(merchantShopQ); } + + @Override + public List getShopNumberList(WxShop wxShop) { + return wxShopMapper.findShopNumberList(wxShop); + } } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml index 6e0b9dac1..646248a6e 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml @@ -7,15 +7,15 @@ - - + + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`start_time`,`end_time` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`type`,`start_time`,`end_time`,`period`,`shop_size` @@ -27,9 +27,10 @@ and `parent_tenant_id` = #{parentTenantId} - and `is_del` = #{isDel} + + and `period` = #{period} + and `type` = #{type} - and name like concat('%', #{name},'%') and id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeShopMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeShopMapper.xml new file mode 100644 index 000000000..e248f4f2d --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeShopMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`period`,`time_id`,`shop_id`,`type` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + and `period` = #{period} + + and `type` = #{type} + and `time_id` = #{timeId} + and `shop_id` = #{shopId} + + and shop_id in + + #{sidItem} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + delete from wx_energy_fees_time_shop where `tenant_id` = #{tenantId} and `time_id` = #{timeId} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml index afe14a882..f81736315 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml @@ -81,20 +81,6 @@ - - - - update wx_energy_meter_reading set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml index 2b59144ec..72662ad38 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml @@ -11,12 +11,10 @@ - - + + - - @@ -24,7 +22,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`time_id`,`fees_id`,`is_calcuted`,`is_imported`,`import_success`,`calcute_success`,`is_del`,`shop_size` + `update_by`,`update_by_name`,`remark`,`period`,`fees_id`,`is_calcuted`,`calcute_success`,`is_del`,`shop_size` @@ -36,14 +34,20 @@ and `parent_tenant_id` = #{parentTenantId} + + and `period` = #{period} + and `create_by` = #{createBy} - and `time_id` = #{timeId} and `fees_id` = #{feesId} and `is_calcuted` = #{isCalcuted} - and `is_imported` = #{isImported} - and `import_success` = #{importSuccess} and `calcute_success` = #{calcuteSuccess} - and `is_del` = #{isDel} + and `is_del` = #{isDel} + + and fees_id in + + #{fidItem} + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteShopMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteShopMapper.xml new file mode 100644 index 000000000..bc390a463 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteShopMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`shop_id` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `calcute_id` = #{calcuteId} + and `shop_id` = #{shopId} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 272bbd252..b14ab3b73 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -677,5 +677,10 @@ GROUP BY `status`; + +