diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 568a831e4..cec06ab4f 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 568a831e4f4cd768f06bea9442509272fdc3d99d +Subproject commit cec06ab4f0e34d3cbc28b599d6a5e8b90308e206 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAbandonResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAbandonResultDTO.java new file mode 100644 index 000000000..beed0cd2b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAbandonResultDTO.java @@ -0,0 +1,94 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 诉求废弃 + * + * @author zhy + * @date 2022/9/16 15:10 + */ +@NoArgsConstructor +@Data +public class AppealAbandonResultDTO { + + + /** + * 诉求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; + + /** + * 废弃原因 + */ + @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/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 655fad0e4..2c666b2fd 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 @@ -36,41 +36,51 @@ import java.util.List; public interface ItemHandleProcessDao extends BaseDao { /** - * * 保存处理进度 * - * @params [dto] * @return void + * @params [dto] * @author liuchuang * @since 2019/12/26 19:12 */ void insertItemHandleProcess(ItemHandleProcessDTO dto); /** - * * 更新操作人部门名称 * - * @params [newDeptName, deptId] * @return void + * @params [newDeptName, deptId] * @author liuchuang * @since 2020/3/7 1:20 */ void updateDeptNameByDeptId(String newDeptName, Long deptId); /** - * @describe: 查询项目的最后一次吹哨记录 - * @author wangtong - * @date 2022/9/9 2:10 - * @params [itemId] - * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity - */ + * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity + * @describe: 查询项目的最后一次吹哨记录 + * @author wangtong + * @date 2022/9/9 2:10 + * @params [itemId] + */ ItemHandleProcessEntity selectByItemIdBestNew(@Param("itemId") String itemId); /** * 诉求派遣 + * * @param state * @return */ List getProcessListByState(@Param("state") String state); + + + /** + * 根据流程编号和日期获取流程数据 + * + * @param state + * @return java.util.List + * @author zhy + * @date 2022/9/16 15:18 + */ + List listProcessByStateAndDate(@Param("state") String state, @Param("date") String date); } 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 f0268891d..fb80892d6 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 @@ -32,5 +32,13 @@ public interface PushToCityGridService { */ void appealDispatch(); - + /** + * 诉求废弃 + * + * @param + * @return void + * @author zhy + * @date 2022/9/16 15:17 + */ + void appealAbandon(); } 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 4e1b05424..1878b9127 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 @@ -17,8 +17,12 @@ package com.elink.esua.epdc.modules.item.service.impl; +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.utils.DateUtils; import com.elink.esua.epdc.constant.PushToCityGridConstant; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.result.AppealAbandonResultDTO; import com.elink.esua.epdc.dto.item.result.AppealDispatchResultDto; import com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO; import com.elink.esua.epdc.gird.city.api.CityGridApi; @@ -30,6 +34,8 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -67,9 +73,32 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_DISPATCH,"诉求派遣"); } + } - - + @Override + public void appealAbandon() { + // 昨天 + String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + // 作废流程数据 + List list = itemHandleProcessDao.listProcessByStateAndDate("1061", date); + List sendData = new ArrayList<>(); + // 拼接数据 + list.forEach(item -> { + AppealAbandonResultDTO dto = new AppealAbandonResultDTO(); + + dto.setSqid(item.getItemId()); + dto.setSqzt(CityPushStateEnum.FQ.getCode()); + dto.setDqclhj(CityPushLinkEnum.TJSH.getCode()); + dto.setCzsj(item.getCreatedTime().toString()); + dto.setCznr(item.getHandleAdvice()); + AppealAbandonResultDTO.CzrDTO czr = new AppealAbandonResultDTO.CzrDTO(); + // todo + dto.setCzr(czr); + sendData.add(dto); + }); + + // 逐条发送 + sendData.forEach(item -> cityGridApi.sendItemToCity(item, PushToCityGridConstant.APPEAL_DISPATCH, "诉求废弃")); } } 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 82c5ea233..043c533c9 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 @@ -31,4 +31,18 @@ where p.DEL_FLAG='0' and p.STATE = #{state} + +