From 97537270cdfc939044bf4e9245c13a1890bd09e9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 20 Jul 2022 10:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=8F=98=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=20=E6=88=BF=E5=B1=8B=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E4=BA=BA=E5=9D=87=E6=94=B6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcHouseDao.java           | 4 +++-
 .../java/com/epmet/service/impl/IcHouseServiceImpl.java   | 8 +++++++-
 .../src/main/resources/mapper/IcHouseDao.xml              | 4 +++-
 .../src/main/java/com/epmet/dao/IcResiUserDao.java        | 2 +-
 .../epmet/service/impl/IcResiUserDataSyncServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/IcResiUserDao.xml           | 6 +++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index 35abf9d798..ac4eba65fd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -9,6 +9,7 @@ import com.epmet.entity.IcHouseEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Set;
 
@@ -178,9 +179,10 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      *
      * @param houseId,
      * @param resiNumber
+     * @param avgYsrD
      * @return
      */
-    int updateIcHouseResiNumber(String houseId, Integer resiNumber);
+    int updateIcHouseResiNumber(String houseId, Integer resiNumber, BigDecimal avgYsrD);
 
     /**
      * @return com.epmet.entity.IcHouseEntity
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 98e340221c..8b584871e7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -43,6 +43,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -301,10 +302,15 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         paramList.forEach(o -> {
             Object houseId = o.get("houseId");
             Object resiNumber = o.get("resiNumber");
+            Object avgYsr = o.get("avgYsr");
             if (houseId == null || resiNumber == null) {
                 return;
             }
-            int i = baseDao.updateIcHouseResiNumber(houseId.toString(), Integer.valueOf(resiNumber.toString()));
+            BigDecimal avgYsrD = null;
+            if (avgYsr != null){
+                avgYsrD = new BigDecimal(avgYsr.toString());
+            }
+            int i = baseDao.updateIcHouseResiNumber(houseId.toString(), Integer.valueOf(resiNumber.toString()), avgYsrD);
             effects.getAndAdd(i);
         });
         log.debug("updateIcHouseResiNumber effectRow:{}", effects.intValue());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index ac7c0fc342..8756c9ea8d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -526,7 +526,9 @@
     </select>
 
     <update id="updateIcHouseResiNumber">
-        UPDATE ic_house SET RESI_NUMBER = #{resiNumber}, UPDATED_TIME = NOW() where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0'
+        UPDATE ic_house
+        SET RESI_NUMBER = #{resiNumber}, AVG_YSR = #{avgYsrD}, UPDATED_TIME = NOW()
+        where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0'
     </update>
 
     <select id="selectByCoding" resultType="com.epmet.entity.IcHouseEntity">
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 4dcf2a8537..ae94fe4ec2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -403,7 +403,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<IcResiUserDTO> getListIcResiUserDTO(@Param("icResiUserIdList") List<String> icResiUserIdList);
 
     /**
-     * desc:获取客户内 每个房屋内的居民数
+     * desc:获取客户内 每个房屋内的居民数和人均收入
      *
      * @param customerId
      * @return
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java
index 95c5f97e34..0c60a4e2ad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java
@@ -42,13 +42,13 @@ public class IcResiUserDataSyncServiceImpl implements IcResiUserDataSyncService
             statsResiWarnService.resiWarn(customerId);
         } catch (Exception e) {
             flag = false;
-            log.error("icDataSyncTask resiWarn exception:{}", e.getMessage(), customerId);
+            log.error("icDataSyncTask resiWarn exception,msg:{},customerId:{}", e.getMessage(), customerId);
         }
         try {
             icResiUserService.updateIcHouseResiNumber(customerId);
         } catch (Exception e) {
             flag = false;
-            log.error("icDataSyncTask updateIcHouseResiNumber exception:{}", e.getMessage(), customerId);
+            log.error("icDataSyncTask updateIcHouseResiNumber exception,msg:{},customerId:{}", e.getMessage(), customerId);
         }
         return flag;
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index c71227da0d..a847f52c41 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1186,7 +1186,11 @@
             AND DEL_FLAG = '0'
     </select>
     <select id="getResiUserCountGroupHomeId" resultType="java.util.Map">
-        select HOME_ID houseId,count(1) resiNumber from ic_resi_user WHERE CUSTOMER_ID = #{customerId} and DEL_FLAG = '0'  AND `status` = '0' group by HOME_ID
+        select
+            HOME_ID houseId,
+            count(1) resiNumber,
+	        AVG(YSR) avgYsr
+        from ic_resi_user WHERE CUSTOMER_ID = #{customerId} and DEL_FLAG = '0'  AND `status` = '0' group by HOME_ID
     </select>
 
     <select id="getListIcResiUserDTO" parameterType="map" resultType="com.epmet.dto.IcResiUserDTO">