|
|
|
@ -82,6 +82,7 @@ import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao; |
|
|
|
import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; |
|
|
|
import com.elink.esua.epdc.modules.item.entity.*; |
|
|
|
import com.elink.esua.epdc.modules.item.service.*; |
|
|
|
import com.elink.esua.epdc.modules.rolecategory.service.HandleRoleCategoryService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.logging.log4j.LogManager; |
|
|
|
import org.apache.logging.log4j.Logger; |
|
|
|
@ -161,6 +162,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
@Autowired |
|
|
|
private IssueOverseeResultsTask issueOverseeResultsTask; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private HandleRoleCategoryService handleRoleCategoryService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<ItemDTO> page(Map<String, Object> params) { |
|
|
|
IPage<ItemEntity> page = baseDao.selectPage( |
|
|
|
@ -331,18 +335,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
// 获取已流转部门
|
|
|
|
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); |
|
|
|
} |
|
|
|
resultDTO = getHandleCategoryAndCirculationDept(resultDTO, user.getId()); |
|
|
|
//获取项目基本信息
|
|
|
|
ItemEntity entity = this.selectById(id); |
|
|
|
// 获取项目处理进度
|
|
|
|
@ -356,6 +349,29 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
return resultDTO; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param resultDTO |
|
|
|
* @param userId |
|
|
|
* @return com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO |
|
|
|
* @Author yinzuomei |
|
|
|
* @Description 可处理操作、吹哨部门数据来源改为从关系表获取 |
|
|
|
* @Date 2020/2/3 8:02 |
|
|
|
**/ |
|
|
|
private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDept(ItemDetailForPCEndResultDTO resultDTO, |
|
|
|
Long userId) { |
|
|
|
Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(userId); |
|
|
|
if (!roleIdList.success() || roleIdList.getData().isEmpty()) { |
|
|
|
throw new RenException("获取角色Id列表失败"); |
|
|
|
} |
|
|
|
//可处理操作
|
|
|
|
List<ItemHandleResultDTO> handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData()); |
|
|
|
//可流转部门
|
|
|
|
List<ItemCirculationDeptResultDTO> deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData()); |
|
|
|
resultDTO.setHandleResultDTOS(handleResultDTOS); |
|
|
|
resultDTO.setDeptResultDTOS(deptResultDTOS); |
|
|
|
return resultDTO; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 项目详情-网格-可做操作和可流转部门 |
|
|
|
* |
|
|
|
@ -1276,14 +1292,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @Description: 某三种情况下， 查询当前项目下的上级部门id，做去重处理，向部门下的所有人员发送短信 |
|
|
|
* @Description: 1.街道做吹哨, 做回应处理; 2.反馈回应; 3.上报网格化平台 |
|
|
|
* @Param: [dto] |
|
|
|
* @return: void |
|
|
|
* @Author: zy |
|
|
|
* @Date: 2020-01-14 |
|
|
|
*/ |
|
|
|
* @Param: [dto] |
|
|
|
* @return: void |
|
|
|
* @Author: zy |
|
|
|
* @Date: 2020-01-14 |
|
|
|
*/ |
|
|
|
private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){ |
|
|
|
UserDetail user = SecurityUser.getUser(); //获取当前登录人信息
|
|
|
|
List<Long> deptId = new ArrayList<>(); |
|
|
|
|
liuchuang