添加回退

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java

@@ -274,4 +274,7 @@ public class ItemDTO implements Serializable {
      * 是否典型案例：0否1是
      */
     private String isTypical;
+
+
+    private String backItemResult;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java

@@ -66,4 +66,9 @@ public class ItemHotlineEntity extends BaseEpdcEntity {
 	private String backFlag;
 
 
+	private String backItemFlag;
+
+	private String backItemResult;
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ItemHotlineDTO;
+import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO;
 import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
 
@@ -100,4 +101,7 @@ public interface ItemHotlineService extends BaseService<ItemHotlineEntity> {
 
 
     Result backHotLine(ItemBackHotlineDTO dto);
+
+
+    void bcckItem(ItemDTO itemDTO);
 }

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

@@ -34,6 +34,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ImageConstant;
 import com.elink.esua.epdc.constant.PushToCityGridConstant;
 import com.elink.esua.epdc.dto.ItemHotlineDTO;
+import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO;
 import com.elink.esua.epdc.dto.item.form.RollBackHotLineFromDTO;
 import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO;
@@ -45,6 +46,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.service.impl.PushToCityGridServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.helper.DataUtil;
@@ -226,4 +228,13 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         pushToCityGridServiceImpl.backHotLine(formdto);
         return new Result();
     }
+
+    @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);
+        itemHotlineEntity.setBackItemFlag("1");
+        itemHotlineEntity.setBackItemResult(itemDTO.getBackItemResult());
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -898,5 +898,13 @@ public class ItemController {
         return new Result<Boolean>().ok(itemService.changeHotLineToZFItem(dto));
     }
 
+
+    @PostMapping("backItem")
+    public  Result backItem(@RequestBody ItemDTO dto){
+        itemService.backItem(dto);
+
+        return new Result();
+
+    }
 }
 

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

@@ -863,4 +863,6 @@ public interface ItemService extends BaseService<ItemEntity> {
     Result updataCaseEvaluation(QsjbEvaluation formDTO);
 
     Boolean changeHotlineToStreet(ItemHotlineDTO dto);
+
+    void backItem(ItemDTO dto);
 }

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

@@ -90,6 +90,7 @@ import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
 import com.elink.esua.epdc.modules.events.entity.XxxdEventEntity;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 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.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.OssFeignClient;
@@ -257,6 +258,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private ItemHotlineDao itemHotlineDao;
 
+    @Autowired
+    private ItemHotlineService itemHotlineService;
+
     @Override
     public PageData<ItemDTO> page(Map<String, Object> params) {
         IPage<ItemEntity> page = baseDao.selectPage(
@@ -6366,7 +6370,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
 
             if (deptId == null || deptId == 0l || deptId == 1175270520603930625l){
-                lambdaQueryWrapper.and(wrap->wrap.eq(ItemHotlineEntity::getStreetId,'0').or().isNull(ItemHotlineEntity::getStreetId));
+                lambdaQueryWrapper.and(wrap->wrap.eq(ItemHotlineEntity::getStreetId,'0').or().isNull(ItemHotlineEntity::getStreetId).or().eq(ItemHotlineEntity::getBackItemFlag,"1"));
             }else{
                 lambdaQueryWrapper.eq(ItemHotlineEntity::getStreetId,deptId);
             }
@@ -6812,6 +6816,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return true;
     }
 
+
     @Override
     public Result pushToCityAgain() {
 
@@ -7224,4 +7229,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     }
 
+
+
+    @Override
+    @Transactional
+    public void backItem(ItemDTO dto) {
+        String id = dto.getId();
+        ItemEntity itemEntity = baseDao.selectById(id);
+        itemEntity.setDelFlag("1");
+        baseDao.updateById(itemEntity);
+        itemHotlineService.bcckItem(dto);
+    }
 }