修改数据统计流动 常住

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2221,10 +2221,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         AtomicInteger ldUserTotal = new AtomicInteger();
         list.forEach(l -> {
             userTotal.addAndGet(l.getNum());
-            if ("0".equals(l.getIsFloating())) {
-                czUserTotal.addAndGet(l.getNum());
-            } else {
+            if ("liudongrenkou".equals(l.getIsFloating())) {
                 ldUserTotal.addAndGet(l.getNum());
+            } else {
+                czUserTotal.addAndGet(l.getNum());
             }
         });
         resultDTO.setUserTotal(userTotal.get());

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -1171,7 +1171,7 @@
     <select id="userChart" resultType="com.epmet.dto.result.UserChartResultDTO">
         SELECT
             COUNT(id) num,
-            is_floating isFloating
+            populationType isFloating
         FROM
             ic_resi_user
         WHERE
@@ -1198,7 +1198,7 @@
                 AND village_id = #{orgId}
             </otherwise>
         </choose>
-        GROUP BY is_floating
+        GROUP BY populationType
     </select>
     <select id="getResiUserGroupHomeId" resultMap="homeMemberList">
         SELECT