Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -279,7 +279,8 @@
         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
+        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

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