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

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 37affad8391aab6f2e07237cfd03ce4f6278c65d
+Subproject commit 57907a9d4a48175ed5a5ef68fd73efe577945059

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

@@ -1725,9 +1725,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 handleProcess.setState(ipr.getState().toString());
             }
             log.info("处理项目-handleIf结束");
-            if(i == handleList.size()){
+//            if(i == handleList.size()){
-                handleProcess.setState("转项目");
+//                handleProcess.setState("转项目");
-            }
+//            }
             resultList.add(handleProcess);
             //迁移图片到事件图片中去
             log.info("处理项目-迁移图片");

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

@@ -394,8 +394,8 @@
             item.EVENT_ID,
             item.ISSUE_ID,
             item.ITEM_CONTENT,
-            iii.IMG_URL as VOICE,
+            IFNULL(item.item_voice,iii.IMG_URL) as VOICE,
-            iii.DURATION,
+            IFNULL(item.DURATION,iii.DURATION) as DURATION,
             item.ITEM_STATE,
             item.CREATED_TIME,
             item.IS_PARTY_MEMBER,