From 18b68edfc8436b9ebcf878fe815e9da1c171cc34 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 7 Sep 2022 10:37:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E7=9B=B8?= =?UTF-8?q?=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/ItemServiceImpl.java | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- .../src/main/resources/mapper/item/ItemDao.xml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 10bfbfc6e..de44f36de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -182,7 +182,7 @@ public class ItemServiceImpl implements ItemService { } else { formDto.setIsPartyMember(YesOrNoEnum.NO.value()); } - formDto.setMobile(userDetail.getMobile()); +// formDto.setMobile(userDetail.getMobile()); return itemFeignClient.submitItem(formDto); } 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 e8e7054a1..748e212f8 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 @@ -376,7 +376,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); sendItemToDsf(dto,itemHandleProcessEntity); - return new Result(); + return new Result().ok(itemEntity.getSerialNum()); } @@ -2384,7 +2384,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); sendItemToDsf(dto,itemHandleProcessEntity); } - return new Result(); + return new Result().ok(entity.getSerialNum()); } 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 e6bbc494d..a348bc8ff 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 @@ -615,12 +615,13 @@ eve.COMMENT_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum, item.CATEGORY_FULL_NAME as CATEGORY_NAME, - img.IMG_URL, + ifnull(img.IMG_URL,mi.IMG_URL) as IMG_URL, item.GROUP_NAME, IFNULL(item.item_voice,iii.IMG_URL) as VOICE, IFNULL(item.DURATION,iii.DURATION) as DURATION 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_img mi on item.id=mi.REFERENCE_ID AND mi.DEL_FLAG = '0' AND mi.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' WHERE