From d8a8ee44b1d5f12f352026323e27ca1ef3fc8190 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 30 Nov 2021 18:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=8A=E6=8A=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=201=E3=80=81=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=BF=A1=E6=81=AF=202=E3=80=81=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=92=8C=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BA=BA=E6=95=B0=E5=AF=B9=E5=BA=94=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B7=E6=9D=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/result/UploadProjectInfoDTO.java   |   5 +-
 .../mapper/screen/ScreenProjectDataDao.xml    |   2 +
 .../mapper/screen/ScreenPublicDataDao.xml     | 104 +++++++++++-------
 3 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
index a9ecd255..848adbe9 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
@@ -118,6 +118,9 @@ public class UploadProjectInfoDTO  implements Serializable {
      */
     private Integer satisfactionScore;
 
-
+    /**
+     * 项目创建人ID
+     */
+    private String projectCreator;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 25d95bc1..d209cce8 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -22,6 +22,7 @@
         <result property="categoryCode" column="categoryCode"/>
         <result property="closeCaseTime" column="closeCaseTime"/>
         <result property="projectLevel" column="projectLevel"/>
+        <result property="projectCreator" column="projectCreator"/>
         <result property="satisfactionScore" column="satisfactionScore"/>
         <collection property="projectImgUrl" ofType="java.lang.String">
             <result property="projectImgUrl" column="projectImgUrl"/>
@@ -35,6 +36,7 @@
            SUBSTRING_INDEX(t1.PARENT_DEPT_IDS,',',-1) as parentId,
            PARENT_DEPT_IDS as allParentIds,
            t1.ID as projectId,
+           t1.CREATED_BY as projectCreator,
            t1.NICK_NAME as linkName,
            t1.MOBILE as linkMobile,
            LEFT(t1.ITEM_CONTENT,50)projectTitle,
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 3fccfd47..9ab010d4 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -2018,15 +2018,21 @@ SELECT gr.id as orgId,
 						sum(total.topicTotal) as topicTotal,
 						sum(total.projectTotal) as projectTotal
 			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as regUserTotal,
-						0 AS joinUser,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
+			(select tmp1.DEPT_ID AS GRID_ID,
+                    count(tmp1.id)  as regUserTotal,
+                    0 AS joinUser,
+                    0 as issueTotal,
+                    0 as topicTotal,
+                    0 as projectTotal
+             from
+                 (SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE  eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
+                                                                                                                                                                       (SELECT tt.user_id,
+                                                                                                                                                                               tt.grid_id
+                                                                                                                                                                        FROM(
+                                                                                                                                                                                SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
+                                                                                                                                                                                FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
+                                                                                                                                                                                ORDER BY `CREATED_TIME`)  tt
+                                                                                                                                                                        GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
 		union all
 
 			select          be.DEPT_ID GRID_ID,
@@ -2135,7 +2141,7 @@ SELECT gr.id as orgId,
 					and gr.type_key='grid_party'
 					AND gr.`id` NOT IN( SELECT t.`dept_id`
             FROM `esua_epdc_admin`.`sys_dept_config` t
-            WHERE t.`del_flag`= 0)
+            WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
     </select>
     <!-- 009 -->
     <select id="getGovernrankdata" resultType="com.elink.esua.epdc.dto.screen.result.GovernrankdataResultDTO">
@@ -2392,15 +2398,21 @@ SELECT gr.id as orgId,
 						 sum(total.topicTotal) as topicTotal,
 						 sum(total.projectTotal) as projectTotal
 			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as regUserTotal,
-						0 AS joinUser,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
+			(select tmp1.DEPT_ID AS GRID_ID,
+                    count(tmp1.id)  as regUserTotal,
+                    0 AS joinUser,
+                    0 as issueTotal,
+                    0 as topicTotal,
+                    0 as projectTotal
+             from
+                 (SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE  eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
+                                                                                                                                                                       (SELECT tt.user_id,
+                                                                                                                                                                               tt.grid_id
+                                                                                                                                                                        FROM(
+                                                                                                                                                                                SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
+                                                                                                                                                                                FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
+                                                                                                                                                                                ORDER BY `CREATED_TIME`)  tt
+                                                                                                                                                                        GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
 
 		union all
 
@@ -2510,7 +2522,7 @@ SELECT gr.id as orgId,
 					and co.type_key='community_party'
 					AND co.`id` NOT IN( SELECT t.`dept_id`
             FROM `esua_epdc_admin`.`sys_dept_config` t
-            WHERE t.`del_flag`= 0)
+            WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
 		GROUP BY co.id
     </select>
     <select id="publicpartitotaldataForStreetParty"
@@ -2537,15 +2549,21 @@ SELECT gr.id as orgId,
 						 sum(total.topicTotal) as topicTotal,
 						 sum(total.projectTotal) as projectTotal
 			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as regUserTotal,
-						0 AS joinUser,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
+			(select tmp1.DEPT_ID AS GRID_ID,
+                    count(tmp1.id)  as regUserTotal,
+                    0 AS joinUser,
+                    0 as issueTotal,
+                    0 as topicTotal,
+                    0 as projectTotal
+             from
+                 (SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE  eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
+                                                                                                                                                                       (SELECT tt.user_id,
+                                                                                                                                                                               tt.grid_id
+                                                                                                                                                                        FROM(
+                                                                                                                                                                                SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
+                                                                                                                                                                                FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
+                                                                                                                                                                                ORDER BY `CREATED_TIME`)  tt
+                                                                                                                                                                        GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
 
 		UNION ALL
 
@@ -2656,7 +2674,7 @@ SELECT gr.id as orgId,
 					and st.type_key='street_party'
 					AND st.`id` NOT IN( SELECT t.`dept_id`
             FROM `esua_epdc_admin`.`sys_dept_config` t
-            WHERE t.`del_flag`= 0)
+            WHERE t.`del_flag`= 0  AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
 		GROUP BY st.id
     </select>
     <select id="publicpartitotaldataForDistrictParty"
@@ -2684,15 +2702,21 @@ SELECT gr.id as orgId,
 						 sum(total.topicTotal) as topicTotal,
 						 sum(total.projectTotal) as projectTotal
 			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as regUserTotal,
-						0 AS joinUser,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
+			(select tmp1.DEPT_ID AS GRID_ID,
+                    count(tmp1.id)  as regUserTotal,
+                    0 AS joinUser,
+                    0 as issueTotal,
+                    0 as topicTotal,
+                    0 as projectTotal
+             from
+                 (SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE  eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
+                                                                                                                                                                       (SELECT tt.user_id,
+                                                                                                                                                                               tt.grid_id
+                                                                                                                                                                        FROM(
+                                                                                                                                                                                SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
+                                                                                                                                                                                FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
+                                                                                                                                                                                ORDER BY `CREATED_TIME`)  tt
+                                                                                                                                                                        GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
 
 		union all
 
@@ -2803,7 +2827,7 @@ SELECT gr.id as orgId,
 					and city.DEL_FLAG=0
 					AND gr.`id` NOT IN( SELECT t.`dept_id`
             FROM `esua_epdc_admin`.`sys_dept_config` t
-            WHERE t.`del_flag`= 0)
+            WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
 					and city.type_key='district_party' and city.party_code='shibei'
 		GROUP BY city.id;
     </select>