|
|
|
@ -208,16 +208,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
public Result<List<ItemResultDTO>> listItemsByWork(ItemFormDTO formDto) { |
|
|
|
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); |
|
|
|
formDto.setPageIndex(pageIndex); |
|
|
|
// 查询半年内的数据
|
|
|
|
formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); |
|
|
|
// 查询项目状态 0-待处理，5-已关闭，10-已结案
|
|
|
|
int[] states = {EventIssueItemState.ITEM_HANDLING,EventIssueItemState.ITEM_CLOSED, EventIssueItemState.ITEM_CLOSEING_CASE}; |
|
|
|
List<ItemResultDTO> data = baseDao.selectListOfItems(formDto, states); |
|
|
|
List<ItemResultDTO> data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList()); |
|
|
|
return new Result<List<ItemResultDTO>>().ok(data); |
|
|
|
} |
|
|
|
@Override |
|
|
|
public Result<ItemDetailResultDTO> getItemDetailByWork(ItemDetailFormDTO formDto) { |
|
|
|
ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(formDto); |
|
|
|
public Result<ItemDetailResultDTO> getItemDetailByWork(String id) { |
|
|
|
ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(id); |
|
|
|
return new Result<ItemDetailResultDTO>().ok(resultDTO); |
|
|
|
} |
|
|
|
|
|
|
|
@ -383,21 +379,47 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(){ |
|
|
|
// 可流转部门
|
|
|
|
Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); |
|
|
|
if (!listResult.success()) { |
|
|
|
throw new RenException("获取流转协助部门失败"); |
|
|
|
} |
|
|
|
List<SysDeptDTO> deptDTOS = listResult.getData(); |
|
|
|
// 初始化可流转部门-街道党工委：街道部门、区直部门
|
|
|
|
UserDetail user = SecurityUser.getUser(); |
|
|
|
List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>(); |
|
|
|
for (SysDeptDTO dto : |
|
|
|
deptDTOS) { |
|
|
|
ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO(); |
|
|
|
circulationDeptResultDTO.setDeptId(dto.getId()); |
|
|
|
circulationDeptResultDTO.setDeptName(dto.getName()); |
|
|
|
circulationDeptResultDTO.setTypeKey(dto.getTypeKey()); |
|
|
|
deptResultDTOS.add(circulationDeptResultDTO); |
|
|
|
// 网格-可做操作和可流转部门
|
|
|
|
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { |
|
|
|
// 可流转部门
|
|
|
|
Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId()); |
|
|
|
if (!completeDept.success()) { |
|
|
|
throw new RenException("获取流转协助部门失败"); |
|
|
|
} |
|
|
|
|
|
|
|
CompleteDeptDTO completeDeptDTO = completeDept.getData(); |
|
|
|
// 直属社区
|
|
|
|
ItemCirculationDeptResultDTO circulationDeptCommunityResultDTO = new ItemCirculationDeptResultDTO(); |
|
|
|
circulationDeptCommunityResultDTO.setDeptId(completeDeptDTO.getCommunityId()); |
|
|
|
circulationDeptCommunityResultDTO.setDeptName(completeDeptDTO.getCommunity()); |
|
|
|
circulationDeptCommunityResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY); |
|
|
|
deptResultDTOS.add(circulationDeptCommunityResultDTO); |
|
|
|
// 直属街道
|
|
|
|
ItemCirculationDeptResultDTO circulationDeptStreetResultDTO = new ItemCirculationDeptResultDTO(); |
|
|
|
circulationDeptStreetResultDTO.setDeptId(completeDeptDTO.getStreetId()); |
|
|
|
circulationDeptStreetResultDTO.setDeptName(completeDeptDTO.getStreet()); |
|
|
|
circulationDeptStreetResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); |
|
|
|
deptResultDTOS.add(circulationDeptStreetResultDTO); |
|
|
|
|
|
|
|
} else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) { |
|
|
|
// 可流转部门
|
|
|
|
Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); |
|
|
|
if (!listResult.success()) { |
|
|
|
throw new RenException("获取流转协助部门失败"); |
|
|
|
} |
|
|
|
List<SysDeptDTO> deptDTOS = listResult.getData(); |
|
|
|
// 初始化可流转部门-街道党工委：街道部门、区直部门
|
|
|
|
for (SysDeptDTO dto : |
|
|
|
deptDTOS) { |
|
|
|
ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO(); |
|
|
|
circulationDeptResultDTO.setDeptId(dto.getId()); |
|
|
|
circulationDeptResultDTO.setDeptName(dto.getName()); |
|
|
|
circulationDeptResultDTO.setTypeKey(dto.getTypeKey()); |
|
|
|
deptResultDTOS.add(circulationDeptResultDTO); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return new Result<List<ItemCirculationDeptResultDTO>>().ok(deptResultDTOS); |
|
|
|
} |
|
|
|
|
李鹏飞
6 years ago