Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java

@@ -42,6 +42,12 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      * 图片
      */
     private List<String> images;
+
+    /**
+     * 项目处理图片
+     */
+    private List<String> itemImges;
+
     /**
      * 语音
      */
@@ -154,10 +160,7 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      */
     private String imgUrl;
 
-    /**
+
-     * 项目处理图片
-     */
-    private String itemImges;
 
     /**
      * 0-处理中，\r\n5-不予受理，\r\n10-已结案，\r\n11：结案申请，\r\n12：响应拟办，\r\n1001:响应拟办[流程图第一条],\r\n13：直接办理，\r\n15：上报网格化平台(社区吹哨)''\r\n20：网格化平台-受理''\r\n25：网格化平台-立案''\r\n30：网格化平台-派遣''\r\n35：网格化平台-中间再派''\r\n40：网格化平台-接单''\r\n45：网格化平台-处理''\r\n50：网格化平台-中间督办''\r\n55：网格化平台-催办''\r\n60：网格化平台-结案''\r\n85-延期审核通过，\r\n90-熔断审核通过，\r\n1065-网格化平台-驳回',

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -2822,7 +2822,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     */
     private boolean getItemIsCs(String itemId) {
         ItemHandleProcessEntity process = itemHandleProcessDao.selectByItemIdBestNew(itemId);
-        return process != null;
+        return 0 == process.getState();
     }
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

@@ -15,7 +15,6 @@
         select *
         from epdc_item_handle_process
         where DEL_FLAG='0'
-                    and STATE=0
                     and item_id=#{itemId}
         order by CREATED_TIME desc
         limit 1