diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index d57a01e88..f7406ddf2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -836,7 +836,7 @@ public class ItemController { } /** - * @Description: 获取老数据 + * @Description: 获取12345列表数据 * @param : * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lichao @@ -899,6 +899,15 @@ public class ItemController { } + /** + * + * @description: 事件回退到区中心用于驳回市里 + * @author qushutong + * @date 2024/8/20 13:52 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ @PostMapping("backItem") public Result backItem(@RequestBody ItemDTO dto){ itemService.backItem(dto); 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 c0ec113db..fa15b9e2c 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 @@ -6383,6 +6383,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem } // 过滤掉退件的 lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag)); + // 新增筛选 是否是市里驳回重办件 + lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag")); lambdaQueryWrapper .groupBy(ItemHotlineEntity::getSqid); lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj);