From 95f99d30fcc6642c8e7067cea6870d67e6ef0596 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 30 Sep 2020 14:54:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectProcessDao.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index 179f25ec81..07f1efef94 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -177,7 +177,7 @@
                 WHERE
                     pp.OPERATION = 'close'
                     <if test="date != null and date.trim() != ''">
-                        AND pp.CREATED_TIME = #{date}
+                        AND DATE_FORMAT(pp.CREATED_TIME , '%Y%m%d') = #{date}
                     </if>
 
             ) a

From b1d648a02cc2c84070b34907d3c1cd4f8ce6cbce Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 30 Sep 2020 15:07:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8Csql?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenPartyUserRankDataDao.xml   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 25fe3d5cfe..560917fe4d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -60,7 +60,7 @@
             del_flag = '0'
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}
@@ -76,7 +76,6 @@
             org_id AS "agencyId",
             org_name AS "agencyName",
             grid_id AS "gridId",
-            grid_name AS "gridName",
             user_id AS "userId",
             user_name AS "userName",
             round(index_score, 1) AS "indexScore"
@@ -87,7 +86,7 @@
         AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}