Merge remote-tracking branch 'origin/feature/statistical_zhy' into feature/statistical_zhy

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

@@ -152,11 +152,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
                 dto.setHouseSelfCount(houseOptional.get().getHouseSelfCount());
                 dto.setHouseLeaseCount(houseOptional.get().getHouseLeaseCount());
                 dto.setHouseIdleCount(houseOptional.get().getHouseIdleCount());
+                dto.setHouseIncr(houseOptional.get().getHouseIncr());
+                dto.setHouseModify(houseOptional.get().getHouseModify());
             } else {
                 dto.setHouseCount(NumConstant.ZERO);
                 dto.setHouseSelfCount(NumConstant.ZERO);
                 dto.setHouseLeaseCount(NumConstant.ZERO);
                 dto.setHouseIdleCount(NumConstant.ZERO);
+                dto.setHouseIncr(NumConstant.ZERO);
+                dto.setHouseModify(NumConstant.ZERO);
             }
 
             Optional<FactUserHouseResultDTO> userOptional = userList.stream().filter(user -> gridId.equals(user.getGridId()) && customerId.equals(user.getCustomerId())).findFirst();
@@ -164,10 +168,14 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
                 dto.setUserCount(userOptional.get().getUserCount());
                 dto.setUserResiCount(userOptional.get().getUserResiCount());
                 dto.setUserFloatCount(userOptional.get().getUserFloatCount());
+                dto.setUserIncr(userOptional.get().getUserIncr());
+                dto.setUserModify(userOptional.get().getUserModify());
             } else {
                 dto.setUserCount(NumConstant.ZERO);
                 dto.setUserResiCount(NumConstant.ZERO);
                 dto.setUserFloatCount(NumConstant.ZERO);
+                dto.setUserIncr(NumConstant.ZERO);
+                dto.setUserModify(NumConstant.ZERO);
             }
             addList.add(dto);
         });

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

@@ -13,8 +13,8 @@
         sum( CASE WHEN t.RENT_FLAG = '1' THEN 1 ELSE 0 END ) AS houseLeaseCount,
         sum( CASE WHEN t.RENT_FLAG = '2' THEN 1 ELSE 0 END ) AS houseIdleCount,
         sum( CASE WHEN t.id IS NOT NULL THEN 1 ELSE 0 END ) AS houseCount,
-        sum( CASE WHEN (t.id IS NOT NULL and DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseIncr,
-        sum( CASE WHEN (t.id IS NOT NULL and DATE_FORMAT(t.UPDATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseModify
+        sum( CASE WHEN (t.id IS NOT NULL and DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY ),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseIncr,
+        sum( CASE WHEN (t.id IS NOT NULL and DATE_FORMAT(t.UPDATED_TIME,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY ),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS houseModify
         FROM
         customer_grid g
         LEFT JOIN (

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

@@ -10,8 +10,8 @@
             sum( CASE WHEN IS_FLOATING = '0' THEN 1 ELSE 0 END ) AS userResiCount,
             sum( CASE WHEN IS_FLOATING = '1' THEN 1 ELSE 0 END ) AS userFloatCount,
             sum( CASE WHEN id IS NOT NULL THEN 1 ELSE 0 END ) AS userCount,
-            sum( CASE WHEN (id IS NOT NULL and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS userIncr,
-            sum( CASE WHEN (id IS NOT NULL and DATE_FORMAT(UPDATED_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS userModify
+            sum( CASE WHEN (id IS NOT NULL and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY ),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS userIncr,
+            sum( CASE WHEN (id IS NOT NULL and DATE_FORMAT(UPDATED_TIME,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY ),'%Y-%m-%d')) THEN 1 ELSE 0 END ) AS userModify
         FROM
             ic_resi_user
         WHERE