更新房屋内居民数据

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -10,7 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -175,11 +174,11 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<IcHouseListResultDTO> searchHouseZipList(IcHouseListFormDTO formDTO);
 
     /**
-     * desc:更新房屋的屋内居民数
+     * desc:更新房屋的屋内居民数 不更新 更新时间和更新人以及 resiNumber没有变化的 记录
      *
-     * @param paramList houseId:'123',resiNumber:20
+     * @param  houseId,
+     * @param resiNumber
      * @return
      */
-    Integer updateIcHouseResiNumber(@Param("paramList") List<Map<String, Object>> paramList);
+    int updateIcHouseResiNumber(String houseId, Integer resiNumber);
-
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -1,7 +1,6 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -296,28 +295,19 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     public Integer updateIcHouseResiNumber(List<Map<String, Object>> paramList) {
         if (CollectionUtils.isEmpty(paramList)) {
             log.warn("updateIcHouseResiNumber param is empty");
-            return 0;
+            return NumConstant.ZERO;
         }
-        IcHouseEntity entity = new IcHouseEntity();
+        AtomicInteger effects = new AtomicInteger();
-
-        AtomicInteger effects = new AtomicInteger(0);
-        LambdaUpdateWrapper<IcHouseEntity> updateWrapper = new LambdaUpdateWrapper();
         paramList.forEach(o -> {
             Object houseId = o.get("houseId");
             Object resiNumber = o.get("resiNumber");
             if (houseId == null || resiNumber == null) {
                 return;
             }
-            Integer resiNumber1 = Integer.valueOf(resiNumber.toString());
+            int i = baseDao.updateIcHouseResiNumber(houseId.toString(), Integer.valueOf(resiNumber.toString()));
-            entity.setResiNumber(resiNumber1);
+            effects.getAndAdd(i);
-            entity.setUpdatedTime(new Date());
-            updateWrapper.eq(IcHouseEntity::getId, houseId.toString())
-                    .ne(IcHouseEntity::getResiNumber, resiNumber1);
-            int i = baseDao.update(entity, updateWrapper);
-            effects.incrementAndGet();
         });
         log.debug("updateIcHouseResiNumber effectRow:{}", effects.intValue());
-        return effects.get();
+        return effects.intValue();
-       // return baseDao.updateIcHouseResiNumber(paramList);
     }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -523,9 +523,7 @@
             )
     </select>
     <update id="updateIcHouseResiNumber">
-        <foreach collection="paramList" separator=";" item="item" >
+        UPDATE ic_house SET RESI_NUMBER = #{resiNumber} where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0'
-            UPDATE ic_house SET RESI_NUMBER = #{item.resiNumber} where ID = #{item.houseId} and DEL_FLAG = '0'
-        </foreach>
     </update>
 
 </mapper>