From 9edcc62fabf0c1fe16796c8faa207275a0f68115 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 10:52:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=B9=E5=93=A8=E4=B8=8A=E6=8A=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dto/item/ItemDTO.java | 2 +- .../esua/epdc/modules/item/controller/ItemController.java | 2 +- .../elink/esua/epdc/modules/item/service/ItemService.java | 8 ++++++++ .../epdc/modules/item/service/impl/ItemServiceImpl.java | 1 - .../item/service/impl/PushToCityGridServiceImpl.java | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) 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 ed8439bee..7538b9972 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 @@ -130,7 +130,7 @@ public class ItemDTO implements Serializable { /** * 议题位置纬度 */ - private Double issusLatitude; + private Double issueLatitude; /** * 议题位置经度 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 fe851b20e..382443967 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 @@ -480,7 +480,7 @@ public class ItemController { * @author zhy * @date 2022/10/21 16:13 */ - @PostMapping("gov/whistle") + @PostMapping("whistle") public Result whistle2Gov(@RequestBody ItemWhistle2GovFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return itemService.whistle2Gov(formDTO); 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 770030583..843036352 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 @@ -67,6 +67,14 @@ public interface ItemService extends BaseService { */ PageData listOfItemsForPCEnd(Map params); + /** + * 在党群E家流转中，尚未报到区平台的项目列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author zhy + * @date 2022/10/25 10:34 + */ PageData listEpdcItems(Map params); List listEqPc(ItemWorkListFormDTO formDTO); 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 6ef46898f..442315abf 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 @@ -4085,7 +4085,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (item == null) { return new Result().error("未查到相关项目，项目ID：" + formDTO.getId()); } - log.info("项目吹哨市平台"); // 吹哨上报 pushToCityGridService.appealWhistleReport(formDTO); // 吹哨后记录流程，如果吹市中心失败，删掉流程即可正常操作 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 7eef68ccd..0c03a4ccb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -298,7 +298,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { ItemDTO itemEntity = itemService.get(itemDTO.getId()); AppealWhistleReportResultDTO dto = new AppealWhistleReportResultDTO(); - dto.setSqid(getSqid(itemEntity.getSqid())); + dto.setSqid(itemEntity.getSqid()); dto.setJjcd(CityPushEnum.JJCD_YB.getCode()); dto.setSqly(CityPushEnum.SQLY_WX.getCode()); dto.setSqlx(itemEntity.getCategoryCodeOrigin()); @@ -306,7 +306,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSqrlxfs(itemEntity.getMobile()); dto.setSqzynr(itemEntity.getItemContent()); dto.setSqdz(itemEntity.getIssueAddress()); - dto.setSqxy(itemEntity.getIssueLongitude()+","+itemEntity.getIssusLatitude()); + dto.setSqxy(itemEntity.getIssueLongitude()+","+itemEntity.getIssueLatitude()); dto.setSqdjrq(DateUtils.format(new Date())); List list = imgDao.selectListByRefeId(itemDTO.getId()); if (!list.isEmpty()) {