diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index 322bd8557..15f942147 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java @@ -138,4 +138,14 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 上级部门名称 */ private String parentDeptName; + + /** + * 办理人姓名 + */ + private String handlePeopleName; + + /** + * 办理人办公电话 + */ + private String handlePeopleMobile; } 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 a2abb4099..ee34c7cb0 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 @@ -891,7 +891,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - //当前操作人部门tyeKey + // 当前操作人部门tyeKey String sendTypeKey = ""; log.info("处理项目-进入判断"); // 吹哨 @@ -925,11 +925,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessService.insert(handleProcessEntity); // 新增流转协助部门 itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); - List circulationDeptResultDTOS = dto.getDeptResultDTOS(); + + // 根据操作人部门,获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); + SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + sendTypeKey = sysDeptDTO.getTypeKey(); + // 手动拼接流转协助部门 + ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); + itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); + itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName()); + itemCirculationDeptResultDTO.setSelected(false); + itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); + List deptList = new ArrayList(); + deptList.add(itemCirculationDeptResultDTO); + dto.setDeptResultDTOS(deptList); + List newDeptIds = new ArrayList<>(); - for (ItemCirculationDeptResultDTO circulationDto : circulationDeptResultDTOS) { - newDeptIds.add(circulationDto.getDeptId()); - } + + newDeptIds.add(sysDeptDTO.getPid()); + TreeSet longTreeSet = new TreeSet<>(); longTreeSet.addAll(oldDeptIds); longTreeSet.addAll(newDeptIds); @@ -1042,6 +1056,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setId(dto.getId()); itemEntity.setLastHandleTime(new Date()); + // 结案申请时,需要更新【办理人姓名】【办理人办公电话】 + if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){ + itemEntity.setHandlePeopleName(dto.getHandlePeopleName()); + itemEntity.setHandlePeopleMobile(dto.getHandlePeopleMobile()); + } + // 初始化分类 if (StringUtils.isNotBlank(dto.getCategoryId())) { EventsCategoryDTO categoryInfo = this.initCategoryInfo(dto.getCategoryId()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index f7283ea4e..fbef23bb2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -582,6 +582,8 @@ + + @@ -610,6 +612,8 @@ item.ISSUE_LONGITUDE, item.USER_FACE, item.GRID_ID, + item.HANDLE_PEOPLE_NAME, + item.HANDLE_PEOPLE_MOBILE, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.COMMENT_NUM,