|
|
|
@ -369,6 +369,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
return new PageData<>(list, page.getTotal()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<ItemPendingHandleDTO> listEpdcItems(Map<String, Object> params) { |
|
|
|
IPage<ItemPendingHandleDTO> page = getPage(params); |
|
|
|
List<ItemPendingHandleDTO> list = baseDao.listEpdcItems(params); |
|
|
|
Map<String, Long> map = listItemHandleDept(); |
|
|
|
list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); |
|
|
|
return new PageData<>(list, page.getTotal()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<ItemPendingHandleDTO> itemPageList(Map<String, Object> params) { |
|
|
|
IPage<ItemPendingHandleDTO> page = getPage(params); |
|
|
|
@ -799,7 +808,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
throw new RenException("未查到用户相关部门信息。"); |
|
|
|
} |
|
|
|
ParentAndAllDeptDTO deptMsg = deptDTO.getData(); |
|
|
|
logger.info("获取完部门数据：" + deptMsg); |
|
|
|
|
|
|
|
ItemEntity entity = new ItemEntity(); |
|
|
|
entity.setUserId(user.getId().toString()); |
|
|
|
entity.setNickName(user.getUsername()); |
|
|
|
@ -822,7 +831,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
entity.setIssueLongitude(formDto.getLongitude()); |
|
|
|
entity.setIssueLatitude(formDto.getLatitude()); |
|
|
|
baseDao.insert(entity); |
|
|
|
logger.info("成功插入关联项目：" + entity); |
|
|
|
|
|
|
|
return new Result().ok(entity.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
@ -1765,7 +1774,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
itemInformationService.insert(itemInfoEachDto); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 关闭和结案处理
|
|
|
|
} else { |
|
|
|
log.info("处理项目-查询已吹哨部门"); |
|
|
|
@ -2760,9 +2768,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
returnMsgBody = processHistory.toString(); |
|
|
|
List<EventProcessResultDto> progressList = processHistory.getHISTORY(); |
|
|
|
if (null != progressList && progressList.size() > 0) { |
|
|
|
// 删除已有的<网格化平台处理记录>
|
|
|
|
//22.9.22 之前是全删全中曾逻辑 现在不在删除历史数据 只是增加历史数据时间之后的新数据
|
|
|
|
//this.removeOldHandleProcess(dto.getId());
|
|
|
|
// 保存新的处理记录
|
|
|
|
this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId()); |
|
|
|
// 查询最新处理情况
|
|
|
|
@ -2820,7 +2826,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
wrapper.eq("created_by", "网格化平台"); |
|
|
|
wrapper.eq("del_flag", NumConstant.ZERO_STR); |
|
|
|
// 任何主动在流程表里插入的网格化操作都应该在过滤列表中，为了能够正常拉取网格化流程数据
|
|
|
|
wrapper.notIn("state", ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); |
|
|
|
wrapper.notIn("state", |
|
|
|
ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), |
|
|
|
ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue(), |
|
|
|
ItemHandleCategoryEnum.HANDLE_I_HANDLE_GOV_WHISTLE.getValue(), |
|
|
|
ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue(), |
|
|
|
ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_FK.getValue(), |
|
|
|
ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); |
|
|
|
wrapper.orderByDesc("created_time"); |
|
|
|
wrapper.last("limit 1"); |
|
|
|
ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectOne(wrapper); |
|
|
|
@ -3910,7 +3922,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
if ("0".equals(formDto.getState())) { |
|
|
|
ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); |
|
|
|
log.info("根据id查询数据"); |
|
|
|
|
|
|
|
itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); |
|
|
|
//判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取平台处置意见
|
|
|
|
if ("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())) { |
|
|
|
@ -4118,10 +4130,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
// 定义【其他】
|
|
|
|
// 定义【其它】
|
|
|
|
CategoryAnalysisPieResultDTO elseCategory = new CategoryAnalysisPieResultDTO(); |
|
|
|
elseCategory.setCode("其他"); |
|
|
|
elseCategory.setName("其他"); |
|
|
|
elseCategory.setCode("其它"); |
|
|
|
elseCategory.setName("其它"); |
|
|
|
elseCategory.setValue(elseValue.toString()); |
|
|
|
resultList.add(elseCategory); |
|
|
|
|
|
|
|
@ -4264,7 +4276,49 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result supervise(AppealSuperviseResultDTO formDto){ |
|
|
|
public Result whistle2Gov(ItemWhistle2GovFormDTO formDTO) { |
|
|
|
ItemHandleProcessEntity process = new ItemHandleProcessEntity(); |
|
|
|
ItemEntity item = baseDao.selectById(formDTO.getId()); |
|
|
|
if (item == null) { |
|
|
|
return new Result().error("未查到相关项目，项目ID：" + formDTO.getId()); |
|
|
|
} |
|
|
|
// 吹哨上报
|
|
|
|
pushToCityGridService.appealWhistleReport(formDTO); |
|
|
|
// 吹哨后记录流程，如果吹市中心失败，删掉流程即可正常操作
|
|
|
|
process.setItemId(item.getId()); |
|
|
|
process.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GOV_WHISTLE.getValue()); |
|
|
|
process.setHandleAdvice(formDTO.getReason()); |
|
|
|
process.setOutHandleAdvice(formDTO.getReason()); |
|
|
|
process.setHandlerDept(SecurityUser.getUser().getDeptName()); |
|
|
|
process.setHandlerDeptId(SecurityUser.getDeptId()); |
|
|
|
itemHandleProcessDao.insert(process); |
|
|
|
|
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result supervise(AppealSuperviseResultDTO formDTO) { |
|
|
|
ItemHandleProcessEntity process = new ItemHandleProcessEntity(); |
|
|
|
ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); |
|
|
|
// 变更为市平台吹哨项目
|
|
|
|
item.setIsWhistle(NumConstant.ONE_STR); |
|
|
|
updateById(item); |
|
|
|
|
|
|
|
if (item == null) { |
|
|
|
return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); |
|
|
|
} |
|
|
|
process.setItemId(item.getId()); |
|
|
|
process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); |
|
|
|
process.setHandleAdvice(formDTO.getDbnr()); |
|
|
|
process.setOutHandleAdvice(formDTO.getDbnr()); |
|
|
|
process.setHandlerDept("青诉即办平台"); |
|
|
|
process.setHandlerDeptId(1L); |
|
|
|
process.setGridPartyname(formDTO.getDbr()); |
|
|
|
itemHandleProcessDao.insert(process); |
|
|
|
|
|
|
|
// 更新创建时间
|
|
|
|
process.setCreatedTime(DateUtils.parse(formDTO.getDbsj(), DateUtils.DATE_TIME_PATTERN)); |
|
|
|
itemHandleProcessDao.updateById(process); |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
/** |
|
|
|
@ -4705,12 +4759,50 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public Result reportReject(AppealWhistleReportRejectResultDTO formDto){ |
|
|
|
public Result reportReject(AppealWhistleReportRejectResultDTO formDTO) { |
|
|
|
ItemHandleProcessEntity process = new ItemHandleProcessEntity(); |
|
|
|
ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); |
|
|
|
if (item == null) { |
|
|
|
return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); |
|
|
|
} |
|
|
|
process.setItemId(item.getId()); |
|
|
|
process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); |
|
|
|
process.setHandleAdvice(formDTO.getBhyy()); |
|
|
|
process.setOutHandleAdvice(formDTO.getBhyy()); |
|
|
|
process.setHandlerDept("青诉即办平台"); |
|
|
|
process.setHandlerDeptId(1L); |
|
|
|
process.setGridPartyid(formDTO.getBhrId()); |
|
|
|
process.setGridPartyname(formDTO.getBhr()); |
|
|
|
itemHandleProcessDao.insert(process); |
|
|
|
|
|
|
|
// 更新创建时间
|
|
|
|
process.setCreatedTime(DateUtils.parse(formDTO.getBhsj(), DateUtils.DATE_TIME_PATTERN)); |
|
|
|
itemHandleProcessDao.updateById(process); |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result feedback(AppealWhistleFeedbackResultDTO formDto){ |
|
|
|
public Result feedback(AppealWhistleFeedbackResultDTO formDTO) { |
|
|
|
ItemHandleProcessEntity process = new ItemHandleProcessEntity(); |
|
|
|
ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); |
|
|
|
if (item == null) { |
|
|
|
return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); |
|
|
|
} |
|
|
|
process.setItemId(item.getId()); |
|
|
|
process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); |
|
|
|
process.setHandleAdvice(formDTO.getCljg()); |
|
|
|
process.setOutHandleAdvice(formDTO.getCljg()); |
|
|
|
process.setHandlerDept("青诉即办平台"); |
|
|
|
process.setHandlerDeptId(1L); |
|
|
|
process.setGridPartyid(formDTO.getClrId()); |
|
|
|
process.setGridPartyname(formDTO.getClr()); |
|
|
|
process.setGridUnitid(formDTO.getCldwId()); |
|
|
|
process.setGridUnitname(formDTO.getCldw()); |
|
|
|
itemHandleProcessDao.insert(process); |
|
|
|
|
|
|
|
// 更新创建时间
|
|
|
|
process.setCreatedTime(DateUtils.parse(formDTO.getFksj(), DateUtils.DATE_TIME_PATTERN)); |
|
|
|
itemHandleProcessDao.updateById(process); |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
zhangyuan
3 years ago