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

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

@@ -356,7 +356,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //插入项目部门关联表
         itemDeptService.savePeopleSubmitInfo(itemEntity);
         // 保存图片
-        imgService.saveImages(formDto.getImages(), itemEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
+        imgService.saveImages(formDto.getImages(), itemEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
         //保存到执法诉求详情表
         formDto.setItemId(itemEntity.getId());
         itemLawService.saveLawDetail(formDto);
@@ -1660,7 +1660,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         wrapper.eq("del_flag", "0");
         ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
         String result = "主办单位：" + itemLaw.getHostUnit()+"\n\n"
-                + "协办单位：-"+itemLaw.getAssistUnit();
+                + "协办单位："+itemLaw.getAssistUnit();
         return result;
     }
 
@@ -2361,7 +2361,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemDeptService.savePeopleSubmitInfo(entity);
 
         // 保存图片
-        imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
+        imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
         // 插入项目处理流程表
         ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity();
         itemHandleProcessEntity.setItemId(entity.getId());

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

@@ -421,11 +421,12 @@
             WHEN item.USER_ID = #{userId} THEN
             true ELSE false
             END AS isShowSatisfactionEvaluation,
-            img.IMG_URL
+            ifnull(img.IMG_URL,mi.IMG_URL) as IMG_URL
         FROM epdc_item item
         LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events'
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0'
         LEFT JOIN epdc_img iii ON item.EVENT_ID = iii.REFERENCE_ID AND iii.DEL_FLAG = '0' AND iii.IMG_TYPE = 'eventsVoice'
+        left join epdc_img mi on item.id=mi.REFERENCE_ID AND mi.DEL_FLAG = '0' AND mi.IMG_TYPE = 'events'
         <if test='userId != "" and userId != null'>
             LEFT JOIN epdc_event_user_attitude ua ON item.EVENT_ID = ua.EVENT_ID
             AND ua.DEL_FLAG = '0'
@@ -1235,7 +1236,7 @@
         AND cate.DEL_FLAG = '0'
         LEFT JOIN epdc_img img ON item.id = img.REFERENCE_ID
         AND img.DEL_FLAG = '0'
-        AND img.IMG_TYPE = 'items'
+        AND img.IMG_TYPE = 'events'
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
@@ -1346,7 +1347,7 @@
             item.CONTACT_NAME
         FROM epdc_item item
             LEFT JOIN epdc_img img ON item.id = img.REFERENCE_ID
-                        AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'items'
+                        AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
@@ -1383,7 +1384,7 @@
         AND cate.DEL_FLAG = '0'
         LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
         AND img.DEL_FLAG = '0'
-        AND img.IMG_TYPE = 'items'
+        AND img.IMG_TYPE = 'events'
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
@@ -1402,23 +1403,15 @@
 			 i.LAST_HANDLE_TIME,
 			 i.CREATED_TIME
         from epdc_item i
+        left join (
+                select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state,b.CLOSE_CHECK_ID
+                from epdc_item_handle_process b where  b.CREATED_TIME = (
+                SELECT max(CREATED_TIME) from epdc_item_handle_process where b.ITEM_ID = ITEM_ID
+                )
+                ) process on process.ITEM_ID = i.ID
         where i.DEL_FLAG='0'
-                    and i.id in (
-                                 SELECT
-                        temp.ITEM_ID
-                        FROM
-                        ( select it.*
-                                from epdc_item_handle_process it
-                                inner join (select *,max(CREATED_TIME) as maxTime
-                                from epdc_item_handle_process
-                                where DEL_FLAG='0'
-                                group by ITEM_ID
-                        )max_it on it.ITEM_ID=max_it.ITEM_ID
-                                                and it.CREATED_TIME=max_it.maxTime
-                        where it.DEL_FLAG='0'
-                                        and it.CLOSE_CHECK_ID=#{deptId}
-                                        and it.STATE=11
-                        ) temp)
+                and process.STATE=11
+                and process.CLOSE_CHECK_ID=#{deptId}
         <if test="itemContent != null and itemContent != ''">
             and i.ITEM_CONTENT like '%${itemContent}%'
         </if>