Browse Source

message:

dev_power_axis
HAHA 3 years ago
parent
commit
a6848136d4
  1. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
  2. 3
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java

@ -140,7 +140,7 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
// 需要绑定的房屋ID集合 // 需要绑定的房屋ID集合
List<String> houseIdList = form.getHouseIdList(); List<String> houseIdList = form.getHouseIdList();
// 查询已绑定的houseId集合 // 查询已绑定的houseId集合
List<String> existHouseIdList = baseDao.queryHouseIdList(houseIdList, form.getAxisStructId(), customerId); List<String> existHouseIdList = baseDao.queryHouseIdList(houseIdList, customerId, form.getAxisStructId());
// 倒序,取差集 // 倒序,取差集
for (int i = houseIdList.size() - 1; i >= 0; i--) { for (int i = houseIdList.size() - 1; i >= 0; i--) {
if (existHouseIdList.contains(houseIdList.get(i))) { if (existHouseIdList.contains(houseIdList.get(i))) {

3
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

@ -95,6 +95,7 @@
pli_power_kernel_household pli_power_kernel_household
<where> <where>
del_flag = '0' del_flag = '0'
AND customer_id = #{customerId}
<if test="houseIdList != null and houseIdList.size() > 0"> <if test="houseIdList != null and houseIdList.size() > 0">
and house_id in and house_id in
<foreach collection="houseIdList" item="houseId" open="(" close=")" separator=","> <foreach collection="houseIdList" item="houseId" open="(" close=")" separator=",">
@ -103,8 +104,6 @@
</if> </if>
AND AND
STRUCT_REFERENCE_ID = #{axisStructId} STRUCT_REFERENCE_ID = #{axisStructId}
AND
customer_id = #{customerId}
</where> </where>
</select> </select>
<select id="queryIds" resultType="java.lang.String"> <select id="queryIds" resultType="java.lang.String">

Loading…
Cancel
Save