From dbaa1dc45f9ae6cb6b33c3a81f5ea6aa5f8c193d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Sat, 23 May 2020 13:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E8=AE=A4=E8=AF=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9=E3=80=91-=E6=9D=8E?=
 =?UTF-8?q?=E9=B9=8F=E9=A3=9E-20200523?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 75 +++++++++++--------
 .../epdc/service/impl/UserServiceImpl.java    |  1 +
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 0b12db6d2..73bee0d76 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -142,7 +142,7 @@
         SELECT
             GRID_ID AS gridId,
             COUNT( STATE = 0 OR NULL)+COUNT( STATE = 5 OR NULL)+COUNT( STATE = 10 OR NULL) AS itemCount,
-            COUNT( STATE = '10' OR STATE = '5' OR NULL ) AS itemCloseCount,
+            COUNT( (STATE = '10' OR STATE = '5') OR NULL ) AS itemCloseCount,
             COUNT((EVALUATION_SCORE != '0'
                 <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                     AND DATE_FORMAT(EVALUATION_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
@@ -518,11 +518,25 @@
     <!--运营导出数据相关-->
     <select id="selectExportUserCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO" parameterType="com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO">
         select
-        tab.streetName,
-        (tab.userTotal - tab.partyCount) as registerCount,
-        tab.partyCount
-        from (
+        tt.name as streetName,
+        (ifnull(tab.userTotal,0) - ifnull(tab.partyCount,0)) as registerCount,
+        ifnull(tab.partyCount,0) as partyCount
+        from
+        (
         SELECT
+        ad.id,
+        ad.`name`,
+        ad.pid
+        FROM
+        esua_epdc_admin.sys_dept ad
+        WHERE
+        ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+        AND ad.del_flag = 0
+        ) tt
+        left join
+        (
+        SELECT
+        t0.id,
         t0.`name` streetName,
         count(uu.id) userTotal,
         count((HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '1') or null ) AS partyCount
@@ -580,6 +594,9 @@
         t0.id
         ORDER BY
         t0.id ASC) tab
+        on tt.id = tab.id
+        ORDER BY
+        tt.id ASC
     </select>
 
     <select id="selectExportunAuthorizedCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
@@ -688,7 +705,7 @@
         SELECT
             t0.`name` streetName,
             COUNT( STATE = 0 OR NULL)+COUNT( STATE = 5 OR NULL)+COUNT( STATE = 10 OR NULL) AS itemCount,
-            COUNT( STATE = '10'  OR NULL ) AS itemCloseCount
+            COUNT( (STATE = '10' OR STATE = '5' ) OR NULL  ) AS itemCloseCount
         FROM
             (
             SELECT
@@ -714,6 +731,9 @@
         <if test="endTime != null and endTime != ''">
             AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>
+        <if test="operationEndTime != null and operationEndTime != ''">
+            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{operationEndTime}
+        </if>
         GROUP BY ITEM_ID
         ) maxitem ON maxitem.ITEM_ID = item.ID
         LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
@@ -759,6 +779,12 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         LEFT JOIN esua_epdc_group.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID
         AND ugp.DEL_FLAG = '0'
         AND ugp.LORD_FLAG = '1'
@@ -768,14 +794,7 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(ugp.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
-        where
-        1=1
-        <if test="deptIdList != null and deptIdList.size() > 0">
-            AND epgr.GRID_ID in
-            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
-                #{deptId}
-            </foreach>
-        </if>
+
         GROUP BY
             t0.id
         ORDER BY
@@ -816,6 +835,12 @@
         epgr.STATE = '10'
         OR epgr.STATE = '15'
         )
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id
         AND ug.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
@@ -824,14 +849,6 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
-        where
-        1=1
-        <if test="deptIdList != null and deptIdList.size() > 0">
-            AND epgr.GRID_ID in
-            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
-                #{deptId}
-            </foreach>
-        </if>
         GROUP BY
         epgr.GRID_ID,
         t0.id
@@ -871,6 +888,12 @@
         </if>
         OR epgr.STATE = '15'
         )
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND epgr.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id
         AND ug.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
@@ -879,14 +902,6 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
-        where
-        1=1
-        <if test="deptIdList != null and deptIdList.size() > 0">
-            AND epgr.GRID_ID in
-            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
-                #{deptId}
-            </foreach>
-        </if>
         GROUP BY
         t0.id
         ORDER BY
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index da189f0b0..f5fdeb303 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1003,6 +1003,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO userDto = this.get(formDTO.getUserId());
         if (null != userDto) {
             userDto.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy
+            userDto.setPartyFlag(NumConstant.ZERO_STR);
             if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过
                 userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
             } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过