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 7d416b296..1fea720bd 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 @@ -27,8 +27,16 @@ public interface PushToCityGridConstant { */ public final static String APPEAL_DISPATCH = "http://ip:port/case/dispatch"; + /** + * 诉求结案 + */ public final static String CASE_CLOSED = "http://ip:port/case/closed"; + /** + * 派遣审核 + */ + public final static String DISP_ATCH_AUDIT = "http://ip:port/case/dispatchAudit"; + /** * 诉求废弃 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java new file mode 100644 index 000000000..7d28fe3a2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class DispatchAuditResultDto { + + @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; + @JsonProperty("shjg") + private String shjg; + @JsonProperty("cznr") + private String cznr; + + @NoArgsConstructor + @Data + public static class CzrDTO { + @JsonProperty("id") + private String id; + @JsonProperty("xm") + private String xm; + @JsonProperty("ssjgid") + private String ssjgid; + @JsonProperty("ssjgmc") + private String ssjgmc; + @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/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 ce21c4c79..99cce21e8 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 @@ -94,4 +94,7 @@ public interface ItemHandleProcessDao extends BaseDao { * @date 2022/9/16 15:18 */ List listProcessByStateAndDate(@Param("state") String state, @Param("date") String date); + + List getDispatchAudit(String state); + } 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 66bab7935..c8309a96f 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 @@ -56,6 +56,15 @@ public interface PushToCityGridService { * @date 2022/9/19 9:40 */ void appealSupervise(); + /** + * 派遣审核 + * + * @param + * @return void + * @author LZN + * @date 2022/9/19 9:44 + */ + void DispatchAudit(); /** * 吹哨上报 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 6c77430a9..5b080eaab 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 @@ -18,6 +18,13 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO; +import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; +import com.elink.esua.epdc.commons.tools.enums.CityPushEnum; +import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum; +import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum; @@ -36,6 +43,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -52,7 +60,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { private Logger logger = LogManager.getLogger(PushToCityGridServiceImpl.class); - @Autowired + @Resource private ItemHandleProcessDao itemHandleProcessDao; @Autowired @@ -137,7 +145,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { List itemProcessDto = itemHandleProcessDao.getHandler(isPartyMember); - // 组装数据(未完成) + // 组装数据(未完成) todo for (ItemHandleProcessCaseClosedToCityDTO item: itemProcessDto) { PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO(); @@ -215,4 +223,45 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } + /** + * 派遣审核 + * + * @param + * @return void + * @author LZN + * @date 2022/9/19 9:44 + */ + @Override + public void DispatchAudit() { + String state = "11"; + List list = itemHandleProcessDao.getDispatchAudit(state); + + // 添加值 todo + for(ItemHandleProcessToCityResultDTO item : list) { + DispatchAuditResultDto data = new DispatchAuditResultDto(); + + // 诉求id + data.setSqid(""); + // 诉求状态(待审核) + data.setSqzt(CityPushStateEnum.DJA.getCode()); + // 当前处理环节 + data.setDqclhj(""); + // 审核时间 + data.setCzsj(new Date().toString()); + // 审核结果 + data.setShjg(""); + // 审核意见 + data.setCznr(""); + + // 操作人 + DispatchAuditResultDto.CzrDTO dto = new DispatchAuditResultDto.CzrDTO(); + + dto.setId(("")); + dto.setXm(""); + + + cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核"); + } + } + } 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 894ce6351..fd22a0110 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 @@ -54,4 +54,15 @@ +