修改item绑定sqid之后 导致回退 sqid对应好几个问题

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

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<ItemHotlineDao, Item
 
     @Override
     public void bcckItem(ItemDTO itemDTO) {
-        QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(itemDTO.getSqid()), "sqid", itemDTO.getSqid());
-        ItemHotlineEntity itemHotlineEntity = baseDao.selectOne(wrapper);
-        //  驳回重办在驳回市里
-        if (itemHotlineEntity == null) {
-            QueryWrapper<ItemHotlineEntity> 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<ItemHotlineEntity> 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);

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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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);
     }
 

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
         <if test="deptId != null and deptId != ''">
             AND a.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
         </if>
@@ -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
         <!-- itemStateType 0:待处理  1:处理中  2:已结案 -->
         <if test='itemStateType == "0" or itemStateType == "1"'>
             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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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) != '城市综合'
         <choose>
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
             <choose>
                 <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -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')))
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">