From 1e40cdfbbb444c0c131179f5bdaa97b605a51642 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 23 Dec 2024 14:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9item=E7=BB=91=E5=AE=9Asqid?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=20=E5=AF=BC=E8=87=B4=E5=9B=9E=E9=80=80=20sqi?= =?UTF-8?q?d=E5=AF=B9=E5=BA=94=E5=A5=BD=E5=87=A0=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ItemHotlineController.java | 2 +- .../service/impl/ItemHotlineServiceImpl.java | 18 +++++++++--------- .../item/service/impl/ItemServiceImpl.java | 9 +++++++-- .../src/main/resources/mapper/item/ItemDao.xml | 12 ------------ 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java index 56f77f622..0c0e4070f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java @@ -118,7 +118,7 @@ public class ItemHotlineController { /** * @param * @return com.elink.esua.epdc.commons.tools.utils.Result - * @description: 热线12345 退件 + * @description: 热线12345 退件 回退 * @author qushutong * @date 2024/8/5 18:04 * @Version1.0 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java index 2189f3fea..81a73ac0c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java @@ -49,6 +49,7 @@ import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity; import com.elink.esua.epdc.modules.events.service.ImgService; import com.elink.esua.epdc.modules.events.service.ItemHotlineService; import com.elink.esua.epdc.modules.feign.OssFeignClient; +import com.elink.esua.epdc.modules.item.entity.ItemEntity; import com.elink.esua.epdc.modules.item.entity.ItemLawEntity; import com.elink.esua.epdc.modules.item.service.impl.PushToCityGridServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -245,15 +246,14 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(itemDTO.getSqid()), "sqid", itemDTO.getSqid()); - ItemHotlineEntity itemHotlineEntity = baseDao.selectOne(wrapper); - // 驳回重办在驳回市里 - if (itemHotlineEntity == null) { - QueryWrapper cbwrapper = new QueryWrapper<>(); - cbwrapper.eq(StringUtils.isNotBlank(itemDTO.getSqid()), "cbid", itemDTO.getSqid()); - itemHotlineEntity = baseDao.selectOne(cbwrapper); - } + // eventId 是当时转换为item时候塞的hot表的id + ItemHotlineEntity itemHotlineEntity = baseDao.selectById(itemDTO.getIssueId()); +// // 驳回重办在驳回市里 +// if (itemHotlineEntity == null) { +// QueryWrapper cbwrapper = new QueryWrapper<>(); +// cbwrapper.eq(StringUtils.isNotBlank(itemDTO.getSqid()), "cbid", itemDTO.getSqid()); +// itemHotlineEntity = baseDao.selectOne(cbwrapper); +// } itemHotlineEntity.setBackItemFlag("1"); itemHotlineEntity.setBackItemResult(itemDTO.getBackItemResult()); baseDao.updateById(itemHotlineEntity); 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 b783ee8be..f94f7480b 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 @@ -6466,7 +6466,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemEntity itemEntity = new ItemEntity(); - + itemEntity.setIssueId(itemHotlineEntity.getId()); itemEntity.setSerialNum(itemHotlineEntity.getCode()); // 青诉即办诉求唯一标识 itemEntity.setSqid(itemHotlineEntity.getSqid()); @@ -6631,6 +6631,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } ItemEntity entity = new ItemEntity(); + entity.setIssueId(itemHotlineEntity.getId()); entity.setSerialNum(itemHotlineEntity.getCode()); entity.setSqid(itemHotlineEntity.getSqid()); // if ("1".equals(itemHotlineEntity.getCbFlag())) { @@ -6757,6 +6758,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem throw new RenException("请用街道账号进行上报"); }*/ ItemEntity itemEntity = new ItemEntity(); + itemEntity.setIssueId(itemHotlineEntity.getId()); /* userID：zfsq+当前账户ID。 is_party_member:统一填0。 @@ -7319,8 +7321,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem public void backItem(ItemDTO dto) { String id = dto.getId(); ItemEntity itemEntity = baseDao.selectById(id); - dto.setSqid(itemEntity.getSqid()); + + +// dto.setSqid(itemEntity.getSqid()); baseDao.deleteById(itemEntity.getId()); + dto.setIssueId(itemEntity.getIssueId()); itemHotlineService.bcckItem(dto); } 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 0c06d050d..cebe0f032 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 @@ -2659,7 +2659,6 @@ where ei.is_people = '1' and ei.del_flag = '0' AND ei.event_id is NULL - AND ei.issue_id is NULL and h.del_flag = '0' and h.created_time = ( select max(created_time) @@ -2673,7 +2672,6 @@ a.is_people = '1' AND a.del_flag = '0' AND a.event_id is NULL - AND a.issue_id is NULL AND a.all_dept_ids LIKE concat('%', trim(#{deptId}), '%') @@ -2730,7 +2728,6 @@ i.del_flag = '0' AND i.is_people = '1' and i.event_id is NULL - AND i.issue_id is NULL AND i.item_state = '0' @@ -2805,7 +2802,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -2834,7 +2830,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',2) != '城市综合' @@ -2869,7 +2864,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -2904,7 +2898,6 @@ and item.IS_PEOPLE = '1' and item.ITEM_STATE = '10' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -2943,7 +2936,6 @@ and item.IS_PEOPLE = '1' and item.ITEM_STATE = '10' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -2982,7 +2974,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -3020,7 +3011,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -3110,7 +3100,6 @@ item.del_flag = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2'))) @@ -3190,7 +3179,6 @@ where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1' and item.EVENT_ID is null - and item.ISSUE_ID is null and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2')))