From a880487b982731668bd7ee3c36b33ebf0593775d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 14 Oct 2022 16:21:06 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E8=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2ebaf5cd5..c617a6058 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 @@ -1853,7 +1853,8 @@ ) process on process.ITEM_ID = i.ID where i.DEL_FLAG='0' - and IS_PEOPLE = '1' + and i.IS_PEOPLE = '1' + and i.EVENT_ID IS NULL and i.PEOPLE_FLAG = #{appealType} From da707bf4e2d5a287ad7018be0d38447730a2344e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 14 Oct 2022 16:41:44 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E7=BB=93?= =?UTF-8?q?=E6=A1=88=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/service/impl/ScreenDeptEventStatServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java index 3dda01cb3..9f2da9903 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java @@ -207,7 +207,7 @@ public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl Date: Fri, 14 Oct 2022 17:11:48 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenDeptEventEfficiencyDao.xml | 30 +++++++++++++++++++ .../mapper/screen/ScreenDeptEventStatDao.xml | 6 ++++ 2 files changed, 36 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml index 26cbdfed7..1c47633c4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml @@ -35,6 +35,9 @@ GROUP BY ITEM_ID) b ON a.ID = b.ITEM_ID WHERE DEL_FLAG = '0' AND PEOPLE_FLAG is not null + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') <= #{statDate} @@ -78,6 +81,9 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b ON b.ITEM_ID = a.ID AND b.DEL_FLAG = '0' @@ -97,12 +103,18 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b ON b.ITEM_ID = a.ID AND b.DEL_FLAG = '0' AND b.STATE = '60' ) c ON a.ID = c.ITEM_ID WHERE DEL_FLAG = '0' AND DATE_FORMAT(a.CREATED_TIME, '%Y-%m') = #{statDate} AND PEOPLE_FLAG is not null + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null GROUP BY ALL_DEPT_IDS ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%') WHERE a.del_flag = '0' @@ -143,6 +155,9 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b ON b.ITEM_ID = a.ID AND b.DEL_FLAG = '0' @@ -162,12 +177,18 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b ON b.ITEM_ID = a.ID AND b.DEL_FLAG = '0' AND b.STATE = '60' ) c ON a.ID = c.ITEM_ID WHERE DEL_FLAG = '0' AND DATE_FORMAT(a.CREATED_TIME, '%Y') = #{statDate} AND PEOPLE_FLAG is not null + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null GROUP BY ALL_DEPT_IDS ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%') WHERE a.del_flag = '0' @@ -252,6 +273,9 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') <= #{endDate} ) a @@ -272,6 +296,9 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') <= #{endDate}) a STRAIGHT_JOIN epdc_item_handle_process b ON b.ITEM_ID = a.ID AND b.DEL_FLAG = '0' AND b.STATE = '60' @@ -280,6 +307,9 @@ AND DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') <= #{endDate} AND PEOPLE_FLAG is not null + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null GROUP BY ALL_DEPT_IDS ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%') WHERE a.del_flag = '0' diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml index a858757d4..2f5243403 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml @@ -38,6 +38,9 @@ FROM epdc_item WHERE DEL_FLAG = '0' AND PEOPLE_FLAG IS NOT NULL + AND IS_PEOPLE = '1' + AND EVENT_ID is null + AND ISSUE_ID is null AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') <= #{statDate} @@ -114,6 +117,9 @@ ON a.ID = b.ITEM_ID AND b.DEL_FLAG = '0' AND b.STATE = '60' WHERE a.DEL_FLAG = '0' AND a.PEOPLE_FLAG IS NOT NULL + AND a.IS_PEOPLE = '1' + AND a.EVENT_ID is null + AND a.ISSUE_ID is null AND DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d') <= #{statDate} From a9e1efb17decdf4c3586949707fac985d26cfd6e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 14 Oct 2022 17:51:02 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=B8=89=E5=A4=A7=E8=AF=89=E6=B1=82?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=B2=A1=E6=9C=89=E7=BC=96=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/item/form/CityCaseDevelopDTO.java | 5 +++++ .../esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java | 5 +++++ .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseDevelopDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseDevelopDTO.java index 4b2b7e220..9d20f020a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseDevelopDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseDevelopDTO.java @@ -107,4 +107,9 @@ public class CityCaseDevelopDTO implements Serializable { * 04 市级处置（12345处置） */ private String czbs; + + /** + * 诉求编码 + */ + private String sqbm; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java index c3a0e353f..ab3e5161a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java @@ -128,4 +128,9 @@ public class CityCaseLawenforcementDTO implements Serializable { * 04 市级处置（12345处置） */ private String czbs; + + /** + * 诉求编码 + */ + private String sqbm; } 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 0f26fd9dd..d04972df0 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 @@ -654,6 +654,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setSsjg(name); sqdjr.setSsjgbm(code); data.setSqdjr(sqdjr); + data.setSqbm(entity.getSerialNum()); List imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); log.info("执法照片imageList：" + imageList); //诉求照片 @@ -3306,7 +3307,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem code = dtoResult.getData().getDisCenterZoningCode(); name = dtoResult.getData().getName(); } - + data.setSqbm(entity.getSerialNum()); data.setSqssjg(code); data.setSqssjgmc(name); //组装企业数据 From f14489914c7a2b6763062d4f92d58e8da7ccd098 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 14 Oct 2022 17:58:19 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemListByAddressResultDTO.java | 53 +++++++++++++++++++ .../item/controller/ItemController.java | 10 ++++ .../esua/epdc/modules/item/dao/ItemDao.java | 2 + .../modules/item/service/ItemService.java | 2 +- .../item/service/impl/ItemServiceImpl.java | 10 ++++ .../main/resources/mapper/item/ItemDao.xml | 30 +++++++++++ 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java new file mode 100644 index 000000000..06a000cab --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemListByAddressResultDTO.java @@ -0,0 +1,53 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ItemListByAddressResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 纬度 + */ + private String latitude; + /** + * 经度 + */ + private String longitude; + /** + * 离中心点千米数 + */ + private String km; + + + +} 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 6d0f64832..9783f06a3 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 @@ -444,5 +444,15 @@ public class ItemController { return itemService.pushItemDifficulty(formDto); } + /** + * 根据经纬度查询部门下附近项目数据 + * @param params + * @return + */ + @GetMapping("getItemListByAddress") + public Result> getItemListByAddress(@RequestParam Map params){ + return new Result>().ok(itemService.getItemListByAddress(params)); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 04a4ea39b..3c848770a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -522,4 +522,6 @@ public interface ItemDao extends BaseDao { List getItemStatisListPage(Map params); void updateBatchBySerialNum(@Param("updateList") List updateList); + + List getItemListByAddress(Map params); } 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 8387742da..fb43366b7 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 @@ -661,5 +661,5 @@ public interface ItemService extends BaseService { */ Result pushItemDifficulty(AcceptItemDifficultyOutFormDTO formDto); - + List getItemListByAddress(Map params); } 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 0f26fd9dd..2f0ae1df3 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 @@ -4031,5 +4031,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().ok("操作成功"); } + /** + * 根据经纬度查询部门下附近项目数据 + * @param params + * @return + */ + @Override + public List getItemListByAddress(Map params) { + return baseDao.getItemListByAddress(params); + } + } 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 c617a6058..8125597f2 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 @@ -2444,6 +2444,36 @@ ORDER BY DATE_FORMAT(item.CREATED_TIME,'%Y-%m') asc + + UPDATE epdc_item From f815000d309f517f4abc3ef36325f32cdf1da75e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 14 Oct 2022 18:54:39 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 17 ----------------- 1 file changed, 17 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 1b961124a..cc0a3d320 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 @@ -1751,23 +1751,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDto; } - /** - * @param id 项目表主键 - * @return boolean - * @Author yinzuomei - * @Description 校验项目是否已经上报网格化平台 - * @Date 2019/12/27 10:52 - **/ - private boolean checkReport(String id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("REFERENCE_ID", id); - List list = itemGridPlatformDao.selectList(wrapper); - if (list != null && list.size() > 0) { - return true; - } - return false; - } - private ItemGridPlatformEntity getReport(String id) { return itemGridPlatformDao.getOneOfGridPlatformItemByReferenceId(id); } From 76b5f2513ca7796d8d774021e97d9a974857848e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 14 Oct 2022 19:39:52 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=94=B9=E4=B8=BA1=E5=85=AC=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 7a119df08..4a4caf14c 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 7a119df0841805e0a139b7416a2ee314ca371320 +Subproject commit 4a4caf14c35de0d4678fd94d141da3661b549c1e 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 8125597f2..e35b77e4e 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 @@ -2468,7 +2468,7 @@ WHERE a.del_flag = '0' AND a.all_dept_ids LIKE concat('%', trim(#{deptId}), '%') - HAVING km 10 + HAVING km 1 ORDER BY a.created_time DESC, a.all_dept_ids ASC From 903ab5cbf5ec61017c4bd68812ef84a245c82bcb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 14 Oct 2022 20:30:04 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=9F=A5=E6=98=A8=E5=A4=A9=E5=8F=8A=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 8 ++++++++ 1 file changed, 8 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 cc0a3d320..642f38081 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 @@ -102,6 +102,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.joda.time.DateTime; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -110,6 +111,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -3904,6 +3906,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public PageData getItemStatisListPage(@RequestParam Map params) { IPage page = getPage(params); + if (params.isEmpty() || (!params.containsKey("startTime") && !params.containsKey("endTime") && !params.containsKey("statMonth") && !params.containsKey("statYear"))) { + DateTime dateTime = new DateTime(new Date()); + Date d = dateTime.plusDays(-1).toDate(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + params.put("statDate", df.format(d)); + } List list = baseDao.getItemStatisListPage(params); return new PageData<>(list, page.getTotal()); From f32d7ff9eb8d0230581774eda4a99d37d22d05d4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 17 Oct 2022 10:18:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?sql=E4=BC=98=E5=8C=96=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 e35b77e4e..106173756 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 @@ -2222,8 +2222,14 @@ epdc_item a LEFT JOIN ( select h.id,h.item_id,h.created_time,h.state - from epdc_item_handle_process h - where h.del_flag = '0' + + from epdc_item ei + inner join epdc_item_handle_process h on ei.id = h.item_id + where ei.is_people = '1' + and ei.del_flag = '0' + AND ei.event_id is NULL + AND ei.issue_id is NULL + and h.del_flag = '0' and h.created_time = ( select max(created_time) from epdc_item_handle_process @@ -2233,8 +2239,8 @@ GROUP BY h.item_id )b ON a.id = b.item_id WHERE - a.del_flag = '0' - AND a.is_people = '1' + a.is_people = '1' + AND a.del_flag = '0' AND a.event_id is NULL AND a.issue_id is NULL From 4ca2b55a9004a256dc6de6d199b9ca360780387d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 17 Oct 2022 10:42:50 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenDeptEventEfficiencyServiceImpl.java | 20 +++++++++++---- .../screen/ScreenDeptEventEfficiencyDao.xml | 25 ++++++++++++++----- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java index d512fc623..65abf89eb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java @@ -79,7 +79,9 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl 1 THEN ID END) AS responseCount, - COUNT(CASE WHEN EVALUATION_SCORE > 0 THEN ID END) AS satisfiedCount + COUNT(CASE WHEN ITEM_STATE = '10' AND (EVALUATION_SCORE != 0 OR EVALUATION_SCORE > 0) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( SELECT ITEM_ID, count(ID) AS 'processCount' @@ -67,7 +67,11 @@ THEN ID END) AS closedCount, COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y-%m') = #{statDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y-%m') = #{statDate} AND EVALUATION_SCORE > 0 + WHEN ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m') = #{statDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y-%m') = #{statDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( @@ -141,7 +145,11 @@ THEN ID END) AS closedCount, COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y') = #{statDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y') = #{statDate} AND EVALUATION_SCORE > 0 + WHEN ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y') = #{statDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y') = #{statDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( @@ -256,9 +264,14 @@ '%Y-%m-%d') <= #{endDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') >= #{startDate} AND - DATE_FORMAT(EVALUATION_TIME, - '%Y-%m-%d') <= #{endDate} AND EVALUATION_SCORE > 0 + WHEN + ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') >= #{startDate} AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') <= #{endDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') >= #{startDate} AND + DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') <= #{endDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( From 87b007fe5dec45a9258dbae61d486171b9f19c33 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 17 Oct 2022 10:45:22 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 11 ++++++----- .../src/main/resources/mapper/item/ItemDao.xml | 3 ++- 2 files changed, 8 insertions(+), 6 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 642f38081..dca044ff4 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 @@ -1314,7 +1314,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = baseDao.selectListOfItemHandleProgressByMobile(itemId); // 处理多次拼接处理人信息问题 for (ItemHandleProgressResultDTO dto : list) { - String advice = dto.getAdvice(); + String advice = dto.getAdvice() == null ? "" : dto.getAdvice(); // 对包含【h_s】的数据进行重新组装 if (advice.contains("h_s") && advice.contains(" 办理人：")) { String hsStr = advice.substring(advice.indexOf("h_s")); @@ -3997,17 +3997,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem List updateList = new ArrayList(); String returnMsgBody = ""; List itemList = formDto.getItemList(); - for(int i = 0 ; i < itemList.size() ; i++){ + for (int i = 0; i < itemList.size(); i++) { AcceptItemDifficultyFormDTO acceptItemDifficultyFormDTO = itemList.get(i); - if("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())){ + if ("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())) { updateList.add(acceptItemDifficultyFormDTO.getSerialNum()); } } - if(updateList.size() > 0){ + if (updateList.size() > 0) { try { baseDao.updateBatchBySerialNum(updateList); - }catch (Exception e){ + } catch (Exception e) { logger.info(e); // 保存接口调用日志 this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), @@ -4025,6 +4025,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem /** * 根据经纬度查询部门下附近项目数据 + * * @param params * @return */ 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 106173756..f1ec1d7f6 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 @@ -1276,7 +1276,8 @@ AND img.DEL_FLAG = '0' WHERE hp.DEL_FLAG = '0' - AND hp.ITEM_ID = #{itemId} UNION ALL + AND hp.ITEM_ID = #{itemId} + UNION ALL SELECT item.ID, item.EVALUATION_TIME AS createdTime,