From 857c116aee3ac015adec5b450fe635793ba05beb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 1 Dec 2021 13:51:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3-?=
 =?UTF-8?q?=E5=85=9A=E5=BB=BA=E8=83=BD=E5=8A=9B-=E5=BB=BA=E7=BE=A4?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E6=95=B0=EF=BC=9A=E5=BB=BA=E7=AB=8B=E7=BE=A4?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E5=85=9A=E5=91=98=E6=95=B0=EF=BC=88=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/extract/FactOriginGroupMainDailyDao.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index 21df7f9a68..c8c672e57f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -3,17 +3,19 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao">
 
-    <!-- 查询建群党员数 -->
+    <!-- 查询建群党员数: 网格内 建立群组的 党员数（去重） -->
     <select id="selectPartyCreateGroupCount" resultType="com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO">
         SELECT
             GRID_ID,
-            COUNT( ID ) AS partyCreateGroupCount
+            COUNT( distinct GROUP_OWNER_ID ) AS partyCreateGroupCount
         FROM
             fact_origin_group_main_daily
         WHERE
             DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
             AND MONTH_ID = #{monthId}
+            AND IS_OWNER_PARTY='1'
+            AND GROUP_STATE='approved'
             GROUP BY GRID_ID
     </select>
 

From 4c525a745d6c92ab2c162db35adb32c6d40ab824 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Dec 2021 13:55:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=BB=A1=E6=84=8F=E5=BA=A6sql=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.xml      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 4888b359fd..3286a42aae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -47,7 +47,7 @@
     </select>
 
     <!-- 查询项目评价信息 -->
-    <select id="selectProjectEvaluate" resultType="com.epmet.dto.extract.result.ProjectEvaluateResultDTO">
+    <!--<select id="selectProjectEvaluate" resultType="com.epmet.dto.extract.result.ProjectEvaluateResultDTO">
         SELECT
             ACTION_CODE,
             ORG_ID AS gridId,
@@ -60,6 +60,19 @@
             AND CUSTOMER_ID = #{customerId}
             AND MONTH_ID = #{monthId}
             AND (ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect')
+    </select>-->
+    <select id="selectProjectEvaluate" resultType="com.epmet.dto.extract.result.ProjectEvaluateResultDTO">
+        SELECT
+            IFNULL(ld.ACTION_CODE,'good') AS actionCode,
+            md.GRID_ID AS gridId,
+            md.ID AS projectId
+        FROM fact_origin_project_main_daily md
+        LEFT JOIN fact_origin_project_log_daily ld ON (ld.PROJECT_ID = md.ID AND ld.DEL_FLAG = 0 AND ld.CUSTOMER_ID = #{customerId} AND ld.ACTION_CODE IN( 'bad','good', 'perfect'))
+        WHERE md.DEL_FLAG = 0
+          AND md.ORIGIN = 'issue'
+          AND md.PROJECT_STATUS = 'closed'
+          AND md.CUSTOMER_ID = #{customerId}
+          AND md.MONTH_ID = #{monthId}
     </select>
 
     <!-- 网格项目自治率查询 -->