diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java new file mode 100644 index 000000000..c7110ebb7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingToCityResultDTO.java @@ -0,0 +1,150 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author:wgf + * @Date:2022/9/16 14:52 + */ +@Data +public class AppealHandlingToCityResultDTO implements Serializable { + private static final long serialVersionUID = 3624085359608359124L; + + private String id; + + /** + * 诉求详情 + */ + private String lawContent; + + /** + * 主办单位 + */ + private String hostUnit; + + /** + * 协办单位 + */ + private String assistUnit; + + /** + * 诉求分类 + */ + private String peopleFlag; + + /** + * 网格化平台-操作人标识 + */ + private String gridPartyid; + + /** + * 网格化平台-操作人名称 + */ + private String gridPartyname; + + /** + * 网格化平台-单位标识 + */ + private String gridUnitid; + + /** + * 网格化平台-单位名称 + */ + private String gridUnitname; + + /** + * 网格化平台-被派遣人员标识 + */ + private String gridNextpartid; + + /** + * 网格化平台-被派遣人员名称 + */ + private String gridNextpartname; + + /** + * 网格化平台-被派遣单位标识 + */ + private String gridNextunitid; + + /** + * 网格化平台-被派遣单位名称 + */ + private String gridNextunitname; + + /** + * 网格化平台-动作名称 + */ + private String gridTaskcnname; + + /** + * 项目ID + */ + private String itemId; + + /** + * 状态 + */ + private Integer state; + + /** + * 处理意见 + */ + private String handleAdvice; + + /** + * 处理意见(外部) + */ + private String outHandleAdvice; + + /** + * 结案审批部门ID + */ + private long closeCheckId; + + /** + * 操作人部门ID + */ + private long handlerDeptId; + + /** + * 操作人部门 + */ + private String handlerDept; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建者 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 修改者 + */ + private String updatedBy; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 是否已删除(0-未删除,1-已删除) + */ + private String delFlag; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java index 43da99fab..ce1ecd1df 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java @@ -6,6 +6,51 @@ import java.util.Date; @Data public class ItemHandleProcessCaseClosedToCityDTO { + + /** + * 网格化平台-操作人标识 + */ + private String gridPartyid; + + /** + * 网格化平台-操作人名称 + */ + private String gridPartyname; + + /** + * 网格化平台-单位标识 + */ + private String gridUnitid; + + /** + * 网格化平台-单位名称 + */ + private String gridUnitname; + + /** + * 网格化平台-被派遣人员标识 + */ + private String gridNextpartid; + + /** + * 网格化平台-被派遣人员名称 + */ + private String gridNextpartname; + + /** + * 网格化平台-被派遣单位标识 + */ + private String gridNextunitid; + + /** + * 网格化平台-被派遣单位名称 + */ + private String gridNextunitname; + + /** + * 网格化平台-动作名称 + */ + private String gridTaskcnname; /** * 项目ID */ @@ -77,8 +122,5 @@ public class ItemHandleProcessCaseClosedToCityDTO { */ private String delFlag; - /** - * 网格化平台-人员名称 - */ - private String gridPartyname; + } 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 dfd065aaa..21d819220 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 @@ -15,6 +15,58 @@ public class ItemHandleProcessToCityResultDTO implements Serializable { private String id; + private String lawContent; + + /** + * 诉求分类 + */ + private String peopleFlag; + + /** + * 网格化平台-操作人标识 + */ + private String gridPartyid; + + /** + * 网格化平台-操作人名称 + */ + private String gridPartyname; + + /** + * 网格化平台-单位标识 + */ + private String gridUnitid; + + /** + * 网格化平台-单位名称 + */ + private String gridUnitname; + + /** + * 网格化平台-被派遣人员标识 + */ + private String gridNextpartid; + + /** + * 网格化平台-被派遣人员名称 + */ + private String gridNextpartname; + + /** + * 网格化平台-被派遣单位标识 + */ + private String gridNextunitid; + + /** + * 网格化平台-被派遣单位名称 + */ + private String gridNextunitname; + + /** + * 网格化平台-动作名称 + */ + private String gridTaskcnname; + /** * 项目ID */ @@ -80,10 +132,6 @@ 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 e8d35b939..0d127a02e 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 @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.result.AppealHandlingToCityResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProcessCaseClosedToCityDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity; @@ -103,7 +104,7 @@ public interface ItemHandleProcessDao extends BaseDao { * @author LZN * @date 2022/9/19 10:25 */ - List getDispatchAudit(String state); + List getDispatchAudit(@Param("state") String state); /** * 诉求上报 @@ -113,21 +114,21 @@ public interface ItemHandleProcessDao extends BaseDao { * @author LZN * @date 2022/9/19 10:25 */ - List getAppealReporting(int state); + List getAppealReporting(@Param("state") int state); /** * 上报驳回 * @param state * @return */ - List getReportRejection(int state); + List getReportRejection(@Param("state") int state); /** * 诉求处理 * @param state * @return */ - List getAppealHandling(int state); + List getAppealHandling(@Param("state") 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 e4e7771ed..f3bbfbc5c 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 @@ -155,7 +155,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { int isPartyMember = ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue(); List itemProcessDto = itemHandleProcessDao.getHandler(isPartyMember); - // 组装数据(未完成) todo + // 组装数据 for (ItemHandleProcessCaseClosedToCityDTO item: itemProcessDto) { PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO(); @@ -173,7 +173,18 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO(); + // 操作人员名称 czr.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + czr.setId(item.getGridPartyid()); + // 所属机构Id + czr.setSsjgid(item.getGridUnitid()); + // 所属机构 + czr.setSsjg(item.getGridUnitname()); + //所属部门id + czr.setSsbmid(item.getGridUnitid()); + // 所属部门名称 + czr.setSsbmmc(item.getGridUnitname()); // 传数据 data.setCzr(czr); @@ -244,7 +255,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { String state = "1001"; List list = itemHandleProcessDao.getDispatchAudit(state); - // 添加值 todo + // 添加值 for(ItemHandleProcessToCityResultDTO item : list) { DispatchAuditResultDto data = new DispatchAuditResultDto(); @@ -253,11 +264,11 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 诉求状态(未知) data.setSqzt(CityPushStateEnum.DSH.getCode()); // 当前处理环节(未知) - data.setDqclhj(""); + data.setDqclhj(CityPushLinkEnum.KSLDSH.getCode()); // 审核时间 data.setCzsj(item.getCreatedTime()); // 审核结果(未知) - data.setShjg(""); + data.setShjg(NumConstant.ONE_STR); // 审核意见 data.setCznr(item.getHandleAdvice()); @@ -265,6 +276,16 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { DispatchAuditResultDto.CzrDTO dto = new DispatchAuditResultDto.CzrDTO(); // 操作人员姓名 dto.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + dto.setId(item.getGridPartyid()); + // 所属机构id + dto.setSsjgid(item.getGridUnitid()); + // 所属机构名称 + dto.setSsjgmc(item.getGridUnitname()); + // 所属部门id + dto.setSsbmid(item.getGridUnitid()); + // 所属部门名称 + dto.setSsbmmc(item.getGridUnitname()); // 组装完成,推送 data.setCzr(dto); @@ -330,7 +351,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); List list = itemHandleProcessDao.getAppealReporting(state); - // 处理数据 todo + // 处理数据 for(ItemHandleProcessToCityResultDTO item : list) { AppealReportResultDTO data = new AppealReportResultDTO(); @@ -338,9 +359,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 诉求id data.setSqid(getSqid(item.getItemId())); // 诉求状态(未知) - data.setSqzt(""); + data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节(未知) - data.setDqclhj(""); + data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); // 上报时间 data.setCzsj(item.getCreatedTime()); // 上报原因 @@ -350,6 +371,16 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO(); // 操作人姓名 dto.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + dto.setId(item.getGridPartyid()); + // 所属机构id + dto.setSsjgid(item.getGridUnitid()); + // 所属机构名称 + dto.setSsjgmc(item.getGridUnitname()); + // 所属部门id + dto.setSsbmid(item.getGridUnitid()); + // 所属部门名称 + dto.setSsbmmc(item.getGridUnitname()); // 组装完成,推送 data.setCzr(dto); @@ -371,7 +402,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { int state = ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); List list = itemHandleProcessDao.getReportRejection(state); - // 处理数据 todo + // 处理数据 for(ItemHandleProcessToCityResultDTO item : list) { ReportRejectionResultDTO data = new ReportRejectionResultDTO(); @@ -379,9 +410,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 诉求id data.setSqid(getSqid(item.getItemId())); // 诉求状态(未知) - data.setSqzt(""); + data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节(未知) - data.setDqclhj(""); + data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); // 驳回时间 data.setCzsj(item.getCreatedTime()); // 驳回原因 @@ -391,6 +422,16 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO(); // 操作人姓名 dto.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + dto.setId(item.getGridPartyid()); + // 所属机构id + dto.setSsjgid(item.getGridUnitid()); + // 所属机构名称 + dto.setSsjgmc(item.getGridUnitname()); + // 所属部门id + dto.setSsbmid(item.getGridUnitid()); + // 所属部门名称 + dto.setSsbmmc(item.getGridUnitname()); // 组装完成,推送 data.setCzr(dto); @@ -410,10 +451,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { @Override public Result AppealHandling() { int state = ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue(); - List list = itemHandleProcessDao.getAppealHandling(state); + List list = itemHandleProcessDao.getAppealHandling(state); - // 处理数据 todo - for(ItemHandleProcessToCityResultDTO item : list) { + // 处理数据 + for(AppealHandlingToCityResultDTO item : list) { AppealHandlingResultDTO data = new AppealHandlingResultDTO(); @@ -423,8 +464,23 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setSqzt(CityPushStateEnum.DCL.getCode()); // 当前处理环节 data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); - // 诉求类型(未知) - data.setSqlx(""); + + // 执法类型添加类型,纪要,进度字段 + if(item.getPeopleFlag().equals(NumConstant.TWO_STR)) { + // 诉求类型(未知) + data.setSqlx(NumConstant.TWO_STR); + // 会议纪要(未知) + data.setHyjy(item.getLawContent()); + + // 责任分工处理 + String hostUnit = item.getHostUnit().trim().replaceAll("|",","); // 主办 + String assistUnit = item.getAssistUnit().trim().replaceAll("|",","); // 协办 + data.setZrfg(hostUnit + "," + assistUnit); + + // 办理进度 + data.setBljd(""); + } + // 处理时间 data.setCzsj(item.getCreatedTime()); // 处理内容 @@ -434,21 +490,24 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { List urlList = itemHandleProcessDao.getURL(item.getItemId()); String url = ""; for (String i : urlList) { - url = i+ "," + url; + url = i + "," + url; } data.setClzp(url); - // 会议纪要(未知) - data.setHyjy(""); - // 责任分工 - data.setZrfg(""); - // 办理进度 - data.setBljd(""); - // 操作人 AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO(); // 操作人姓名 dto.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + dto.setId(item.getGridPartyid()); + // 所属机构id + dto.setSsjgid(item.getGridUnitid()); + // 所属机构名称 + dto.setSsjgmc(item.getGridUnitname()); + // 所属部门id + dto.setSsbmid(item.getGridUnitid()); + // 所属部门名称 + dto.setSsbmmc(item.getGridUnitname()); // 组装完成,推送 data.setCzr(dto); 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 c5a8a0ec0..1d261b254 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 @@ -100,11 +100,17 @@ and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)