From 96d5cf8f1c649b6ad10b96d437e1098aebacb6af Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Jun 2020 15:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/impl/UserAnalysisServiceImpl.java    | 27 +++++++++++++++++--
 .../resources/mapper/user/UserAnalysisDao.xml |  2 ++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
index 677668e0c5..8a4e5924e9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
@@ -136,6 +136,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                 if(dimInitResultDto.getAgencyId().equals(userSubAgencyResDTO.getAgencyId())){
                     flag=true;
                     //居民、热心居民、党员总数，用于排序
+                    if(null==userSubAgencyResDTO.getPartymemberTotal()){
+                        userSubAgencyResDTO.setPartymemberTotal(0);
+                    }
+                    if(null==userSubAgencyResDTO.getWarmHeartedTotal()){
+                        userSubAgencyResDTO.setWarmHeartedTotal(0);
+                    }
+                    if(null==userSubAgencyResDTO.getResiTotal()){
+                        userSubAgencyResDTO.setResiTotal(0);
+                    }
                     dimInitResultDto.setTotal(userSubAgencyResDTO.getPartymemberTotal()
                             +userSubAgencyResDTO.getWarmHeartedTotal()
                             +userSubAgencyResDTO.getResiTotal());
@@ -152,6 +161,8 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                         default:
                             break;
                     }
+                    logger.info(String.format("找到当前机关(agencyId=%s,agencyName=%s)对应的数据，当前循环",dimInitResultDto.getAgencyId(),dimInitResultDto.getName()));
+                    break;
                 }
             }
             if(!flag){
@@ -229,6 +240,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                 if(dimInitResultDto.getGridId().equals(userSubGridResDTO.getGridId())){
                     flag=true;
                     //居民、热心居民、党员总数，用于排序
+                    if(null==userSubGridResDTO.getPartymemberTotal()){
+                        userSubGridResDTO.setPartymemberTotal(0);
+                    }
+                    if(null==userSubGridResDTO.getWarmHeartedTotal()){
+                        userSubGridResDTO.setWarmHeartedTotal(0);
+                    }
+                    if(null==userSubGridResDTO.getResiTotal()){
+                        userSubGridResDTO.setResiTotal(0);
+                    }
                     dimInitResultDto.setTotal(userSubGridResDTO.getPartymemberTotal()
                             +userSubGridResDTO.getWarmHeartedTotal()
                             +userSubGridResDTO.getResiTotal());
@@ -246,6 +266,8 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                             break;
                     }
                 }
+                logger.info(String.format("找到当前网格(gridId=%s,gridName=%s)对应的数据，当前循环",dimInitResultDto.getGridId(),dimInitResultDto.getName()));
+                break;
             }
             if(!flag){
                 logger.error(String.format("直属网格注册用户数缺少记录:date_id=%s,gridId=%s",formDTO.getDateId(),dimInitResultDto.getGridId()));
@@ -341,7 +363,8 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                         default:
                             break;
                     }
-
+                    logger.info(String.format("找到当前日期(dateorMonthId=%s)对应的数据，跳出当前循环",dim.getDateOrMonthId()));
+                    break;
                 }
             }
             if(!flag){
@@ -382,7 +405,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             }
         }else if(UserAnalysisConstant.MONTH_TYPE.equals(type)){
             List<String> monthList= DateUtils.getMonthBetween(DateUtils.getBeforeNMonth(12),
-                    DateUtils.getBeforeNMonth(1));
+                    DateUtils.getBeforeNMonth(0));
             for(String monthId:monthList){
                 String date=DateUtils.getxAxisDatePattern(monthId,"/");
                 //居民
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 6f559931fb..0d593b8379 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -92,6 +92,7 @@
                 )
         WHERE da.DEL_FLAG = '0'
             AND da.PID =#{agencyId}
+            and da.AGENCY_DIM_TYPE='all'
             order by m.REG_TOTAL desc
     </select>
 
@@ -113,6 +114,7 @@
                 )
         WHERE da.DEL_FLAG = '0'
             AND da.PID =#{agencyId}
+            and da.AGENCY_DIM_TYPE='all'
             order by m.REG_TOTAL desc
     </select>