From f17479b3efdbf7c49d24a39ceaa494f2f962c475 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Jul 2021 11:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=9A=BE=E7=82=B9=E8=B5=8C?=
 =?UTF-8?q?=E7=82=B9=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEareaCode=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=BD=8F=E7=8A=B6=E6=80=81=E4=B8=BA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=9AEVENT=5FSTATUS=5FCODE=20in('pending','0'),?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=98=AF=E6=9D=A5=E6=BA=90=E4=BA=8E=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/GrassRootsGovernServiceImpl.java                | 1 +
 .../main/resources/mapper/screen/ScreenDifficultyDataDao.xml    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index b74a777bd5..0cdb93a9c7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -110,6 +110,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
         if (StringUtils.isNotEmpty(param.getAreaCode())){
+            // 目前只有平阴大屏才会传areaCode,下面的sql限制住状态为：处理中
             result = screenDifficultyDataDao.selectDifficultyByAreaCode(param.getAreaCode(),param.getType());
         }else {
             result = screenDifficultyDataDao.selectDifficulty(param.getAgencyId(),param.getType());
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index 4e03b4d2a3..191cc4034a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -70,6 +70,8 @@
         on(diff.ORG_ID=scg.GRID_ID and scg.DEL_FLAG='0')
         WHERE
                 diff.DEL_FLAG = '0'
+            and diff.orgType='grid'
+            and diff.EVENT_STATUS_CODE in('pending','0')
             AND scg.AREA_CODE like concat(#{areaCode},'%')
         ORDER BY
         (CASE #{type}