|
|
|
@ -213,12 +213,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
//部门ID列表
|
|
|
|
List<Long> deptIdList = new ArrayList<>(); |
|
|
|
// 判断是否为网格,不为网格只能查看本部门下的项目数据
|
|
|
|
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { |
|
|
|
// 判断是否为社区网格,不为社区网格只能查看本部门下的项目数据
|
|
|
|
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) { |
|
|
|
deptIdList = user.getDeptIdList(); |
|
|
|
} else { |
|
|
|
deptIdList.add(user.getDeptId()); |
|
|
|
} |
|
|
|
if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){ |
|
|
|
params.put("isRemind", "isRemind"); |
|
|
|
} |
|
|
|
params.put("deptIdList", null); |
|
|
|
if (null != deptIdList && deptIdList.size() > 0) { |
|
|
|
params.put("deptIdList", deptIdList); |
|
|
|
@ -349,7 +352,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
//保存到执法诉求详情表
|
|
|
|
formDto.setItemId(itemEntity.getId()); |
|
|
|
itemLawService.saveLawDetail(formDto); |
|
|
|
// 插入项目处理流程表
|
|
|
|
ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); |
|
|
|
itemHandleProcessEntity.setItemId(itemEntity.getId()); |
|
|
|
itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); |
|
|
|
itemHandleProcessEntity.setHandleAdvice("执法诉求上报"); |
|
|
|
itemHandleProcessEntity.setOutHandleAdvice("执法诉求上报"); |
|
|
|
itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); |
|
|
|
itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid()); |
|
|
|
itemHandleProcessService.insert(itemHandleProcessEntity); |
|
|
|
//todo bssb上报网格化平台
|
|
|
|
//发送事件至区中心
|
|
|
|
ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); |
|
|
|
dto.setId(formDto.getItemId()); |
|
|
|
dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); |
|
|
|
dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); |
|
|
|
sendItemToDsf(dto,itemHandleProcessEntity); |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -944,7 +962,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); |
|
|
|
List<Long> newDeptIds = new ArrayList<>(); |
|
|
|
// List<ItemCirculationDeptResultDTO> circulationDeptResultDTOS = dto.getDeptResultDTOS();
|
|
|
|
// for (ItemCirculationDeptResultDTO circulationDto : circulationDeptResultDTOS) {
|
|
|
|
// for (ItemCirculationDeptResultDTO circulationDto :
|
|
|
|
// circulationDeptResultDTOS) {
|
|
|
|
// newDeptIds.add(circulationDto.getDeptId());
|
|
|
|
// }
|
|
|
|
|
|
|
|
@ -2262,11 +2281,34 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
|
|
|
|
// 保存图片
|
|
|
|
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS); |
|
|
|
// 插入项目处理流程表
|
|
|
|
ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); |
|
|
|
itemHandleProcessEntity.setItemId(entity.getId()); |
|
|
|
itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); |
|
|
|
if("0".equals(formDto.getPeopleFlag())){ |
|
|
|
itemHandleProcessEntity.setHandleAdvice("民生诉求上报"); |
|
|
|
itemHandleProcessEntity.setOutHandleAdvice("民生诉求上报"); |
|
|
|
}else{ |
|
|
|
itemHandleProcessEntity.setHandleAdvice("发展诉求上报"); |
|
|
|
itemHandleProcessEntity.setOutHandleAdvice("发展诉求上报"); |
|
|
|
} |
|
|
|
itemHandleProcessEntity.setHandlerDeptId(entity.getGridId()); |
|
|
|
itemHandleProcessEntity.setHandlerDept(entity.getGrid()); |
|
|
|
itemHandleProcessService.insert(itemHandleProcessEntity); |
|
|
|
//发送事件至区中心
|
|
|
|
if("1".equals(formDto.getPeopleFlag())){ |
|
|
|
ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); |
|
|
|
dto.setId(entity.getId()); |
|
|
|
dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); |
|
|
|
dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); |
|
|
|
sendItemToDsf(dto,itemHandleProcessEntity); |
|
|
|
} |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* |
|
|
|
* @param params |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
|