diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java index 39de19c94..44009f8cd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java @@ -13,6 +13,8 @@ public interface WxEnergyReadingCalcuteResultMapper extends CommonMapper findList(WxEnergyReadingCalcuteResult wxBillRent); List findShopIdList(WxEnergyReadingCalcuteResult wxBillRent); + + List findCalcuteIdList(WxEnergyReadingCalcuteResult wxBillRent); WxEnergyReadingCalcuteResult selectById(@Param("id")Long id,@Param("tenantId")String tenantId); 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 89dccaeec..08145097e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -1009,6 +1009,17 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public List findCalcuteList(WxEnergyReadingCalcute record) { + if (null != record.getShopIds() && record.getShopIds().size() > 0 ) { + WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); + crq.updateTenantInfo(record); + crq.setShopIds(record.getShopIds()); + List calIds = wxEnergyReadingCalcuteResultMapper.findCalcuteIdList(crq); + if (null == calIds || calIds.size() <= 0 ) { + record.setId(-1L); + }else { + record.setIds(calIds); + } + } return wxEnergyReadingCalcuteMapper.findList(record); } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml index c048ccfda..177560886 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml @@ -77,6 +77,12 @@ + + INSERT INTO wx_energy_reading_calcute_result (