diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java index dbf80b605..bd9e69428 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java @@ -80,5 +80,10 @@ public class ItemHandleProcessToCityResultDTO implements Serializable { */ private String delFlag; + /** + * 网格化平台-人员名称 + */ + private String gridPartyname; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index c6e408174..612c73de9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -113,19 +113,21 @@ public interface ItemHandleProcessDao extends BaseDao { * @author LZN * @date 2022/9/19 10:25 */ - List getAppealReporting(String state); + List getAppealReporting(int state); /** * 上报驳回 * @param state * @return */ - List getReportRejection(String state); + List getReportRejection(int state); /** * 诉求处理 * @param state * @return */ - List getAppealHandling(String state); + List getAppealHandling(int state); + + List getURL(String itemId); } 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 e282e5a8f..b18e4b024 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 @@ -228,25 +228,25 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { DispatchAuditResultDto data = new DispatchAuditResultDto(); // 诉求id - data.setSqid(""); - // 诉求状态(待审核) - data.setSqzt(CityPushStateEnum.DJA.getCode()); - // 当前处理环节 + data.setSqid(getSqid(item.getItemId())); + // 诉求状态(未知) + data.setSqzt(CityPushStateEnum.DSH.getCode()); + // 当前处理环节(未知) data.setDqclhj(""); // 审核时间 data.setCzsj(item.getCreatedTime()); - // 审核结果 + // 审核结果(未知) data.setShjg(""); // 审核意见 - data.setCznr(""); + data.setCznr(item.getHandleAdvice()); // 操作人 DispatchAuditResultDto.CzrDTO dto = new DispatchAuditResultDto.CzrDTO(); + // 操作人员姓名 + dto.setXm(item.getGridPartyname()); - dto.setId(("")); - dto.setXm(""); - - + // 组装完成,推送 + data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核"); } } @@ -307,7 +307,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { */ @Override public void AppealReporting() { - String state = "11"; + int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); List list = itemHandleProcessDao.getAppealReporting(state); // 处理数据 todo @@ -315,22 +315,24 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { AppealReportResultDTO data = new AppealReportResultDTO(); - data.setSqid(""); - // 诉求状态 - data.setSqzt(CityPushStateEnum.DCL.getCode()); - // 当前处理环节 - data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); + // 诉求id + data.setSqid(getSqid(item.getItemId())); + // 诉求状态(未知) + data.setSqzt(""); + // 当前处理环节(未知) + data.setDqclhj(""); // 上报时间 data.setCzsj(item.getCreatedTime()); // 上报原因 - data.setCznr(""); + data.setCznr(item.getHandleAdvice()); // 操作人 AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO(); + // 操作人姓名 + dto.setXm(item.getGridPartyname()); - dto.setId(""); - dto.setXm(""); - + // 组装完成,推送 + data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报"); } } @@ -345,7 +347,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { */ @Override public void ReportRejection() { - String state = "14"; + int state = ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); List list = itemHandleProcessDao.getReportRejection(state); // 处理数据 todo @@ -353,21 +355,24 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { ReportRejectionResultDTO data = new ReportRejectionResultDTO(); - data.setSqid(""); - // 诉求状态 + // 诉求id + data.setSqid(getSqid(item.getItemId())); + // 诉求状态(未知) data.setSqzt(""); - // 当前处理环节 + // 当前处理环节(未知) data.setDqclhj(""); // 驳回时间 data.setCzsj(item.getCreatedTime()); // 驳回原因 - data.setCznr(""); + data.setCznr(item.getHandleAdvice()); + // 操作人 ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO(); + // 操作人姓名 + dto.setXm(item.getGridPartyname()); - dto.setId(""); - dto.setXm(""); - + // 组装完成,推送 + data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回"); } } @@ -382,33 +387,50 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { */ @Override public void AppealHandling() { - String state = "0"; + int state = ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue(); List list = itemHandleProcessDao.getAppealHandling(state); + // 处理数据 todo for(ItemHandleProcessToCityResultDTO item : list) { AppealHandlingResultDTO data = new AppealHandlingResultDTO(); - data.setSqid(""); + // 诉求id + data.setSqid(getSqid(item.getItemId())); // 诉求状态 data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节 data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); - // 诉求类型 + // 诉求类型(未知) data.setSqlx(""); // 处理时间 data.setCzsj(item.getCreatedTime()); // 处理内容 - data.setCznr(""); + data.setCznr(item.getHandleAdvice()); + // 处理照片 - data.setClzp(""); + List urlList = itemHandleProcessDao.getURL(item.getItemId()); + String url = ""; + for (String i : urlList) { + url = i+ "," + url; + } + data.setClzp(url); + + // 会议纪要(未知) + data.setHyjy(""); + // 责任分工 + data.setZrfg(""); + // 办理进度 + data.setBljd(""); + // 操作人 AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO(); + // 操作人姓名 + dto.setXm(item.getGridPartyname()); - dto.setId(""); - dto.setXm(""); - - cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"上报驳回"); + // 组装完成,推送 + data.setCzr(dto); + cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理"); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index 50923b99b..8969fbf47 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -98,4 +98,25 @@ and p.state = #{state} + +