From 3d5b34732ebe317c3c1997bc7b8b06fa366530ac Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 23 Feb 2022 13:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=95=B0=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3=20=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3=20-=20=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/screen/ScreenProjectDataDao.xml  | 3 +--
 epdc-cloud-client-yushan                                       | 2 +-
 epdc-cloud-commons-yushan                                      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index b6bede5..92c80d2 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -56,8 +56,7 @@
                when t1.ITEM_STATE = 0 and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) = 1 then 1
                when (t1.ITEM_STATE = 0 or t1.ITEM_STATE = 5) and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) > 1 then 2
                else '' end as projectLevel
-        from (select * from(select *, CASE WHEN EVALUATION_SCORE = 2 THEN 100 WHEN EVALUATION_SCORE = 0 THEN 60 ELSE 80 END AS satisfactionScore from esua_epdc_events.epdc_item where DEL_FLAG = '0'
-        and GRID_ID not in ( SELECT t.`dept_id`
+        from (select * from(select *, CASE WHEN EVALUATION_SCORE = 2 THEN 100 WHEN EVALUATION_SCORE = 0 THEN 60 ELSE 80 END AS satisfactionScore from esua_epdc_events.epdc_item where GRID_ID not in ( SELECT t.`dept_id`
                                     FROM `esua_epdc_admin`.`sys_dept_config` t
                                     WHERE t.`del_flag`= 0)
         order by ID)a group by a.EVENT_ID) t1
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index d919a78..2cea963 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit d919a78617e83128f5e69428e10e89d22e2e6968
+Subproject commit 2cea96391ebb8473f4f5b95d612d7cc058b05081
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 99e4e9b..7f85691 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 99e4e9b22ede63c92448a14fdd01c74894735411
+Subproject commit 7f85691f44d97e67e594213cbb7213350ce6c34b