diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index dd298b9fe..d73cf1a3f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -19,7 +19,7 @@ public class ItemHandleSubmitFormDTO implements Serializable { /** * 项目ID */ - private String itemId; + private String id; /** * 处理意见(内部) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java index bb2122d08..f3c5617da 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java @@ -66,7 +66,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl implem handleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); // 删除已流转协助部门 - itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getItemId()); + itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId()); // 新增流转协助部门 itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto); } else { @@ -394,17 +394,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { ItemEntity itemEntity = new ItemEntity(); - itemEntity.setId(dto.getItemId()); + itemEntity.setId(dto.getId()); itemEntity.setItemState(dto.getHandleCategory()); this.insert(itemEntity); // 结案 保存部门满意度评价 if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { - itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getItemId(), SecurityUser.getDeptId()); + itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId()); } } } // 记录处理记录 - handleProcessEntity.setItemId(dto.getItemId()); + handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); handleProcessEntity.setHandlerDeptId(SecurityUser.getDeptId()); @@ -442,7 +442,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("获取机构信息失败,请稍后重试"); } // 获取街道党工委已流转协助部门 - List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), completeDept.getData().getStreetId()); + List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getId(), completeDept.getData().getStreetId()); if (null != itemDeptDTOS && itemDeptDTOS.size() > 0) { return new Result().error(completeDept.getData().getStreet()+"已将该项目流转协助到其他部门,不能重新流转协助"); } 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 daaf6e65a..24deb0dab 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 @@ -262,7 +262,7 @@ - +