Browse Source

【议题管理项目管理】【代码整洁】-王公峰-2020-05-15

feature/dangjian
wanggongfeng 5 years ago
parent
commit
addff6542f
  1. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  2. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

5
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@ -187,9 +187,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
handleEntity.setAdvice(dto.getAdvice());
handleEntity.setState(dto.getState());
handleEntity.setIssueId(dto.getId());
UserDetail user = SecurityUser.getUser();
/*handleEntity.setHandlerDeptId(user.getDeptId());
handleEntity.setHandlerDept(user.getDeptName());*/
handleEntity.setHandlerDeptId(dto.getHandlerDeptId());
handleEntity.setHandlerDept(dto.getHandlerDept());
@ -237,8 +234,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING);
itemHandleProcessEntity.setHandleAdvice(dto.getAdvice());
itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice());
/*itemHandleProcessEntity.setHandlerDeptId(user.getDeptId());
itemHandleProcessEntity.setHandlerDept(user.getDeptName());*/
itemHandleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId());
itemHandleProcessEntity.setHandlerDept(dto.getHandlerDept());
itemHandleProcessService.insert(itemHandleProcessEntity);

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -322,22 +322,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public ItemDetailForPCEndResultDTO getItemDetailById(String id) {
// 详情
ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id);
/*UserDetail user = SecurityUser.getUser();
// 获取已流转部门
List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId());
// 获取可操作处理和可流转部门
switch (user.getTypeKey()) {
case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY:
resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS);
break;
case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY:
case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT:
case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT:
resultDTO = this.getHandleCategory(resultDTO);
break;
case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY:
resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS);
}*/
//获取项目基本信息
ItemEntity entity = this.selectById(id);
// 获取项目处理进度
@ -632,8 +616,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
informationFormDTO.setRelBusinessContent("项目:" + entity.getItemContent());
ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
/*handleProcessEntity.setHandlerDeptId(user.getDeptId());
handleProcessEntity.setHandlerDept(user.getDeptName());*/
handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId());
handleProcessEntity.setHandlerDept(dto.getHandlerDept());
handleProcessEntity.setItemId(dto.getId());

Loading…
Cancel
Save