诉求状态追加

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 {
                 //吹哨

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