From 155a0aefbb9ab0033df8f09eba5c55f0cf01ca47 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 9 Jul 2021 11:08:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9sql?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/project/ProjectDao.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 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 dce166ad17..9cde166e58 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
@@ -299,8 +299,11 @@
-
- AND sdd1.EVENT_STATUS_CODE = #{status}
+
+ AND sdd1.EVENT_STATUS_CODE in('pending','0')
+
+
+ AND sdd1.EVENT_STATUS_CODE in('closed','10','5')
union
select sca.AREA_CODE,sdd2.* from screen_difficulty_data sdd2
@@ -322,8 +325,11 @@
-
- AND sdd2.EVENT_STATUS_CODE = #{status}
+
+ AND sdd2.EVENT_STATUS_CODE in('pending','0')
+
+
+ AND sdd2.EVENT_STATUS_CODE in('closed','10','5')
) diff
ORDER BY
From 76242aad66aab6198bb117d6d8943634cdbfb8b0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 9 Jul 2021 11:25:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=86=99=E6=AD=BB?=
=?UTF-8?q?areaCode=3D370124=E6=97=B6=E6=8C=89=E7=85=A7areaCode=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=85=B6=E4=BD=99=E7=9A=84=E6=8C=89=E7=85=A7?=
=?UTF-8?q?agencyId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../datareport/service/project/impl/ProjectServiceImpl.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index 251ab2f0a1..33fd65dd1b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
@@ -389,6 +389,10 @@ public class ProjectServiceImpl implements ProjectService {
}
formDTO.setAreaCode(agencyResult.getData().getAreaCode());
}*/
+ // 只有平阴根据areaCode查询，其余的还是按照agencyId查询
+ if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !"370124".equals(formDTO.getAreaCode())) {
+ formDTO.setAreaCode(StrConstant.EPMETY_STR);
+ }
// 3、升级原来的列表查询接口
PageHelper.startPage(null == formDTO.getPageNo() ? NumConstant.ONE : formDTO.getPageNo(), formDTO.getTopNum());
List result = projectDao.difficultyRankV2(formDTO);