From ea64656496dd82a49f1e0f44e2e6dc5c034edd92 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 17 Nov 2022 10:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=8A=B6=E6=80=81=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/service/impl/ItemServiceImpl.java    |  2 +-
 .../main/resources/mapper/item/ItemDao.xml    | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index c410ca608..fda65badd 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -2352,7 +2352,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_MS);
             if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
                 //结案申请
-                sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO);
+//                sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO);
                 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO);
             } else {
                 //吹哨
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 17a6d0a60..1a5ca6d9d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -2182,7 +2182,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
-            and i.ITEM_STATE = #{itemState}
+            <choose>
+                <when test="itemState == '80'">
+                    and i.EVALUATION_STATE = '1'
+                    and i.EVALUATION_TIME IS NULL
+                </when >
+                <when test="itemState == '90'">
+                    and i.EVALUATION_TIME IS NOT NULL
+                </when >
+                <otherwise>
+                    and i.ITEM_STATE = #{itemState}
+                </otherwise>
+            </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">
             AND i.GRID_ID IN
@@ -2283,7 +2294,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
-            and i.ITEM_STATE = #{itemState}
+            <choose>
+                <when test="itemState == '80'">
+                    and i.EVALUATION_STATE = '1'
+                    and i.EVALUATION_TIME IS NULL
+                </when >
+                <when test="itemState == '90'">
+                    and i.EVALUATION_TIME IS NOT NULL
+                </when >
+                <otherwise>
+                    and i.ITEM_STATE = #{itemState}
+                </otherwise>
+            </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">
             AND i.GRID_ID IN