diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java index 404ef0d83..eec80f1e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java @@ -51,8 +51,8 @@ public class PushToCityGridController { * @date 2022/9/20 10:48 */ @PostMapping("AppealReporting") - public Result AppealReporting(String itemId,Integer state){ - return pushToCityGridService.AppealReporting(itemId,state); + public Result AppealReporting(String itemId,Integer state,String source){ + return pushToCityGridService.AppealReporting(itemId,state,source); } /** 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 0c25bc4ee..413a0c339 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 @@ -107,7 +107,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:22 */ - Result AppealReporting(String itemId,Integer state); + Result AppealReporting(String itemId,Integer state,String source); /** * 事件感知 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index f89d1bc1b..4c08ab5fb 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1162,7 +1162,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); // 网格吹哨,上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState(),NumConstant.ZERO_STR); log.info("网格吹哨，上报市平台-结束"); // 上报网格化平台（社区吹哨） } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { @@ -1174,7 +1174,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("处理项目-上报网格化平台-if结束"); //社区吹哨，上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState(),NumConstant.ZERO_STR); log.info("社区吹哨-上报市平台-结束"); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { @@ -1233,7 +1233,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 网格结案，社区结案，上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState(),NumConstant.ZERO_STR); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); @@ -2481,7 +2481,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) { - pushToCityGridService.AppealReporting(dto.getItemId(),dto.getState()); + pushToCityGridService.AppealReporting(dto.getItemId(),dto.getState(),NumConstant.ONE_STR); } } @@ -3119,7 +3119,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //同意 process.setState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); // 社区审批，上报市平台 - pushToCityGridService.AppealReporting(process.getItemId(),process.getState()); + pushToCityGridService.AppealReporting(process.getItemId(),process.getState(),NumConstant.ZERO_STR); process.setOutHandleAdvice("街道网格化平台正在处理。"); }else if("1".equals(formDto.getCheckFlag())){ //不同意，返回网格待处理列表 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 28426df8f..3752b0365 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 @@ -231,17 +231,17 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO(); // 操作人员名称 - czr.setXm(item.getGridPartyname()); + czr.setXm(item.getGridPartyname() + "HAHA"); // 操作人员唯一标识 - czr.setId(item.getGridPartyid()); + czr.setId(item.getGridPartyid() + "001"); // 所属机构Id - czr.setSsjgbm(item.getGridUnitid()); + czr.setSsjgbm(item.getGridUnitid() + "002"); // 所属机构 - czr.setSsjg(item.getGridUnitname()); + czr.setSsjg(item.getGridUnitname() + "机构111"); //所属部门id - czr.setSsbmbm(item.getGridUnitid()); + czr.setSsbmbm(item.getGridUnitid() + "003"); // 所属部门名称 - czr.setSsbm(item.getGridUnitname()); + czr.setSsbm(item.getGridUnitname() + "部门111"); // 传数据 data.setCzr(czr); @@ -435,7 +435,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:22 */ @Override - public Result AppealReporting(String itemId, Integer states) { + public Result AppealReporting(String itemId, Integer states,String source) { int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(state, itemId); @@ -457,18 +457,33 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO(); - // 操作人姓名 - dto.setXm(item.getGridPartyname()); - // 操作人员唯一标识 - dto.setId(item.getGridPartyid()); - // 所属机构id - dto.setSsjgbm(item.getGridUnitid()); - // 所属机构名称 - dto.setSsjg(item.getGridUnitname()); - // 所属部门id - dto.setSsbmbm(item.getGridUnitid()); - // 所属部门名称 - dto.setSsbm(item.getGridUnitname()); + if(source.equals(NumConstant.ONE_STR)) { + // 操作人姓名 + dto.setXm(item.getGridPartyname()); + // 操作人员唯一标识 + dto.setId(item.getGridPartyid()); + // 所属机构名称 + dto.setSsjg(item.getGridUnitname()); + // 所属部门id + dto.setSsbmbm(item.getGridUnitid()); + // 所属部门名称 + dto.setSsbm(item.getGridUnitname()); + // 所属机构编码 + Result dtoResult = adminFeignClient.getSysDeptInfo(item.getHandlerDeptId()); + if (dtoResult.success() && null != dtoResult.getData()) { + SysDeptDTO sysDeptDTO = dtoResult.getData(); + if(sysDeptDTO.getTypeKey().equals("community_party")) { + // 所属机构id + dto.setSsjgbm(sysDeptDTO.getDisCenterZoningCode()); + }else if(sysDeptDTO.getTypeKey().equals("grid_party")) { + dto.setSsjgbm(adminFeignClient.getCompleteDept(item.getHandlerDeptId()).toString()); + } + } + } else { + dto.setXm(item.getCreatedBy()); + dto.setSsbmbm(item.getHandlerDeptId()+""); + dto.setSsbm(item.getHandlerDept()); + } // 组装完成，推送 data.setCzr(dto); @@ -511,17 +526,17 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人 ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO(); // 操作人姓名 - dto.setXm(item.getGridPartyname()); + dto.setXm(item.getGridPartyname() + "HAHA"); // 操作人员唯一标识 - dto.setId(item.getGridPartyid()); + dto.setId(item.getGridPartyid() + "0001"); // 所属机构id - dto.setSsjgbm(item.getGridUnitid()); + dto.setSsjgbm(item.getGridUnitid() + "0002"); // 所属机构名称 - dto.setSsjg(item.getGridUnitname()); + dto.setSsjg(item.getGridUnitname() + "机构222"); // 所属部门id - dto.setSsbmbm(item.getGridUnitid()); + dto.setSsbmbm(item.getGridUnitid() + "0003"); // 所属部门名称 - dto.setSsbm(item.getGridUnitname()); + dto.setSsbm(item.getGridUnitname() + "部门222"); // 组装完成，推送 data.setCzr(dto);