From 3266ceb8747d8a7610bfbc95d3921a0c62547de8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 10 Oct 2022 10:30:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 ba5a8bfed..4d3c4a8da 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 @@ -2189,6 +2189,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()); } Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); + DeptInfoCodeDTO deptInfo = deptResult.getData(); if (deptInfo == null) { throw new RenException("根据网格ID获取对应的社区编码、街道编码失败" + deptResult.getMsg()); @@ -3591,6 +3592,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { sendResult = this.reportCaseNew(dto); } catch (Exception e) { + log.error("上报网格化平台接口失败:" + e.getMessage()); throw new RenException("上报网格化平台接口失败" + sendResult.getMessage()); } if (!"0".equals(sendResult.getCode())) { From 4c83a61af240731099b0256953885f6519f8f7f3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 10 Oct 2022 11:02:27 +0800 Subject: [PATCH 2/4] format --- .../main/resources/mapper/item/ItemDao.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 926902441..0819f7d5c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1365,23 +1365,23 @@ closedTable.closedNum, noticeTable.noticeNum FROM ( - SELECT - 'ITEM_COUNT' AS keystr, - COUNT( * ) AS pendingHandleNum - FROM - epdc_item item - LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID - AND dept.DEL_FLAG = '0' - WHERE - item.DEL_FLAG = '0' - AND item.ITEM_STATE = '0' - AND dept.DEPT_ID IN - - #{deptIdItem} - - - AND dept.DEPT_ID = #{deptId} - + SELECT + 'ITEM_COUNT' AS keystr, + COUNT( * ) AS pendingHandleNum + FROM + epdc_item item + LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID + AND dept.DEL_FLAG = '0' + WHERE + item.DEL_FLAG = '0' + AND item.ITEM_STATE = '0' + AND dept.DEPT_ID IN + + #{deptIdItem} + + + AND dept.DEPT_ID = #{deptId} + ) pendingTable INNER JOIN ( From 0ab91e25725afb2eef660a80a1b807110b0ff7a1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 10 Oct 2022 11:59:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 4d3c4a8da..e61bcabe8 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 @@ -2298,7 +2298,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //查询所对应的大类 CategoryEntity thirdCate = categoryDao.selectById(thirdId); - if (null == thirdCate) { + if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) { sendDto.setSJLYU("21"); sendDto.setSJDL("2199"); return; @@ -2309,6 +2309,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } + public static void main(String[] args) { + String pids = "3,32,234"; + String thirdId = ""; + if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) != -1) { + thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1, StrUtil.ordinalIndexOf(pids, ",", 3)); + //只有第二个逗号，没有第三个逗号 + } else if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) == -1) { + thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1); + } + System.out.println(thirdId); + } + /** * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto * @describe: 组装驳回重办数据 From b1f5eded4cce4fb4364b4b1614e3c1a47b66f13c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 10 Oct 2022 12:13:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 12 ------------ 1 file changed, 12 deletions(-) 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 e61bcabe8..624e2a4a4 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 @@ -2309,18 +2309,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - public static void main(String[] args) { - String pids = "3,32,234"; - String thirdId = ""; - if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) != -1) { - thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1, StrUtil.ordinalIndexOf(pids, ",", 3)); - //只有第二个逗号，没有第三个逗号 - } else if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) == -1) { - thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1); - } - System.out.println(thirdId); - } - /** * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto * @describe: 组装驳回重办数据