网格开通情况bug修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -160,13 +160,13 @@
         SELECT
         user.DEPT_ID gridId,
         COUNT(user.ID) AS registerCount,
-        COUNT(user.PARTY_FLAG ='0' OR NULL) AS residentCount ,
+        COUNT(user.PARTY_FLAG ='0' and user.state !='0'  OR NULL) AS residentCount ,
         COUNT(user.PARTY_FLAG ='1' OR NULL) AS partyCount
         FROM
         (
-        select newuu.ID,newuu.DEPT_ID,newuu.PARTY_FLAG from (
+        select newuu.ID,newuu.DEPT_ID,newuu.PARTY_FLAG,newuu.STATE from (
         SELECT
-        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,PARTY_FLAG,REGISTER_TIME,
+        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,PARTY_FLAG,REGISTER_TIME,STATE,
         ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
             SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
             WHERE DEL_FLAG = '0' AND USER_ID = uu.ID