From 1246334a93982b4cf1bae8119e5c5a23f9168033 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Fri, 9 Aug 2024 09:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/item/ItemDTO.java | 3 +++ .../events/entity/ItemHotlineEntity.java | 5 +++++ .../events/service/ItemHotlineService.java | 4 ++++ .../service/impl/ItemHotlineServiceImpl.java | 11 +++++++++++ .../item/controller/ItemController.java | 8 ++++++++ .../epdc/modules/item/service/ItemService.java | 2 ++ .../item/service/impl/ItemServiceImpl.java | 18 +++++++++++++++++- 7 files changed, 50 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index 30c84b05c..f14024196 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java index 425eca243..02b2e82fd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java +++ b/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; + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java index 036ee5424..e607029ca 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java +++ b/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 { Result backHotLine(ItemBackHotlineDTO dto); + + + void bcckItem(ItemDTO itemDTO); } \ No newline at end of file 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 a78f3e18c..7b5767048 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 @@ -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 wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(itemDTO.getSqid()), "sqid", itemDTO.getSqid()); + ItemHotlineEntity itemHotlineEntity = baseDao.selectOne(wrapper); + itemHotlineEntity.setBackItemFlag("1"); + itemHotlineEntity.setBackItemResult(itemDTO.getBackItemResult()); + } } \ No newline at end of file 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 592eae823..d57a01e88 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 @@ -898,5 +898,13 @@ public class ItemController { return new Result().ok(itemService.changeHotLineToZFItem(dto)); } + + @PostMapping("backItem") + public Result backItem(@RequestBody ItemDTO dto){ + itemService.backItem(dto); + + return new Result(); + + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 6eb7eb946..0376369c0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { Result updataCaseEvaluation(QsjbEvaluation formDTO); Boolean changeHotlineToStreet(ItemHotlineDTO dto); + + void backItem(ItemDTO 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 fd7c41c51..3f32686b8 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 @@ -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 implem @Autowired private ItemHotlineDao itemHotlineDao; + @Autowired + private ItemHotlineService itemHotlineService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -6366,7 +6370,7 @@ public class ItemServiceImpl extends BaseServiceImpl 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 implem return true; } + @Override public Result pushToCityAgain() { @@ -7224,4 +7229,15 @@ public class ItemServiceImpl extends BaseServiceImpl 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); + } }