From 13bd6e4340af17165980fc9effcb4c26025e7cd2 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Dec 2021 13:58:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E6=95=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index a968be215b..61ac2de99a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -279,7 +279,12 @@
         floor(diff.EVENT_COST_TIME/60) AS totalHours,
         diff.EVENT_RE_ORG AS reOrg,
         diff.EVENT_HANDLED_COUNT AS handledCount,
-        IFNULL(spd.SATISFACTION_SCORE,80) AS score
+        <if test="status!= null and status == 'pending'">
+            spd.SATISFACTION_SCORE AS score
+        </if>
+        <if test="status!= null and status == 'closed'">
+            IFNULL(spd.SATISFACTION_SCORE,80) AS score
+        </if>
         FROM
         (
             select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1

From 70ac51304c6b3c2658e1e916297b6aeb63a7f703 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Dec 2021 14:34:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E4=BF=AE=E6=94=B9=20=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=BA=A6=E5=88=86=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml      | 8 ++------
 .../src/main/resources/mapper/project/ProjectDao.xml      | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 61ac2de99a..e0e3b9fdae 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -279,12 +279,8 @@
         floor(diff.EVENT_COST_TIME/60) AS totalHours,
         diff.EVENT_RE_ORG AS reOrg,
         diff.EVENT_HANDLED_COUNT AS handledCount,
-        <if test="status!= null and status == 'pending'">
-            spd.SATISFACTION_SCORE AS score
-        </if>
-        <if test="status!= null and status == 'closed'">
-            IFNULL(spd.SATISFACTION_SCORE,80) AS score
-        </if>
+        CASE WHEN diff.org_type = 'grid' AND diff.EVENT_STATUS_CODE = 'closed' THEN IFNULL(spd.SATISFACTION_SCORE,80)
+             ELSE spd.SATISFACTION_SCORE END AS score
         FROM
         (
             select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 85e8316cd3..9a2ec5b096 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -200,7 +200,7 @@
                      + s.PERFECT_COUNT * 100
               )/s.SHOULD_EVALUATE_COUNT
                 ,
-                0
+                80
             ) AS score
         FROM
             project_satisfaction_statistics s