From c97e080588119eaf51729b1441a060f1dfc1605d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 26 Feb 2021 14:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6/=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91-=E3=80=90=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E9=97=A8=E8=B0=83=E6=95=B4=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2021/02/26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenProjectDataDao.xml    | 180 ++++++++++++------
 1 file changed, 123 insertions(+), 57 deletions(-)

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 590519ff..3b54135b 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
@@ -141,32 +141,59 @@
         group by sd.id
     </select>
     <select id="selectProjectOrgDaily" resultType="com.elink.esua.epdc.dto.screen.result.ProjectOrgDailyDTO">
-        SELECT  st.`id` AS orgId,
-                'street' as orgType,
-                st.pid AS pid,
-                st.pids AS pids,
-                count(it.id) as projectTotal,
-                count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null) as resolvedNum,
-                ifnull(format(round(count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null)/count(it.id),4),4),'0.0000') as resolvedRatio,
-                ifnull(format(round(count((it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null)/count(it.id),4),4),'0.0000') as goodRatio,
-                count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as evaluateTotal,
-                count( (it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as goodTotal,
-                count( it.EVALUATION_SCORE=0 or null) as badTotal,
-                ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio
-
+        SELECT st.`id` AS orgId,
+			 'street' as orgType,
+			 st.pid AS pid,
+			 st.pids AS pids,
+			 count(it.id) as projectTotal,
+			 count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null) as resolvedNum,
+			 ifnull(format(round(count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null)/count(it.id),4),4),'0.0000') as resolvedRatio,
+			 ifnull(format(round(count((it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null)/count(it.id),4),4),'0.0000') as goodRatio,
+			 count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as evaluateTotal,
+			 count( (it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as goodTotal,
+			 count( it.EVALUATION_SCORE=0 or null) as badTotal,
+			 ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio
         FROM `esua_epdc_admin`.`sys_dept` sd
         left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid
         left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid
         left join (select lin.* from (select * from esua_epdc_events.epdc_item order by id) lin
-                                    where lin.DEL_FLAG=0
-                                    AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) &lt;= #{yesterDayDate}
-                                    group by lin.EVENT_ID) it on it.GRID_ID=sd.id
-        WHERE   sd.`del_flag`= 0
-                AND sd.`type_key`= 'grid_party'
-                AND sd.`id` NOT IN( SELECT t.`dept_id`
-                                    FROM `esua_epdc_admin`.`sys_dept_config` t
-                                    WHERE t.`del_flag`= 0)
-        group by st.id
+                                                where lin.DEL_FLAG=0
+                                                            AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{yesterDayDate}
+                                                group by lin.EVENT_ID) it on it.GRID_ID=sd.id
+     WHERE sd.`del_flag`= 0
+         AND sd.`type_key`= 'grid_party'
+         AND sd.`id` NOT IN( SELECT t.`dept_id`
+                                                    FROM `esua_epdc_admin`.`sys_dept_config` t
+                                                 WHERE t.`del_flag`= 0)
+         group by st.id
+
+    union all
+
+    SELECT co.`id` AS orgId,
+                 'community' as orgType,
+                 co.pid AS pid,
+                 co.pids AS pids,
+                 count(it.id) as projectTotal,
+                 count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null) as resolvedNum,
+                 ifnull(format(round(count((it.ITEM_STATE=5 or it.ITEM_STATE=10) or null)/count(it.id),4),4),'0.0000') as resolvedRatio,
+                 ifnull(format(round(count((it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null)/count(it.id),4),4),'0.0000') as goodRatio,
+                 count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as evaluateTotal,
+                 count( (it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null) as goodTotal,
+                 count( it.EVALUATION_SCORE=0 or null) as badTotal,
+                 ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio
+
+        FROM `esua_epdc_admin`.`sys_dept` sd
+        left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid
+        left join (select lin.* from (select * from esua_epdc_events.epdc_item order by id) lin
+                                                where lin.DEL_FLAG=0
+                                                            AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{yesterDayDate}
+                                                group by lin.EVENT_ID) it on it.GRID_ID=sd.id
+     WHERE sd.`del_flag`= 0
+         AND sd.`type_key`= 'grid_party'
+         AND sd.`id` NOT IN( SELECT t.`dept_id`
+                                                    FROM `esua_epdc_admin`.`sys_dept_config` t
+                                                 WHERE t.`del_flag`= 0)
+         group by co.id
     </select>
     <select id="selectQuantityGridMonthly"
             resultType="com.elink.esua.epdc.dto.screen.result.QuantityGridMonthly">
@@ -208,44 +235,83 @@
     </select>
     <select id="selectQuantityOrgMonthly"
             resultType="com.elink.esua.epdc.dto.screen.result.QuantityOrgMonthlyDTO">
-        SELECT  st.`id` AS orgId,
-                'street' as orgType,
-                st.pid AS pid,
-                st.pids AS pids,
-                ifnull(it.projectIncr,0) as projectIncr,
-                ifnull(it.closedIncr,0) as closedIncr,
-                ifnull(li2.projectTotal,0) as projectTotal,
-                ifnull(li2.unClosedTotal,0) as unClosedTotal,
-                ifnull(li2.closedTotal,0) as closedTotal
-
+            SELECT  st.`id` AS orgId,
+                 'street' as orgType,
+                 st.pid AS pid,
+                 st.pids AS pids,
+                 ifnull(it.projectIncr,0) as projectIncr,
+                 ifnull(it.closedIncr,0) as closedIncr,
+                 ifnull(li2.projectTotal,0) as projectTotal,
+                 ifnull(li2.unClosedTotal,0) as unClosedTotal,
+                 ifnull(li2.closedTotal,0) as closedTotal
         FROM `esua_epdc_admin`.`sys_dept` sd
         left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid
         left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid
-        left join (select   li.GRID_ID,
-                            count(li.id) as projectIncr,
-                            count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr
-                    from (select lin.*
-                            from (select * from esua_epdc_events.epdc_item order by id) lin
-                            where lin.DEL_FLAG=0
-                            AND date_format( lin.CREATED_TIME, '%Y-%m' ) = #{lastMonth}
-                            group by lin.EVENT_ID)li
-                   group by li.GRID_ID)it on it.GRID_ID=sd.id
-        left join (select   al.GRID_ID,
-                            count(al.id) as projectTotal,
-                            count(al.ITEM_STATE= 0 or null) as unClosedTotal,
-                            count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal
-                   from (select lin.*
-                            from (select * from esua_epdc_events.epdc_item order by id) lin
-                            where lin.DEL_FLAG=0
-                            AND date_format( lin.CREATED_TIME, '%Y-%m' ) &lt;= #{lastMonth}
-                            group by lin.EVENT_ID)al
-                   group by al.GRID_ID)li2 on li2.GRID_ID=sd.id
-        WHERE sd.`del_flag`= 0
-                AND sd.`type_key`= 'grid_party'
-                AND sd.`id` NOT IN( SELECT t.`dept_id`
-                                    FROM `esua_epdc_admin`.`sys_dept_config` t
-                                    WHERE t.`del_flag`= 0)
-        group by st.id
+        left join (select li.GRID_ID,
+                                             count(li.id) as projectIncr,
+                                             count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr
+                                from (select lin.*
+                                            from (select * from esua_epdc_events.epdc_item order by id) lin
+                                            where lin.DEL_FLAG=0
+                                                        AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{lastMonth}
+                                            group by lin.EVENT_ID)li
+                                group by li.GRID_ID)it on it.GRID_ID=sd.id
+     left join (select al.GRID_ID,
+                                         count(al.id) as projectTotal,
+                                         count(al.ITEM_STATE= 0 or null) as unClosedTotal,
+                                         count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal
+                            from (select lin.*
+                                        from (select * from esua_epdc_events.epdc_item order by id) lin
+                                        where lin.DEL_FLAG=0
+                                                    AND date_format( lin.CREATED_TIME, '%Y-%m' ) &lt;=#{lastMonth}
+                                        group by lin.EVENT_ID)al
+                            group by al.GRID_ID)li2 on li2.GRID_ID=sd.id
+     WHERE sd.`del_flag`= 0
+         AND sd.`type_key`= 'grid_party'
+         AND sd.`id` NOT IN( SELECT t.`dept_id`
+                                                    FROM `esua_epdc_admin`.`sys_dept_config` t
+                                                 WHERE t.`del_flag`= 0)
+         group by st.id
+
+    union all
+
+    SELECT  co.`id` AS orgId,
+                 'community' as orgType,
+                 co.pid AS pid,
+                 co.pids AS pids,
+                 ifnull(it.projectIncr,0) as projectIncr,
+                 ifnull(it.closedIncr,0) as closedIncr,
+                 ifnull(li2.projectTotal,0) as projectTotal,
+                 ifnull(li2.unClosedTotal,0) as unClosedTotal,
+                 ifnull(li2.closedTotal,0) as closedTotal
+
+        FROM `esua_epdc_admin`.`sys_dept` sd
+        left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid
+        left join (select li.GRID_ID,
+                                             count(li.id) as projectIncr,
+                                             count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr
+                                from (select lin.*
+                                            from (select * from esua_epdc_events.epdc_item order by id) lin
+                                            where lin.DEL_FLAG=0
+                                                        AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{lastMonth}
+                                            group by lin.EVENT_ID)li
+                                group by li.GRID_ID)it on it.GRID_ID=sd.id
+     left join (select al.GRID_ID,
+                                         count(al.id) as projectTotal,
+                                         count(al.ITEM_STATE= 0 or null) as unClosedTotal,
+                                         count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal
+                            from (select lin.*
+                                        from (select * from esua_epdc_events.epdc_item order by id) lin
+                                        where lin.DEL_FLAG=0
+                                                    AND date_format( lin.CREATED_TIME, '%Y-%m' ) &lt;=#{lastMonth}
+                                        group by lin.EVENT_ID)al
+                            group by al.GRID_ID)li2 on li2.GRID_ID=sd.id
+     WHERE sd.`del_flag`= 0
+         AND sd.`type_key`= 'grid_party'
+         AND sd.`id` NOT IN( SELECT t.`dept_id`
+                                                    FROM `esua_epdc_admin`.`sys_dept_config` t
+                                                 WHERE t.`del_flag`= 0)
+         group by co.id
     </select>
 
 </mapper>