diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index 48d3f1dd8..81db0662c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -144,4 +144,9 @@ public interface PushToCityGridConstant { */ String DELETE = URL_PREFIX + "/delete"; + /** + * 响应接收 + */ + String RECEIVE = URL_PREFIX + "/receive"; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java index 9c845177e..a68c0db39 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java @@ -132,4 +132,6 @@ public class ItemPendingHandleDTO implements Serializable { private String repeatFlagName; + private String processId; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReceiveResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReceiveResultDTO.java new file mode 100644 index 000000000..8a8ed7cd1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReceiveResultDTO.java @@ -0,0 +1,63 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/9/19 14:35 + */ +@NoArgsConstructor +@Data +public class ReceiveResultDTO implements Serializable { + + /** + * 诉求id + */ + private String sqid; + /** + * 诉求状态 + */ + private String czbs; + /** + * 评价人员 + */ + private CzrBean czr; + /** + * 评价时间 + */ + private String czsj; + + + @NoArgsConstructor + @Data + public static class CzrBean { + /** + * 评价人员Id + */ + private String id; + /** + * 评价人员 + */ + private String xm; + /** + * 所属机构Id + */ + private String ssjgbm; + /** + * 所属机构 + */ + private String ssjg; + /** + * 所属部门Id + */ + private String ssbmbm; + /** + * 所属部门 + */ + private String ssbm; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java index a0fc5dd03..d3835c073 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java @@ -108,4 +108,6 @@ public class EventStatisticsResultDTO implements Serializable { * 街道以下、部门办理诉求数 */ private Integer gridCommunityDealNum; + + private Integer peopleNum; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java index df2b0e628..a173f6776 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java @@ -96,4 +96,17 @@ public class PushToCityGridController { pushToCityGridService.getAbnormalData(formDTO); return new Result(); } + + /** + * @Description:响应接收 + * @param processId: + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/5/4 14:14 + */ + @PostMapping("receive") + public Result receive(String processId) { + pushToCityGridService.receive(processId); + 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/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index cb21734ae..f2fb02ea2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -247,4 +247,12 @@ public interface PushToCityGridService { */ void getAbnormalData(GetAbnormalDataFormDTO formDTO); + /** + * @Description: 响应接收 + * @param processId: + * @Return void + * @Author: lichao + * @Date: 2023/5/4 14:15 + */ + void receive(String processId); } 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 3646897ea..f85370072 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 @@ -1417,6 +1417,44 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } } + @Override + public void receive(String processId) { + + + ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processId); + if (item == null) { + return; + } + + ReceiveResultDTO dto = new ReceiveResultDTO(); + dto.setSqid(getSqid(item.getItemId())); + dto.setCzbs("01"); + //终验时间 + dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); + + //终验人员 + ReceiveResultDTO.CzrBean czr = new ReceiveResultDTO.CzrBean(); + // 操作人姓名 + czr.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername()); + // 操作人员唯一标识 + czr.setId(item.getCreatedBy()); + // 所属机构id + czr.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR)); + // 所属机构名称 + czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR)); + // 所属部门id + czr.setSsbmbm(String.valueOf(item.getHandlerDeptId())); + // 所属部门名称 + czr.setSsbm(item.getHandlerDept()); + dto.setCzr(czr); + // 组装好直接推送 + String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.RECEIVE, "响应接收"); + + saveLog(item.getItemId(), item.getId(), "响应接收", PushToCityGridConstant.RECEIVE, JSONObject.toJSONString(dto), result); + + + } + private void extracted(List sqIdList, Integer itemState) { //50个一组 List> partList = ListUtils.partition(sqIdList, NumConstant.FIFTY); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDataExportExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDataExportExcel.java index 8d9d81cae..c4d74d481 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDataExportExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDataExportExcel.java @@ -18,48 +18,51 @@ public class ScreenDataExportExcel { @ExcelProperty(value = "问题总上报数", order = 2) private Integer eventCount; @ColumnWidth(20) - @ExcelProperty(value = {"分类", "发展诉求"}, order = 3) + @ExcelProperty(value = "提报人数", order = 3) + private Integer peopleNum; + @ColumnWidth(20) + @ExcelProperty(value = {"分类", "发展诉求"}, order = 4) private Integer developCount; @ColumnWidth(20) - @ExcelProperty(value = {"分类", "执法诉求"}, order = 4) + @ExcelProperty(value = {"分类", "执法诉求"}, order = 5) private Integer lawCount; @ColumnWidth(20) - @ExcelProperty(value = {"分类", "民生诉求"}, order = 5) + @ExcelProperty(value = {"分类", "民生诉求"}, order = 6) private Integer livelihoodCount; @ColumnWidth(20) - @ExcelProperty(value = "响应数", order = 6) + @ExcelProperty(value = "响应数", order = 7) private Integer responseCount; @ColumnWidth(20) - @ExcelProperty(value = "响应率", order = 7) + @ExcelProperty(value = "响应率", order = 8) private String responseRatio; @ColumnWidth(20) - @ExcelProperty(value = "办结数", order = 8) + @ExcelProperty(value = "办结数", order = 9) private Integer closedCount; @ColumnWidth(20) - @ExcelProperty(value = "办结率", order = 9) + @ExcelProperty(value = "办结率", order = 10) private String closedRatio; @ColumnWidth(20) - @ExcelProperty(value = "按期办结数", order = 10) + @ExcelProperty(value = "按期办结数", order = 11) private Integer scheduleClosedCount; @ColumnWidth(20) - @ExcelProperty(value = "按期办结率", order = 11) + @ExcelProperty(value = "按期办结率", order = 12) private String scheduleClosedRatio; @ColumnWidth(20) - @ExcelProperty(value = "满意数", order = 12) + @ExcelProperty(value = "满意数", order = 13) private Integer satisfiedCount; @ColumnWidth(20) - @ExcelProperty(value = "满意率", order = 13) + @ExcelProperty(value = "满意率", order = 14) private String satisfiedRatio; @ColumnWidth(20) - @ExcelProperty(value = "黄灯预警数", order = 14) + @ExcelProperty(value = "黄灯预警数", order = 15) private Integer yellowCount; @ColumnWidth(20) - @ExcelProperty(value = "红灯超期数", order = 15) + @ExcelProperty(value = "红灯超期数", order = 16) private Integer redCount; @ColumnWidth(20) - @ExcelProperty(value = "不予受理数", order = 16) + @ExcelProperty(value = "不予受理数", order = 17) private Integer unAcceptCount; @ColumnWidth(20) - @ExcelProperty(value = "街道以下、部门办理诉求数", order = 17) + @ExcelProperty(value = "街道以下、部门办理诉求数", order = 18) private Integer gridCommunityDealNum; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDistrictDataExportExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDistrictDataExportExcel.java index b4f579fb7..a72c97820 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDistrictDataExportExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/excel/ScreenDistrictDataExportExcel.java @@ -26,4 +26,6 @@ public class ScreenDistrictDataExportExcel { @ColumnWidth(20) @ExcelProperty(value = "办结率", order = 5) private String closedRatio; + + } 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 283f175a3..d48be3ff9 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 @@ -528,6 +528,7 @@ item.MOBILE, item.ITEM_STATE, item.grid AS gridName, + process.id as processId, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-', 1) AS streetName, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-' ,- 1) AS communityName, CASE item.EVALUATION_SCORE 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 8d0cdfdf9..e6ae84dbc 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 @@ -436,6 +436,7 @@ a.pids, a.type_key AS deptLevel, a.sort AS deptSort, + IFNULL(SUM(b.peoleNum), 0) AS 'peopleNum', IFNULL(SUM(b.eventCount), 0) AS 'eventCount', IFNULL(SUM(b.closedCount), 0) AS 'closedCount', CONCAT(ROUND(IFNULL(SUM(b.closedCount) / SUM(b.eventCount) * 100,0),2),'%') as closedRatio, @@ -457,7 +458,8 @@ COUNT(a.PEOPLE_FLAG = '2' or null) AS 'lawCount', COUNT(c.ITEM_ID) AS 'responseCount', COUNT(d.ITEM_ID) AS 'unAcceptCount', - COUNT(e.ITEM_ID) AS 'gridCommunityDealNum' + COUNT(e.ITEM_ID) AS 'gridCommunityDealNum', + COUNT(DISTINCT(a.MOBILE)) AS 'peoleNum' FROM epdc_item a LEFT JOIN ( SELECT h.id, h.item_id, h.created_time, h.state