From 18a5a1f5e95a242185b27580d6cc19ab43e8af4a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 5 Sep 2022 21:57:35 +0800 Subject: [PATCH 1/2] common --- esua-epdc/epdc-cloud-commons-shibei | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 37affad83..57907a9d4 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 37affad8391aab6f2e07237cfd03ce4f6278c65d +Subproject commit 57907a9d4a48175ed5a5ef68fd73efe577945059 From edf9c8aae823812992ebc583c3858c93a6573908 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 5 Sep 2022 22:52:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E8=AF=89=E6=B1=82=E8=AF=A6=E6=83=85=E8=AF=AD=E9=9F=B3=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 6 +++--- .../src/main/resources/mapper/item/ItemDao.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 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 32f22c006..865b1d5d9 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 @@ -1717,9 +1717,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcess.setState(ipr.getState().toString()); } log.info("处理项目-handleIf结束"); - if(i == handleList.size()){ - handleProcess.setState("转项目"); - } +// if(i == handleList.size()){ +// handleProcess.setState("转项目"); +// } resultList.add(handleProcess); //迁移图片到事件图片中去 log.info("处理项目-迁移图片"); 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 237b1e537..7eb848d92 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 @@ -394,8 +394,8 @@ item.EVENT_ID, item.ISSUE_ID, item.ITEM_CONTENT, - iii.IMG_URL as VOICE, - iii.DURATION, + IFNULL(item.item_voice,iii.IMG_URL) as VOICE, + IFNULL(item.DURATION,iii.DURATION) as DURATION, item.ITEM_STATE, item.CREATED_TIME, item.IS_PARTY_MEMBER,