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 da9f21ca9..7189640a4 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 @@ -82,5 +82,25 @@ public interface PushToCityGridConstant { */ public final static String APPEAL_MSG = "http://ip:port/case/msg"; + /** + * 2.8 诉求退件 + */ + public final static String REBUT = "http://ip:port/case/rebut"; + + /** + * 2.9 退件审核 + */ + public final static String REBUT_AUDIT = "http://ip:port/case/rebutAudit"; + + /** + * 2.10 延期申请 + */ + public final static String DELAY_APPLY = "http://ip:port/case/delayApply"; + + /** + * 2.11 延期审核 + */ + public final static String DELAY_AUDIT = "http://ip:port/case/delayAudit"; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java new file mode 100644 index 000000000..09e191e16 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayApplyResultDTO.java @@ -0,0 +1,101 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 退件审核 + * + * @author sun + */ +@NoArgsConstructor +@Data +public class DelayApplyResultDTO { + + + /** + * 诉求ID + */ + @JsonProperty("sqid") + private String sqid; + + /** + * 诉求状态 + */ + @JsonProperty("sqzt") + private String sqzt; + + /** + * 当前处理环节 + */ + @JsonProperty("dqclhj") + private String dqclhj; + + /** + * 申请人员 + */ + @JsonProperty("sqr") + private SqrDTO sqr; + + /** + * 延期时限 诉求处理的最后时限 如:2022-09-01 18:23:00前完成 + */ + @JsonProperty("yqsx") + private Date yqsx; + + /** + * 申请时间 + */ + @JsonProperty("sqsj") + private Date sqsj; + + /** + * 申请内容 + */ + @JsonProperty("sqnr") + private String sqnr; + + @NoArgsConstructor + @Data + public static class SqrDTO { + + /** + * 操作人员Id + */ + @JsonProperty("id") + private String id; + + /** + * 操作人员 + */ + @JsonProperty("xm") + private String xm; + + /** + * 所属机构Id + */ + @JsonProperty("ssjgid") + private String ssjgid; + + /** + * 所属机构 + */ + @JsonProperty("ssjgmc") + private String ssjgmc; + + /** + * 所属部门Id + */ + @JsonProperty("ssbmid") + private String ssbmid; + + /** + * 所属部门 + */ + @JsonProperty("ssbmmc") + private String ssbmmc; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java new file mode 100644 index 000000000..1c1ed9b5f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DelayAuditResultDTO.java @@ -0,0 +1,99 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 退件审核 + * + * @author sun + */ +@NoArgsConstructor +@Data +public class DelayAuditResultDTO { + + + /** + * 诉求ID + */ + @JsonProperty("sqid") + private String sqid; + + /** + * 诉求状态 + */ + @JsonProperty("sqzt") + private String sqzt; + + /** + * 当前处理环节 + */ + @JsonProperty("dqclhj") + private String dqclhj; + + /** + * 审核人员 + */ + @JsonProperty("czr") + private CzrDTO czr; + + /** + * 审核结果 1:审核通过 0:审核不通过 + */ + @JsonProperty("czjg") + private String czjg; + + /** + * 审核时间 + */ + @JsonProperty("czsj") + private String czsj; + + /** + * 审核意见 + */ + @JsonProperty("czyj") + private String czyj; + + @NoArgsConstructor + @Data + public static class CzrDTO { + + /** + * 操作人员Id + */ + @JsonProperty("id") + private String id; + + /** + * 操作人员 + */ + @JsonProperty("xm") + private String xm; + + /** + * 所属机构Id + */ + @JsonProperty("ssjgid") + private String ssjgid; + + /** + * 所属机构 + */ + @JsonProperty("ssjgmc") + private String ssjgmc; + + /** + * 所属部门Id + */ + @JsonProperty("ssbmid") + private String ssbmid; + + /** + * 所属部门 + */ + @JsonProperty("ssbmmc") + private String ssbmmc; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java new file mode 100644 index 000000000..389685786 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/RebutAuditResultDTO.java @@ -0,0 +1,99 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 退件审核 + * + * @author sun + */ +@NoArgsConstructor +@Data +public class RebutAuditResultDTO { + + + /** + * 诉求ID + */ + @JsonProperty("sqid") + private String sqid; + + /** + * 诉求状态 + */ + @JsonProperty("sqzt") + private String sqzt; + + /** + * 当前处理环节 + */ + @JsonProperty("dqclhj") + private String dqclhj; + + /** + * 操作人 + */ + @JsonProperty("czr") + private CzrDTO czr; + + /** + * 废弃时间 + */ + @JsonProperty("czsj") + private String czsj; + + /** + * 1:审核通过 0:审核不通过 + */ + @JsonProperty("shjg") + private String shjg; + + /** + * 废弃原因 + */ + @JsonProperty("cznr") + private String cznr; + + @NoArgsConstructor + @Data + public static class CzrDTO { + + /** + * 操作人员Id + */ + @JsonProperty("id") + private String id; + + /** + * 操作人员 + */ + @JsonProperty("xm") + private String xm; + + /** + * 所属机构Id + */ + @JsonProperty("ssjgid") + private String ssjgid; + + /** + * 所属机构 + */ + @JsonProperty("ssjgmc") + private String ssjgmc; + + /** + * 所属部门Id + */ + @JsonProperty("ssbmid") + private String ssbmid; + + /** + * 所属部门 + */ + @JsonProperty("ssbmmc") + private String ssbmmc; + } +} 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 d7f4d38d0..d3bd6c788 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 @@ -145,4 +145,31 @@ public interface PushToCityGridService { */ void rebut(); + /** + * 2.9 退件审核 + * 用于各区平台向青诉即办平台反馈诉求退件审核情况, + * 为保证数据实时反馈至青诉即办, + * 各区平台应在诉求退件审核操作后及时调用接口,实时反馈退件审核情况。 + * @author sun + */ + void rebutAudit(); + + /** + * 2.10 延期申请 + * 用于各区市平台向青诉即办平台反馈诉求处理延期申请情况, + * 为保证数据实时反馈至青诉即办, + * 各区市平台应在诉求处理延期申请操作后及时调用接口,实时反馈办理情况。 + * @author sun + */ + void delayApply(); + + /** + * 2.11 延期审核 + * 用于各区市平台向青诉即办平台反馈诉求处理延期申请审核情况, + * 为保证数据实时反馈至青诉即办, + * 各区市平台应在诉求处理延期申请审核操作后及时调用接口,实时反馈办理情况。 + * @author sun + */ + void delayAudit(); + } 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 750f37e55..adcf41a41 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 @@ -470,7 +470,92 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // todo dto.setCzr(czr); // 组装好直接推送 - cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求退件"); + cityGridApi.sendItemToCity(dto, PushToCityGridConstant.REBUT, "诉求退件"); + }); + + } + + @Override + public void rebutAudit() { + // 昨天 + String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + // state=作废的流程数据 + List list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date); + + // 拼接数据 + list.forEach(item -> { + RebutAuditResultDTO dto = new RebutAuditResultDTO(); + dto.setSqid(getSqid(item.getItemId())); + dto.setSqzt(CityPushStateEnum.FQ.getCode()); + dto.setDqclhj(CityPushLinkEnum.TJSH.getCode()); + dto.setCzsj(item.getCreatedTime().toString()); + //审核结果 1:审核通过 0:审核不通过 + dto.setShjg(""); + dto.setCznr(item.getHandleAdvice()); + RebutAuditResultDTO.CzrDTO czr = new RebutAuditResultDTO.CzrDTO(); + // TODO + dto.setCzr(czr); + // 组装好直接推送 + cityGridApi.sendItemToCity(dto, PushToCityGridConstant.REBUT_AUDIT, "退件审核"); + }); + + } + + @Override + public void delayApply() { + // 昨天 + String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + // state=作废的流程数据 + List list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date); + + // 拼接数据 + list.forEach(item -> { + DelayApplyResultDTO dto = new DelayApplyResultDTO(); + dto.setSqid(getSqid(item.getItemId())); + dto.setSqzt(CityPushStateEnum.FQ.getCode()); + dto.setDqclhj(CityPushLinkEnum.TJSH.getCode()); + //延期时限 诉求处理的最后时限 如:2022-09-01 18:23:00前完成 + dto.setYqsx(new Date()); + //申请时间 + dto.setSqsj(item.getCreatedTime()); + //申请内容 + dto.setSqnr(""); + //申请人员 + DelayApplyResultDTO.SqrDTO sqr = new DelayApplyResultDTO.SqrDTO(); + // TODO + dto.setSqr(sqr); + // 组装好直接推送 + cityGridApi.sendItemToCity(dto, PushToCityGridConstant.DELAY_APPLY, "延期申请"); + }); + + } + + @Override + public void delayAudit() { + // 昨天 + String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + // state=作废的流程数据 + List list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date); + + // 拼接数据 + list.forEach(item -> { + DelayAuditResultDTO dto = new DelayAuditResultDTO(); + dto.setSqid(getSqid(item.getItemId())); + dto.setSqzt(CityPushStateEnum.FQ.getCode()); + dto.setDqclhj(CityPushLinkEnum.TJSH.getCode()); + + //审核结果 1:审核通过 0:审核不通过 + dto.setCzjg(""); + //审核时间 + dto.setCzsj(item.getCreatedTime().toString()); + //审核意见 + dto.setCzyj(""); + //审核人员 + DelayAuditResultDTO.CzrDTO czr = new DelayAuditResultDTO.CzrDTO(); + // TODO + dto.setCzr(czr); + // 组装好直接推送 + cityGridApi.sendItemToCity(dto, PushToCityGridConstant.DELAY_AUDIT, "延期审核"); }); }