diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index 6b1324891..c17c6cfbb 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -301,4 +301,20 @@ public class ItemDTO implements Serializable { */ private String evaluationContent; + /** + * 0，街道未申诉，1街道申诉，2区坐席驳回申诉 + */ + private String streetAppealFlag; + + + /** + * 区驳回原因 + */ + private String districtReject; + + /** + * 申诉材料文件链接 + */ + private String appealUrl; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index d7ad00e61..98d6b9844 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -792,19 +792,6 @@ public class ItemController { } - /** - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @description: 诉求申诉 - * @author qushutong - * @date 2023/9/14 15:06 - * @Version1.0 - **/ - @PostMapping("sqAppeal") - public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) { - - return itemService.sqAppeal(appealAuditFormDTO); - } /** * @param ’startTime endTime deptName @@ -914,6 +901,50 @@ public class ItemController { } + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @description: 区级诉求申诉 + * @author qushutong + * @date 2023/9/14 15:06 + * @Version1.0 + **/ + @PostMapping("sqAppeal") + public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) { + + return itemService.sqAppeal(appealAuditFormDTO); + } + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @description: 街道申诉 + * @author qushutong + * @date 2023/9/14 15:06 + * @Version1.0 + **/ + @PostMapping("streetAppeal") + public Result streetAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) { + + return itemService.streetAppeal(appealAuditFormDTO); + } + + /** + * + * @description: 区级驳回申诉 + * @author qushutong + * @date 2024/11/26 15:09 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("backAppeal") + public Result backAppeal(@RequestBody Map params){ + itemService.backAppeal(params); + return new Result(); + } + /** * @param * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -926,6 +957,10 @@ public class ItemController { public Result> getDissatisfied(@RequestParam Map params) { return itemService.getDissatisfied(params); } + + + + /** * @@ -943,6 +978,24 @@ public class ItemController { return new Result(); } + + /** + * + * @description: 诉求合并申请 + * @author qushutong + * @date 2024/11/26 10:35 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("case/merge") + public Result merge(@RequestBody ToCityMergeFormDTO mergeFormDTO){ + itemService.merge(mergeFormDTO); + return new Result(); + } + + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 0a451fc12..64bf53fb3 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -317,4 +317,20 @@ public class ItemEntity extends BaseEpdcEntity { private String ssyy; + /** + * 0，街道未申诉，1街道申诉，2区坐席驳回申诉 + */ + private String streetAppealFlag; + + + /** + * 区驳回原因 + */ + private String districtReject; + + /** + * 申诉材料文件链接 + */ + private String appealUrl; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index fae0a4c4a..038eefd2d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -869,4 +869,10 @@ public interface ItemService extends BaseService { Result> getDissatisfied( Map params); void backAudit(AppealResultDTO resultDTO); + + void merge(ToCityMergeFormDTO mergeFormDTO); + + Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO); + + void backAppeal(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 0d6b8c58b..523fea3ba 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -905,7 +905,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem * 项目列表-移动app端用 * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -1178,7 +1178,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); // 解析分类全部编码[前端分类复显使用] - if (resultDTO!=null && resultDTO.getCategoryFullCode()!=null){ + if (resultDTO != null && resultDTO.getCategoryFullCode() != null) { if (StringUtils.isNotBlank(resultDTO.getCategoryFullCode())) { String categoryFullCode = resultDTO.getCategoryFullCode(); String[] categoryIds = categoryFullCode.split("-"); @@ -2302,10 +2302,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @date 2020/12/16 10:45 * @params [dto] */ - private SendEventResultDto reportCaseNew(ItemHandleSubmitFormDTO dto){ + private SendEventResultDto reportCaseNew(ItemHandleSubmitFormDTO dto) { ItemEntity entity = baseDao.selectById(dto.getId()); // 删除& 符号 - if (StringUtils.isNotBlank(entity.getIssueAddress()) && entity.getIssueAddress().contains("&")){ + if (StringUtils.isNotBlank(entity.getIssueAddress()) && entity.getIssueAddress().contains("&")) { String address = entity.getIssueAddress().replace("&", "-"); entity.setIssueAddress(address); } @@ -2589,11 +2589,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem //诉求初验不通过，重新上报 result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); result.setSENDTYPE("BMYCB"); - } else if (ItemHandleCategoryEnum.HANDLE_I_REPORT_CITY_AGAIN.getValue() == dto.getHandleCategory()){ + } else if (ItemHandleCategoryEnum.HANDLE_I_REPORT_CITY_AGAIN.getValue() == dto.getHandleCategory()) { // 市里驳回重新处理 result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); result.setSENDTYPE("SJBHSB"); - }else { + } else { //吹哨 result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } @@ -2619,7 +2619,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem wrapper.eq("del_flag", "0"); ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); String result = ""; - if(itemLaw !=null){ + if (itemLaw != null) { result = "主办单位：" + itemLaw.getHostUnit() + "\n\n" + "协办单位：" + itemLaw.getAssistUnit() + "\n\n" + "诉求编码：" + serialNum; @@ -2634,7 +2634,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem wrapper.eq("del_flag", "0"); ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); String result = ""; - if (itemLaw !=null){ + if (itemLaw != null) { result = "事项名称：" + itemLaw.getLawName() + "\n" + "诉求详情：" + itemLaw.getLawContent() + "\n" + "有关需求：" + itemLaw.getDemand() + "\n" @@ -2649,7 +2649,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem + "报到时间：" + DateUtils.format(itemLaw.getReportTime(), DateUtils.DATE_TIME_PATTERN) + "\n" + "报到地点：" + itemLaw.getReportAddress() + "\n" + "会议名称：" + itemLaw.getMeetingName(); - }else{ + } else { ItemEntity item = baseDao.selectById(itemId); result = item.getItemContent(); } @@ -3283,7 +3283,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem /** * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 获取当前部门可做操作 * @Date 2020/1/13 16:55 @@ -3368,7 +3368,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem * 组织机构信息处理 * * @return java.util.List - * @return java.util.List * @params [dto, eventsList] * @author liuchuang * @since 2020/3/7 1:17 @@ -3457,8 +3456,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 只推送前三条 Integer minshengCount = 0; - if("0".equals(formDto.getAppealSource())){ - formDto.setNickName("网格员："+formDto.getNickName()); + if ("0".equals(formDto.getAppealSource())) { + formDto.setNickName("网格员：" + formDto.getNickName()); } imageCheck(formDto.getImages()); ItemEntity entity = ConvertUtils.sourceToTarget(formDto, ItemEntity.class); @@ -3529,12 +3528,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 做限制 内容超过16个字符 并且当日推送的不超过3个 才可以推送给市平台 // 只推送前三条 并且是15个字以上的 // 20231130 修改为只推送前两条 - if (entity.getAppealSource().equals("0")){ + if (entity.getAppealSource().equals("0")) { // 24年3月15 按照推进中心要求不推送排查上报 // if (entity.getItemContent().length()>15 && minshengCount < 2){ // sendCaseLivelihood(entity); // } - }else{ + } else { sendCaseLivelihood(entity); } // sendCaseLivelihood(entity); @@ -3565,6 +3564,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem /** * 新新向党的事件推送过来，调用此方法。 * 此方法与上面的submitMsFzItemResi逻辑一致，只是返参返回epdc_item.id + * * @param formDto * @return */ @@ -3674,9 +3674,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem private void sendCaseLivelihood(ItemEntity entity) { CityCaseLivelihoodDTO data = new CityCaseLivelihoodDTO(); data.setId(entity.getId()); - if("0".equals(entity.getAppealSource())){ + if ("0".equals(entity.getAppealSource())) { data.setSqly(CityPushEnum.SQLY_PCSB.getCode()); - }else { + } else { data.setSqly(CityPushEnum.SQLY_WLFS.getCode()); } data.setSqbm(entity.getSerialNum()); @@ -3931,7 +3931,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = baseDao.getItemAppealPage(params); Map map = listItemHandleDept(); list.forEach(item -> - item.setItemHandleDeptId(map.get(item.getId())) + item.setItemHandleDeptId(map.get(item.getId())) ); // log.info("11111111111111111111111111111111"+params.toString()); return new PageData<>(list, page.getTotal()); @@ -3952,25 +3952,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem Map map = listItemHandleDept(); list.forEach(item -> { item.setItemHandleDeptId(map.get(item.getId())); - if (item.getItemState()!=null && item.getItemState() == 0){ - if (item.getProcessState()!=null && item.getProcessState().equals("16")){ + if (item.getItemState() != null && item.getItemState() == 0) { + if (item.getProcessState() != null && item.getProcessState().equals("16")) { item.setItemStateName("市区处理中"); - }else{ - if (item.getProcessState()!=null && item.getProcessState().equals("1")){ - if (item.getEvaluationTime()!=null && item.getEvaluationTime()!=""){ + } else { + if (item.getProcessState() != null && item.getProcessState().equals("1")) { + if (item.getEvaluationTime() != null && item.getEvaluationTime() != "") { item.setItemStateName("已评价"); - }else{ + } else { item.setItemStateName("待评价"); } - }else{ - if (item.getItemHandleDeptId() == null || item.getItemHandleDeptId().equals("0")){ + } else { + if (item.getItemHandleDeptId() == null || item.getItemHandleDeptId().equals("0")) { item.setItemStateName("街道处理中"); - }else{ + } else { item.setItemStateName("网格处理中"); } } } - }else if(item.getItemState()!=null && item.getItemState() == 10){ + } else if (item.getItemState() != null && item.getItemState() == 10) { item.setItemStateName("已结案"); } }); @@ -4232,11 +4232,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //上报完成后拽一下网格化平台的流程旨在解决大屏红灯事件处理了没有立刻变为绿灯问题 // new PullProcess().myRun(dto.getId()); - return new Result(); + return new Result(); } - private EventRejectDoResultDto eventsRejectDo(ItemHandleSubmitFormDTO dto, String recid) throws Exception { ItemEntity entity = baseDao.selectById(dto.getId()); // 组装上报信息（图片和处理流程） @@ -4646,6 +4645,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } return list.stream().collect(Collectors.toMap(ItemHandleProcessDTO::getItemId, ItemHandleProcessDTO::getHandlerDeptId, (key1, key2) -> key2)); } + /** * 处理中流程的当前处理部门名称 * @@ -4699,18 +4699,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem params.put("statDate", df.format(d)); } List list = new ArrayList<>(); - if (params.containsKey("evaluationScore") && params.get("evaluationScore")!=null && StringUtils.isNotBlank(params.get("evaluationScore").toString())) { + if (params.containsKey("evaluationScore") && params.get("evaluationScore") != null && StringUtils.isNotBlank(params.get("evaluationScore").toString())) { list = baseDao.getevaluationList(params); - } else if (params.containsKey("solutionInfo") && params.get("solutionInfo")!=null && StringUtils.isNotBlank(params.get("solutionInfo").toString())) { + } else if (params.containsKey("solutionInfo") && params.get("solutionInfo") != null && StringUtils.isNotBlank(params.get("solutionInfo").toString())) { list = baseDao.getsolutionList(params); - } else if (params.containsKey("reply") && params.get("reply")!=null && StringUtils.isNotBlank(params.get("reply").toString())) { + } else if (params.containsKey("reply") && params.get("reply") != null && StringUtils.isNotBlank(params.get("reply").toString())) { list = baseDao.getreplyList(params); - } else if (params.containsKey("response") && params.get("response")!=null && StringUtils.isNotBlank(params.get("response").toString())) { + } else if (params.containsKey("response") && params.get("response") != null && StringUtils.isNotBlank(params.get("response").toString())) { list = baseDao.getresponseList(params); - }else { + } else { list = baseDao.getItemStatisListPage(params); } return new PageData<>(list, page.getTotal()); @@ -5025,7 +5025,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //诉求处理 ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectById(id); pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(processEntity, ItemHandleProcessDTO.class), NumConstant.ONE_STR); - } else if(NumConstant.EIGHT_STR.equals(type)) { + } else if (NumConstant.EIGHT_STR.equals(type)) { // 23-6-28执法诉求响应 pushToCityGridService.receiveZFFZ(id); @@ -5348,10 +5348,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result changeRepeat(ItemChangeRepeatDTO dto) { ItemEntity itemEntity = baseDao.selectById(dto.getItemId()); - if (itemEntity!=null){ + if (itemEntity != null) { itemEntity.setRepeatFlag(dto.getRepeatFlag()); baseDao.updateById(itemEntity); - }else { + } else { throw new RenException("该item不存在" + dto.getItemId()); } @@ -5362,13 +5362,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result changeCategory(ItemChangeCategoryDTO dto) { ItemEntity itemEntity = baseDao.selectById(dto.getItemId()); - if (itemEntity!=null){ - if (StringUtils.isNotBlank(dto.getCategoryId())){ + if (itemEntity != null) { + if (StringUtils.isNotBlank(dto.getCategoryId())) { itemEntity.setCategoryCode(dto.getCategoryId()); } if (StringUtils.isNotBlank(dto.getCategoryFullId())) { itemEntity.setCategoryFullCode(dto.getCategoryFullId()); - }else{ + } else { itemEntity.setCategoryFullCode(null); } if (StringUtils.isNotBlank(dto.getCategoryLabel())) { @@ -5378,7 +5378,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setFirstCategoryCode(dto.getFistCategoryId()); } baseDao.updateById(itemEntity); - }else { + } else { throw new RenException("该item不存在" + dto.getItemId()); } return new Result(); @@ -5454,12 +5454,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem AcceptPlantformProcessDTO acceptPlantformProcessDTO = new AcceptPlantformProcessDTO(); // 获取一下taskid - LambdaQueryWrapper itemGridPlatformEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemGridPlatformEntity::getReferenceId,formDto.getItemId()).orderByDesc(ItemGridPlatformEntity::getCreatedTime).last("limit 1"); + LambdaQueryWrapper itemGridPlatformEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemGridPlatformEntity::getReferenceId, formDto.getItemId()).orderByDesc(ItemGridPlatformEntity::getCreatedTime).last("limit 1"); ItemGridPlatformEntity itemGridPlatformEntity = itemGridPlatformDao.selectOne(itemGridPlatformEntityLambdaQueryWrapper); - if (itemGridPlatformEntity!=null){ + if (itemGridPlatformEntity != null) { // p_recid 就是taskid acceptPlantformProcessDTO.setP_recId(itemGridPlatformEntity.getTaskid()); @@ -5468,9 +5468,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 取出最后一条记录的内容 LambdaQueryWrapper processEntityLambdaQueryWrapper = new LambdaQueryWrapper() - .eq(ItemHandleProcessEntity::getItemId,formDto.getItemId()).orderByDesc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); + .eq(ItemHandleProcessEntity::getItemId, formDto.getItemId()).orderByDesc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); ItemHandleProcessEntity newProcess = itemHandleProcessDao.selectOne(processEntityLambdaQueryWrapper); - if (StringUtils.isNotBlank(newProcess.getHandleAdvice())){ + if (StringUtils.isNotBlank(newProcess.getHandleAdvice())) { // 塞入内容 acceptPlantformProcessDTO.setHandleAdvice(newProcess.getHandleAdvice()); } @@ -5497,9 +5497,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem ResponseTotalPieResultDTO dtoResonse = baseDao.responseSixHoursTotal(formDTO); ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); dtoResonseNo.setName("未按期响应"); - if (dtoResonse.getValue()!=null){ - dtoResonseNo.setValue(dtoResonse.getTotal()-dtoResonse.getValue()); - }else{ + if (dtoResonse.getValue() != null) { + dtoResonseNo.setValue(dtoResonse.getTotal() - dtoResonse.getValue()); + } else { dtoResonseNo.setValue(dtoResonse.getTotal()); } /* if (dtoResonse.getValue()!=null){ @@ -5517,9 +5517,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem ResponseTotalPieResultDTO dtoResonse = baseDao.replyTotal(formDTO); ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); dtoResonseNo.setName("未按时回复"); - if (dtoResonse.getValue()!=null){ - dtoResonseNo.setValue(dtoResonse.getTotal()-dtoResonse.getValue()); - }else{ + if (dtoResonse.getValue() != null) { + dtoResonseNo.setValue(dtoResonse.getTotal() - dtoResonse.getValue()); + } else { dtoResonseNo.setValue(dtoResonse.getTotal()); } /* if (dtoResonse.getValue()!=null){ @@ -5646,7 +5646,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 查找所有的 没有成功调用市平台的数据 // 除了诉求登记 LambdaQueryWrapper lambdaQueryWrapper = new - LambdaQueryWrapper().eq(ItemReportInterfaceLogEntity::getSuccessFlag,0).notLike(ItemReportInterfaceLogEntity::getInterfaceName,"诉求登记"); + LambdaQueryWrapper().eq(ItemReportInterfaceLogEntity::getSuccessFlag, 0).notLike(ItemReportInterfaceLogEntity::getInterfaceName, "诉求登记"); List logEntityList = itemReportInterfaceLogDao.selectList(lambdaQueryWrapper); // 循环上报市平台 将状态改成3 for (ItemReportInterfaceLogEntity entity : logEntityList) { @@ -5655,7 +5655,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setSuccessFlag("2"); itemReportInterfaceLogDao.updateById(entity); // again表再次进行记录 - ItemReportInterfaceLogAgainEntity logAgain = ConvertUtils.sourceToTarget(entity,ItemReportInterfaceLogAgainEntity.class); + ItemReportInterfaceLogAgainEntity logAgain = ConvertUtils.sourceToTarget(entity, ItemReportInterfaceLogAgainEntity.class); if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(result).get("code").toString())) { logAgain.setSuccessFlag(NumConstant.ONE_STR); } else { @@ -5664,8 +5664,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem logAgain.setReturnMsgBody(result); logAgain.setId(null); itemReportInterfaceLogAgainDao.insert(logAgain); - }catch (Exception e){ - log.error("重新上报失败，id为："+entity.getId()+",原因:"+e); + } catch (Exception e) { + log.error("重新上报失败，id为：" + entity.getId() + ",原因:" + e); } } return new Result(); @@ -5893,11 +5893,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } Date date = new Date(); LambdaQueryWrapper lambdaQueryWrapper = - new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getId()) - .eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue()) - .eq(ItemHandleProcessEntity::getCreatedTime,date); + new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId, item.getId()) + .eq(ItemHandleProcessEntity::getState, ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue()) + .eq(ItemHandleProcessEntity::getCreatedTime, date); List processEntities = itemHandleProcessDao.selectList(lambdaQueryWrapper); - if (processEntities.size()>0){ + if (processEntities.size() > 0) { return new Result(); } process.setItemId(item.getId()); @@ -6040,7 +6040,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem * * @param submitItemFormDTO :新新向党的随手拍事件 */ - public void submitXxxdEventToItem(String xxxdEventEntityId,String longitude,String latitude,SubmitItemFormDTO submitItemFormDTO) { + public void submitXxxdEventToItem(String xxxdEventEntityId, String longitude, String latitude, SubmitItemFormDTO submitItemFormDTO) { // 0已接收；1已转北上速办事件；2已完结 String internalStatus = ""; // 北上速办事件id @@ -6060,84 +6060,84 @@ public class ItemServiceImpl extends BaseServiceImpl implem LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(XxxdEventEntity::getId, xxxdEventEntityId); // try { - //处理图片和语音，上传到市北的oss - if(CollectionUtils.isNotEmpty(submitItemFormDTO.getImages())){ - List images=getEpdcImgUrl(submitItemFormDTO.getImages()); - submitItemFormDTO.setImages(images); - } - if(StringUtils.isNotBlank(submitItemFormDTO.getItemVoice())){ - String voiceUrl=getVoiceUrl(submitItemFormDTO.getItemVoice()); - submitItemFormDTO.setItemVoice(voiceUrl); - } - // 查询网格信息 - GisFormDTO gisFormDTO = new GisFormDTO(); - // 坐标系转换：GCJ-02坐标系WGS84 - LocateInfo locateInfo = GCJ02_WGS84.gcj02_To_Wgs84(Double.valueOf(latitude), Double.valueOf(longitude)); - if (null != locateInfo) { - gisFormDTO.setLongitude(String.valueOf(locateInfo.getLongitude())); - gisFormDTO.setLatitude(String.valueOf(locateInfo.getLatitude())); - } else { - log.warn("新新向党接收随手拍,坐标系转换为空，原经纬度：" + longitude + "," + latitude); - gisFormDTO.setLongitude(longitude); - gisFormDTO.setLatitude(latitude); - } - Result gisGridRes = adminFeignClient.getGridByCoordinate(gisFormDTO); - if (!gisGridRes.success() || null == gisGridRes.getData()) { - internalRemark = "根据经纬度获取网格信息失败:" + gisGridRes.getMsg(); - log.error("submitXxxdEventToItem上传到民生诉求异常:" + internalRemark); - updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) - .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) - .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) - .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) - .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) - .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) - .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) - .set(null != sync, XxxdEventEntity::getSync, sync); - xxxdEventDao.update(null, updateWrapper); - throw new RenException(internalRemark); + //处理图片和语音，上传到市北的oss + if (CollectionUtils.isNotEmpty(submitItemFormDTO.getImages())) { + List images = getEpdcImgUrl(submitItemFormDTO.getImages()); + submitItemFormDTO.setImages(images); + } + if (StringUtils.isNotBlank(submitItemFormDTO.getItemVoice())) { + String voiceUrl = getVoiceUrl(submitItemFormDTO.getItemVoice()); + submitItemFormDTO.setItemVoice(voiceUrl); + } + // 查询网格信息 + GisFormDTO gisFormDTO = new GisFormDTO(); + // 坐标系转换：GCJ-02坐标系WGS84 + LocateInfo locateInfo = GCJ02_WGS84.gcj02_To_Wgs84(Double.valueOf(latitude), Double.valueOf(longitude)); + if (null != locateInfo) { + gisFormDTO.setLongitude(String.valueOf(locateInfo.getLongitude())); + gisFormDTO.setLatitude(String.valueOf(locateInfo.getLatitude())); + } else { + log.warn("新新向党接收随手拍,坐标系转换为空，原经纬度：" + longitude + "," + latitude); + gisFormDTO.setLongitude(longitude); + gisFormDTO.setLatitude(latitude); + } + Result gisGridRes = adminFeignClient.getGridByCoordinate(gisFormDTO); + if (!gisGridRes.success() || null == gisGridRes.getData()) { + internalRemark = "根据经纬度获取网格信息失败:" + gisGridRes.getMsg(); + log.error("submitXxxdEventToItem上传到民生诉求异常:" + internalRemark); + updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) + .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) + .set(StringUtils.isNotBlank(internalRemark), XxxdEventEntity::getInternalRemark, internalRemark) + .set(StringUtils.isNotBlank(gridId), XxxdEventEntity::getGridId, gridId) + .set(StringUtils.isNotBlank(gridName), XxxdEventEntity::getGridName, gridName) + .set(StringUtils.isNotBlank(communityId), XxxdEventEntity::getCommunityId, communityId) + .set(StringUtils.isNotBlank(streetId), XxxdEventEntity::getStreetId, streetId) + .set(null != sync, XxxdEventEntity::getSync, sync); + xxxdEventDao.update(null, updateWrapper); + throw new RenException(internalRemark); // return;// 测试时候注释掉，让它继续执行 - } else { - gridId = String.valueOf(gisGridRes.getData().getGridId()); - gridName = gisGridRes.getData().getGridName(); - communityId = String.valueOf(gisGridRes.getData().getCommunityId()); - streetId = String.valueOf(gisGridRes.getData().getStreetId()); - - // 调用北上诉办-民生诉求方法 - submitItemFormDTO.setGridId(gisGridRes.getData().getGridId()); - submitItemFormDTO.setGrid(gisGridRes.getData().getGridName()); - - // 获取所有上级机构名称和ID拼接 - Result dtoResult = adminFeignClient.getParentAndAllDept(gisGridRes.getData().getGridId()); - ParentAndAllDeptDTO deptDTO = dtoResult.getData(); - // 父所有部门 - submitItemFormDTO.setParentDeptIds(deptDTO.getParentDeptIds()); - submitItemFormDTO.setParentDeptNames(deptDTO.getParentDeptNames()); - // 所有部门 - submitItemFormDTO.setAllDeptIds(deptDTO.getAllDeptIds()); - submitItemFormDTO.setAllDeptNames(deptDTO.getAllDeptNames()); - // 网格 - submitItemFormDTO.setGrid(deptDTO.getGrid()); - submitItemFormDTO.setGridId(deptDTO.getGridId()); - - } - // dev开发环境临时赋值 - Environment environment = SpringContextUtils.getBean(Environment.class); - String[] activeProfiles = environment.getActiveProfiles(); - if (activeProfiles.length > 0 && "dev".equals(activeProfiles[0])) { - log.info("当前运行环境：" + activeProfiles[0]); - submitItemFormDTO.setGridId(1001L); - submitItemFormDTO.setGrid("test"); - } - // 复制了一个民生诉求提交方法submitMsFzItemResi =》submitMsFzItemResiForXxxd - bssbEventId = this.submitMsFzItemResiForXxxd(submitItemFormDTO); - - if(StringUtils.isNotBlank(bssbEventId)){ - //成功返回epdc_item.id，说明提交民生诉求成功，状态改为1 - internalStatus=NumConstant.ONE_STR; - // 置为已同步 - sync=NumConstant.ONE; - log.info("submitXxxdEventToItem上传到民生诉求成功：bssbEventId："+bssbEventId); - } + } else { + gridId = String.valueOf(gisGridRes.getData().getGridId()); + gridName = gisGridRes.getData().getGridName(); + communityId = String.valueOf(gisGridRes.getData().getCommunityId()); + streetId = String.valueOf(gisGridRes.getData().getStreetId()); + + // 调用北上诉办-民生诉求方法 + submitItemFormDTO.setGridId(gisGridRes.getData().getGridId()); + submitItemFormDTO.setGrid(gisGridRes.getData().getGridName()); + + // 获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(gisGridRes.getData().getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + submitItemFormDTO.setParentDeptIds(deptDTO.getParentDeptIds()); + submitItemFormDTO.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + submitItemFormDTO.setAllDeptIds(deptDTO.getAllDeptIds()); + submitItemFormDTO.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + submitItemFormDTO.setGrid(deptDTO.getGrid()); + submitItemFormDTO.setGridId(deptDTO.getGridId()); + + } + // dev开发环境临时赋值 + Environment environment = SpringContextUtils.getBean(Environment.class); + String[] activeProfiles = environment.getActiveProfiles(); + if (activeProfiles.length > 0 && "dev".equals(activeProfiles[0])) { + log.info("当前运行环境：" + activeProfiles[0]); + submitItemFormDTO.setGridId(1001L); + submitItemFormDTO.setGrid("test"); + } + // 复制了一个民生诉求提交方法submitMsFzItemResi =》submitMsFzItemResiForXxxd + bssbEventId = this.submitMsFzItemResiForXxxd(submitItemFormDTO); + + if (StringUtils.isNotBlank(bssbEventId)) { + //成功返回epdc_item.id，说明提交民生诉求成功，状态改为1 + internalStatus = NumConstant.ONE_STR; + // 置为已同步 + sync = NumConstant.ONE; + log.info("submitXxxdEventToItem上传到民生诉求成功：bssbEventId：" + bssbEventId); + } updateWrapper.set(StringUtils.isNotBlank(internalStatus), XxxdEventEntity::getInternalStatus, internalStatus) .set(StringUtils.isNotBlank(bssbEventId), XxxdEventEntity::getBssbEventId, bssbEventId) @@ -6169,16 +6169,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem /** * 获取民生诉求，处理进展 + * * @param itemId * @return */ - public List queryItemProcess(String itemId){ + public List queryItemProcess(String itemId) { List dtoList = baseDao.selectListOfItemHandleProgressByWork(itemId); return dtoList; } /** * 新新向党的语音url，上传到本地url + * * @param itemVoiceUrl,新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3 * @return 返回示例： */ @@ -6186,14 +6188,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem Result ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl); if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) { return ossRes.getData(); - }else{ - log.error("新新向党随手拍语音上传oss失败,语音url："+itemVoiceUrl); + } else { + log.error("新新向党随手拍语音上传oss失败,语音url：" + itemVoiceUrl); } return null; } /** * 新新向党的图片url上传到本地的oss + * * @param images:新新向党图片url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg * @return 返回示例：https://epdc-shibei.elinkservice.cn/files-pro/20230530/8ed41af545e04e0cae0d4398d80c704e.jpg */ @@ -6203,15 +6206,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem Result ossRes = ossFeignClient.uploadXxxdImg(url); if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData())) { urlList.add(ossRes.getData()); - }else{ - log.error("新新向党随手拍图片上传oss失败，图片url："+url); + } else { + log.error("新新向党随手拍图片上传oss失败，图片url：" + url); } } return urlList; } - @Override public Result getClosePage(Map params) { IPage page = getPage(params); @@ -6221,19 +6223,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result sqAppeal(AppealAuditFormDTO appealAuditFormDTO) { -// ItemDTO itemDTO = baseDao.selectOneItemByIssueId(appealAuditFormDTO.getItemId()); + UserDetail userDetail = SecurityUser.getUser(); ItemEntity itemDTO = baseDao.selectById(appealAuditFormDTO.getItemId()); AppealFormDTO.CzrEntity czrEntity = new AppealFormDTO.CzrEntity(); czrEntity.setId(appealAuditFormDTO.getItemId()); - czrEntity.setXm(itemDTO.getHandlePeopleName()); - czrEntity.setSsjgbm(itemDTO.getGrid()); - czrEntity.setSsjg(itemDTO.getGrid()); - czrEntity.setSsbm(itemDTO.getUpdatedBy()); - czrEntity.setSsbmbm(itemDTO.getGrid()); + czrEntity.setXm(userDetail.getRealName()); + czrEntity.setSsjgbm(userDetail.getDeptId() + ""); + czrEntity.setSsjg(userDetail.getDeptName()); + czrEntity.setSsbm(userDetail.getDeptName()); + czrEntity.setSsbmbm(userDetail.getDeptId() + ""); AppealFormDTO appealFormDTO = new AppealFormDTO(); appealFormDTO.setCzr(czrEntity); appealFormDTO.setCzsj(appealAuditFormDTO.getCzsj()); - appealFormDTO.setFiles(""); + appealFormDTO.setFiles(appealAuditFormDTO.getFiles()); appealFormDTO.setJjqk(appealAuditFormDTO.getJjqk()); appealFormDTO.setPjjg(appealAuditFormDTO.getPjjg()); appealFormDTO.setShjg(appealAuditFormDTO.getShjg()); @@ -6242,11 +6244,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem String appeal = pushToCityGridServiceImpl.appeal(appealFormDTO); if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(appeal).get("code").toString())) { itemDTO.setJjqk(appealAuditFormDTO.getJjqk()); - if("01".equals(appealAuditFormDTO.getPjjg())){ + if ("01".equals(appealAuditFormDTO.getPjjg())) { itemDTO.setPjjg(2); - }else if("03".equals(appealAuditFormDTO.getPjjg())){ + } else if ("03".equals(appealAuditFormDTO.getPjjg())) { itemDTO.setPjjg(0); - }else{ + } else { itemDTO.setPjjg(1); } itemDTO.setAppealFlag(1); @@ -6272,7 +6274,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem /*LambdaQueryWrapper hanprocess = new LambdaQueryWrapper() .eq(ItemHandleProcessEntity::getItemId,entity.getId()).eq(ItemHandleProcessEntity::getState,"60").orderByAsc(ItemHandleProcessEntity::getCreatedTime).last("limit 1");*/ ItemHandleProcessEntity item = itemHandleProcessDao.getOneEntity(entity.getId()); - if (item!=null) { + if (item != null) { // 组装数据 PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO(); @@ -6307,7 +6309,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_CLOSED, "诉求结案"); pushToCityGridServiceImpl.saveLog(item.getItemId(), item.getId(), "诉求结案-3", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(data), result); } - }catch (Exception e){ + } catch (Exception e) { } /*if (entity.getSqid() == null){ @@ -6374,47 +6376,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem } @Override - public PageData getHotLineFromList(Map params){ + public PageData getHotLineFromList(Map params) { // try { - UserDetail userDetail = SecurityUser.getUser(); - Long deptId = userDetail.getDeptId(); + UserDetail userDetail = SecurityUser.getUser(); + Long deptId = userDetail.getDeptId(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.isNotNull(ItemHotlineEntity::getId); + lambdaQueryWrapper.isNotNull(ItemHotlineEntity::getId); - if (params.get("itemTitle")!=null){ - lambdaQueryWrapper.like(ItemHotlineEntity::getSqbt,params.get("itemTitle")); - } - if (params.get("code")!=null){ - lambdaQueryWrapper.like(ItemHotlineEntity::getCode,params.get("code")); - } - if (deptId == null || deptId == 0l || deptId == 1175270520603930625l){ - lambdaQueryWrapper.and(wrap->wrap.eq(ItemHotlineEntity::getStreetId,'0').or().isNull(ItemHotlineEntity::getStreetId).or().eq(ItemHotlineEntity::getBackItemFlag,"1")); - }else{ - lambdaQueryWrapper - .and(wrap ->wrap.eq(ItemHotlineEntity::getStreetId,deptId)) - .and(wrap ->wrap - .ne(ItemHotlineEntity::getBackItemFlag,"1") - .or() - .isNull(ItemHotlineEntity::getBackItemFlag)); - } - // 过滤掉退件的 - lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag)).eq(ItemHotlineEntity::getYgzFlag,"1"); - // 新增筛选 是否是市里驳回重办件 + if (params.get("itemTitle") != null) { + lambdaQueryWrapper.like(ItemHotlineEntity::getSqbt, params.get("itemTitle")); + } + if (params.get("code") != null) { + lambdaQueryWrapper.like(ItemHotlineEntity::getCode, params.get("code")); + } + if (deptId == null || deptId == 0l || deptId == 1175270520603930625l) { + lambdaQueryWrapper.and(wrap -> wrap.eq(ItemHotlineEntity::getStreetId, '0').or().isNull(ItemHotlineEntity::getStreetId).or().eq(ItemHotlineEntity::getBackItemFlag, "1")); + } else { + lambdaQueryWrapper + .and(wrap -> wrap.eq(ItemHotlineEntity::getStreetId, deptId)) + .and(wrap -> wrap + .ne(ItemHotlineEntity::getBackItemFlag, "1") + .or() + .isNull(ItemHotlineEntity::getBackItemFlag)); + } + // 过滤掉退件的 + lambdaQueryWrapper.and(wrap -> wrap.ne(ItemHotlineEntity::getBackFlag, "1").or().isNull(ItemHotlineEntity::getBackFlag)).eq(ItemHotlineEntity::getYgzFlag, "1"); + // 新增筛选 是否是市里驳回重办件 String cbFlag = (String) params.get("cbFlag"); - if(StringUtils.isNotBlank(cbFlag)){ - lambdaQueryWrapper.and(wrap ->wrap.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag"))); - }else { - lambdaQueryWrapper.and(wrap ->wrap.isNull(ItemHotlineEntity::getCbFlag)); + if (StringUtils.isNotBlank(cbFlag)) { + lambdaQueryWrapper.and(wrap -> wrap.eq(ItemHotlineEntity::getCbFlag, params.get("cbFlag"))); + } else { + lambdaQueryWrapper.and(wrap -> wrap.isNull(ItemHotlineEntity::getCbFlag)); } // lambdaQueryWrapper // .groupBy(ItemHotlineEntity::getSqid); - lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj); - IPage page = getPage(params); - IPage itemHotlineEntityIPage = itemHotlineDao.selectPage(page, lambdaQueryWrapper); - return new PageData<>(itemHotlineEntityIPage.getRecords(), itemHotlineEntityIPage.getTotal()); + lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj); + IPage page = getPage(params); + IPage itemHotlineEntityIPage = itemHotlineDao.selectPage(page, lambdaQueryWrapper); + return new PageData<>(itemHotlineEntityIPage.getRecords(), itemHotlineEntityIPage.getTotal()); // }catch (Exception e){ // @@ -6437,37 +6439,35 @@ public class ItemServiceImpl extends BaseServiceImpl implem // // } - if("1".equals(itemHotlineEntity.getCbFlag())){ - if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ + if ("1".equals(itemHotlineEntity.getCbFlag())) { + if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) - .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag,"0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ + itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) + .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) + .eq(ItemEntity::getDelFlag, "0"); + if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { return true; } } - }else { - if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){ + } else { + if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getSqid()) - .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag,"0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ + itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) + .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) + .eq(ItemEntity::getDelFlag, "0"); + if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { return true; } } } - - ItemEntity itemEntity = new ItemEntity(); itemEntity.setSerialNum(itemHotlineEntity.getCode()); // 青诉即办诉求唯一标识 itemEntity.setSqid(itemHotlineEntity.getSqid()); - if("1".equals(itemHotlineEntity.getCbFlag())){ + if ("1".equals(itemHotlineEntity.getCbFlag())) { itemEntity.setSqid(itemHotlineEntity.getCbid()); } @@ -6507,9 +6507,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setAppealSource(NumConstant.THREE_STR); //djr String 登记人ID - if(StringUtils.isNotBlank(itemHotlineEntity.getDjr())){ + if (StringUtils.isNotBlank(itemHotlineEntity.getDjr())) { itemEntity.setUserId(itemHotlineEntity.getDjr()); - }else { + } else { itemEntity.setUserId("111111111111"); } @@ -6537,19 +6537,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem Result result = adminFeignClient.getParentAndAllDept(pid); String pnames = dtoResult.getData().getParentName(); - itemEntity.setParentDeptIds(result.getData().getParentDeptIds()+","+pid); + itemEntity.setParentDeptIds(result.getData().getParentDeptIds() + "," + pid); itemEntity.setParentDeptNames(result.getData().getAllDeptNames()); - itemEntity.setAllDeptIds(result.getData().getParentDeptIds()+","+pid + "," + itemEntity.getGridId()); - itemEntity.setAllDeptNames(result.getData().getAllDeptNames()+ "-" + itemEntity.getGrid()); + itemEntity.setAllDeptIds(result.getData().getParentDeptIds() + "," + pid + "," + itemEntity.getGridId()); + itemEntity.setAllDeptNames(result.getData().getAllDeptNames() + "-" + itemEntity.getGrid()); } baseDao.insert(itemEntity); // img从hotLine 到 item try { - changeImgHotLineToItem(itemHotlineEntity.getId(),itemEntity.getId()); - }catch (Exception e){ - log.info("hotline图片转item失败，hotlineId"+itemHotlineEntity.getId()); + changeImgHotLineToItem(itemHotlineEntity.getId(), itemEntity.getId()); + } catch (Exception e) { + log.info("hotline图片转item失败，hotlineId" + itemHotlineEntity.getId()); } //插入项目部门关联表 @@ -6560,7 +6560,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem item.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue()); item.setHandleAdvice("诉求已响应接收。"); item.setOutHandleAdvice("诉求已响应接收。"); - item.setHandlerDept("分发处理"+itemEntity.getGrid()); + item.setHandlerDept("分发处理" + itemEntity.getGrid()); item.setCreatedTime(new Date()); item.setUpdatedTime(new Date()); itemHandleProcessDao.insert(item); @@ -6587,25 +6587,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Boolean changeHotLineToFZItem(ItemHotlineDTO hotlineDTO) { try { - ItemHotlineEntity itemHotlineEntity = itemHotlineDao.selectById(hotlineDTO.getId()); - if (itemHotlineEntity == null){ - throw new Exception("此id找不到12345热线数据"+hotlineDTO.getId()); - } + ItemHotlineEntity itemHotlineEntity = itemHotlineDao.selectById(hotlineDTO.getId()); + if (itemHotlineEntity == null) { + throw new Exception("此id找不到12345热线数据" + hotlineDTO.getId()); + } itemHotlineEntity.setStreetId("1"); itemHotlineDao.updateById(itemHotlineEntity); - if("1".equals(itemHotlineEntity.getCbFlag())){ - if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ + if ("1".equals(itemHotlineEntity.getCbFlag())) { + if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) - .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag,"0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ + itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) + .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) + .eq(ItemEntity::getDelFlag, "0"); + if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { return true; } } - }else { + } else { if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) @@ -6616,98 +6616,97 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); + MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); - List deptEntityList = metaSysDeptDao.selectList( - new LambdaQueryWrapper().eq(MetaSysDeptEntity::getDisCenterZoningCode,itemHotlineEntity.getOrgId()) - ); - if (deptEntityList.size()>0){ - metaSysDeptEntity = deptEntityList.get(0); - }else{ - throw new Exception("此数据匹配不到部门"+itemHotlineEntity.getOrgId()); - } + List deptEntityList = metaSysDeptDao.selectList( + new LambdaQueryWrapper().eq(MetaSysDeptEntity::getDisCenterZoningCode, itemHotlineEntity.getOrgId()) + ); + if (deptEntityList.size() > 0) { + metaSysDeptEntity = deptEntityList.get(0); + } else { + throw new Exception("此数据匹配不到部门" + itemHotlineEntity.getOrgId()); + } - ItemEntity entity = new ItemEntity(); - entity.setSerialNum(itemHotlineEntity.getCode()); - entity.setSqid(itemHotlineEntity.getSqid()); - if("1".equals(itemHotlineEntity.getCbFlag())){ - entity.setSqid(itemHotlineEntity.getCbid()); - } - entity.setGridId(metaSysDeptEntity.getId()); - entity.setGrid(metaSysDeptEntity.getName()); - entity.setItemContent(itemHotlineEntity.getSjnr()); - entity.setAppealSource(NumConstant.THREE_STR); - entity.setUserId(itemHotlineEntity.getDjr()); - entity.setNickName(itemHotlineEntity.getDjrxm()); - entity.setDistributeTime(itemHotlineEntity.getDjsj()); - entity.setMobile(itemHotlineEntity.getLxfs()); - entity.setIssueAddress(itemHotlineEntity.getDlwzmc()); - entity.setIsPartyMember("0"); - entity.setItemState(0);//处理中 - entity.setLastHandleTime(new Date()); - entity.setCategoryCode("13"); - entity.setCategoryFullName("其他"); - entity.setFirstCategoryCode("13"); - entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 - entity.setIsPeople("1");//诉求上报 - entity.setPeopleFlag("1");// 发展 + ItemEntity entity = new ItemEntity(); + entity.setSerialNum(itemHotlineEntity.getCode()); + entity.setSqid(itemHotlineEntity.getSqid()); + if ("1".equals(itemHotlineEntity.getCbFlag())) { + entity.setSqid(itemHotlineEntity.getCbid()); + } + entity.setGridId(metaSysDeptEntity.getId()); + entity.setGrid(metaSysDeptEntity.getName()); + entity.setItemContent(itemHotlineEntity.getSjnr()); + entity.setAppealSource(NumConstant.THREE_STR); + entity.setUserId(itemHotlineEntity.getDjr()); + entity.setNickName(itemHotlineEntity.getDjrxm()); + entity.setDistributeTime(itemHotlineEntity.getDjsj()); + entity.setMobile(itemHotlineEntity.getLxfs()); + entity.setIssueAddress(itemHotlineEntity.getDlwzmc()); + entity.setIsPartyMember("0"); + entity.setItemState(0);//处理中 + entity.setLastHandleTime(new Date()); + entity.setCategoryCode("13"); + entity.setCategoryFullName("其他"); + entity.setFirstCategoryCode("13"); + entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 + entity.setIsPeople("1");//诉求上报 + entity.setPeopleFlag("1");// 发展 // 上报网格化得经纬度 这里随便默认一个经纬度 - entity.setIssueLatitude(36.0761600000); - entity.setIssueLongitude(120.3332500000); - entity.setAppealSource(NumConstant.THREE_STR); - //执法诉求所属街道的市中心编码 - Result dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId()); - if (dtoResult.success()) { - // 因为是街道账号，所以上级一定是市北区委 - Long pid = dtoResult.getData().getPid(); - - Result result = adminFeignClient.getParentAndAllDept(pid); - String pnames = dtoResult.getData().getParentName(); - entity.setParentDeptIds(result.getData().getParentDeptIds()+","+pid); - entity.setParentDeptNames(result.getData().getAllDeptNames()); - entity.setAllDeptIds(result.getData().getParentDeptIds()+","+pid + "," + entity.getGridId()); - entity.setAllDeptNames(result.getData().getAllDeptNames()+ "-" + entity.getGrid()); - } - baseDao.insert(entity); - - // img从hotLine 到 item - try { - changeImgHotLineToItem(itemHotlineEntity.getId(),entity.getId()); - }catch (Exception e){ - log.info("hotline图片转item失败，hotlineId"+itemHotlineEntity.getId()); - } - //插入项目部门关联表 - itemDeptService.savePeopleSubmitInfo(entity); - // 插入项目处理流程表 - ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); - itemHandleProcessEntity.setItemId(entity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); - itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); - itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); - itemHandleProcessEntity.setHandlerDeptId(entity.getGridId()); - itemHandleProcessEntity.setHandlerDept(entity.getGrid()); - itemHandleProcessService.insert(itemHandleProcessEntity); - //发送事件至区中心 - if ("1".equals(entity.getPeopleFlag())) { - //保存至企业表 - // itemEnterpriseService.savaZfInfo(entity, formDto); - ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); - dto.setId(entity.getId()); - dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); - dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - sendItemToDsf(dto, itemHandleProcessEntity); - } - + entity.setIssueLatitude(36.0761600000); + entity.setIssueLongitude(120.3332500000); + entity.setAppealSource(NumConstant.THREE_STR); + //执法诉求所属街道的市中心编码 + Result dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId()); + if (dtoResult.success()) { + // 因为是街道账号，所以上级一定是市北区委 + Long pid = dtoResult.getData().getPid(); + Result result = adminFeignClient.getParentAndAllDept(pid); + String pnames = dtoResult.getData().getParentName(); + entity.setParentDeptIds(result.getData().getParentDeptIds() + "," + pid); + entity.setParentDeptNames(result.getData().getAllDeptNames()); + entity.setAllDeptIds(result.getData().getParentDeptIds() + "," + pid + "," + entity.getGridId()); + entity.setAllDeptNames(result.getData().getAllDeptNames() + "-" + entity.getGrid()); + } + baseDao.insert(entity); + // img从hotLine 到 item + try { + changeImgHotLineToItem(itemHotlineEntity.getId(), entity.getId()); } catch (Exception e) { - StringBuffer str = new StringBuffer(); - str.append("12345数据发展"); - str.append("诉求上报，发送事件数据到市中心错误，12345数据Id->").append(hotlineDTO.getId()); - log.error(str.toString()); - e.printStackTrace(); + log.info("hotline图片转item失败，hotlineId" + itemHotlineEntity.getId()); + } + //插入项目部门关联表 + itemDeptService.savePeopleSubmitInfo(entity); + // 插入项目处理流程表 + ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); + itemHandleProcessEntity.setItemId(entity.getId()); + itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); + itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setHandlerDeptId(entity.getGridId()); + itemHandleProcessEntity.setHandlerDept(entity.getGrid()); + itemHandleProcessService.insert(itemHandleProcessEntity); + //发送事件至区中心 + if ("1".equals(entity.getPeopleFlag())) { + //保存至企业表 + // itemEnterpriseService.savaZfInfo(entity, formDto); + ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); + dto.setId(entity.getId()); + dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); + dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); + sendItemToDsf(dto, itemHandleProcessEntity); } + + } catch (Exception e) { + StringBuffer str = new StringBuffer(); + str.append("12345数据发展"); + str.append("诉求上报，发送事件数据到市中心错误，12345数据Id->").append(hotlineDTO.getId()); + log.error(str.toString()); + e.printStackTrace(); + } + return true; } @@ -6717,25 +6716,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem // try { - ItemHotlineEntity itemHotlineEntity = itemHotlineDao.selectById(hotlineDTO.getId()); - if (itemHotlineEntity == null){ - log.error("此id找不到12345热线数据"+hotlineDTO.getId()); + ItemHotlineEntity itemHotlineEntity = itemHotlineDao.selectById(hotlineDTO.getId()); + if (itemHotlineEntity == null) { + log.error("此id找不到12345热线数据" + hotlineDTO.getId()); // throw new Exception("此id找不到12345热线数据"+hotlineDTO.getId()); - } + } - itemHotlineEntity.setStreetId("1"); - itemHotlineDao.updateById(itemHotlineEntity); - if("1".equals(itemHotlineEntity.getCbFlag())){ - if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ + itemHotlineEntity.setStreetId("1"); + itemHotlineDao.updateById(itemHotlineEntity); + if ("1".equals(itemHotlineEntity.getCbFlag())) { + if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) - .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag,"0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ + itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) + .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) + .eq(ItemEntity::getDelFlag, "0"); + if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { return true; } } - }else { + } else { if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) @@ -6754,107 +6753,105 @@ public class ItemServiceImpl extends BaseServiceImpl implem && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) { throw new RenException("请用街道账号进行上报"); }*/ - ItemEntity itemEntity = new ItemEntity(); + ItemEntity itemEntity = new ItemEntity(); /* userID：zfsq+当前账户ID。 is_party_member:统一填0。 grid："执法诉求"+街道名称 grid_ID:街道ID */ - MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); - - List deptEntityList = metaSysDeptDao.selectList( - new LambdaQueryWrapper().eq(MetaSysDeptEntity::getDisCenterZoningCode,itemHotlineEntity.getOrgId()) - ); - if (deptEntityList.size()>0){ - metaSysDeptEntity = deptEntityList.get(0); - }else{ - log.error("此数据匹配不到部门"+itemHotlineEntity.getOrgId()); + MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); + + List deptEntityList = metaSysDeptDao.selectList( + new LambdaQueryWrapper().eq(MetaSysDeptEntity::getDisCenterZoningCode, itemHotlineEntity.getOrgId()) + ); + if (deptEntityList.size() > 0) { + metaSysDeptEntity = deptEntityList.get(0); + } else { + log.error("此数据匹配不到部门" + itemHotlineEntity.getOrgId()); // throw new Exception("此数据匹配不到部门"+itemHotlineEntity.getOrgId()); - } + } - itemEntity.setSerialNum(itemHotlineEntity.getCode()); - itemEntity.setSqid(itemHotlineEntity.getSqid()); - if("1".equals(itemHotlineEntity.getCbFlag())){ - itemEntity.setSqid(itemHotlineEntity.getCbid()); - } - itemEntity.setItemState(0); - itemEntity.setItemContent(itemHotlineEntity.getSjnr()); - itemEntity.setPeopleFlag("2");// 转换 - itemEntity.setAppealSource(NumConstant.THREE_STR); - itemEntity.setUserId(itemHotlineEntity.getDjr()); - itemEntity.setNickName(itemHotlineEntity.getDjrxm()); - itemEntity.setDistributeTime(itemHotlineEntity.getDjsj()); - itemEntity.setMobile(itemHotlineEntity.getLxfs()); - itemEntity.setIssueAddress(itemHotlineEntity.getDlwzmc()); - itemEntity.setIsPartyMember("0"); - // 上报网格化得经纬度 这里随便默认一个经纬度 - itemEntity.setIssueLatitude(36.0761600000); - itemEntity.setIssueLongitude(120.3332500000); - itemEntity.setGrid("执法诉求" + metaSysDeptEntity.getName()); - itemEntity.setGridId(metaSysDeptEntity.getId()); - - itemEntity.setLastHandleTime(new Date()); - itemEntity.setCategoryCode("13"); - itemEntity.setCategoryFullName("其他"); - itemEntity.setFirstCategoryCode("13"); - itemEntity.setItemCode("PT" + System.currentTimeMillis());//项目编号 - itemEntity.setIsPeople("1");//诉求上报 - //执法诉求所属街道的市中心编码 - Result dtoResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); - if (!dtoResult.success()) { - throw new RenException(dtoResult.getMsg()); - } + itemEntity.setSerialNum(itemHotlineEntity.getCode()); + itemEntity.setSqid(itemHotlineEntity.getSqid()); + if ("1".equals(itemHotlineEntity.getCbFlag())) { + itemEntity.setSqid(itemHotlineEntity.getCbid()); + } + itemEntity.setItemState(0); + itemEntity.setItemContent(itemHotlineEntity.getSjnr()); + itemEntity.setPeopleFlag("2");// 转换 + itemEntity.setAppealSource(NumConstant.THREE_STR); + itemEntity.setUserId(itemHotlineEntity.getDjr()); + itemEntity.setNickName(itemHotlineEntity.getDjrxm()); + itemEntity.setDistributeTime(itemHotlineEntity.getDjsj()); + itemEntity.setMobile(itemHotlineEntity.getLxfs()); + itemEntity.setIssueAddress(itemHotlineEntity.getDlwzmc()); + itemEntity.setIsPartyMember("0"); + // 上报网格化得经纬度 这里随便默认一个经纬度 + itemEntity.setIssueLatitude(36.0761600000); + itemEntity.setIssueLongitude(120.3332500000); + itemEntity.setGrid("执法诉求" + metaSysDeptEntity.getName()); + itemEntity.setGridId(metaSysDeptEntity.getId()); - // 因为是街道账号，所以上级一定是市北区委 - Long pids = dtoResult.getData().getPid(); - String pnames = dtoResult.getData().getParentName(); - // 因为是街道账号，所以上级一定是市北区委 - Long pid = dtoResult.getData().getPid(); + itemEntity.setLastHandleTime(new Date()); + itemEntity.setCategoryCode("13"); + itemEntity.setCategoryFullName("其他"); + itemEntity.setFirstCategoryCode("13"); + itemEntity.setItemCode("PT" + System.currentTimeMillis());//项目编号 + itemEntity.setIsPeople("1");//诉求上报 + //执法诉求所属街道的市中心编码 + Result dtoResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); + if (!dtoResult.success()) { + throw new RenException(dtoResult.getMsg()); + } + + // 因为是街道账号，所以上级一定是市北区委 + Long pids = dtoResult.getData().getPid(); + String pnames = dtoResult.getData().getParentName(); + // 因为是街道账号，所以上级一定是市北区委 + Long pid = dtoResult.getData().getPid(); - Result result = adminFeignClient.getParentAndAllDept(pid); + Result result = adminFeignClient.getParentAndAllDept(pid); // String pnames = dtoResult.getData().getParentName(); - itemEntity.setParentDeptIds(result.getData().getParentDeptIds()+","+pid); - itemEntity.setParentDeptNames(result.getData().getAllDeptNames()); - itemEntity.setAllDeptIds(result.getData().getParentDeptIds()+","+pid + "," + itemEntity.getGridId()); - itemEntity.setAllDeptNames(result.getData().getAllDeptNames()+ "-" + itemEntity.getGrid()); + itemEntity.setParentDeptIds(result.getData().getParentDeptIds() + "," + pid); + itemEntity.setParentDeptNames(result.getData().getAllDeptNames()); + itemEntity.setAllDeptIds(result.getData().getParentDeptIds() + "," + pid + "," + itemEntity.getGridId()); + itemEntity.setAllDeptNames(result.getData().getAllDeptNames() + "-" + itemEntity.getGrid()); /* // 流水号 String code = dtoResult.getData().getDisCenterZoningCode(); itemEntity.setSerialNum(getSerialNum("ZF" + code));*/ - baseDao.insert(itemEntity); - - // img从hotLine 到 item - try { - changeImgHotLineToItem(itemHotlineEntity.getId(),itemEntity.getId()); - }catch (Exception e){ - log.info("hotline图片转item失败，hotlineId"+itemHotlineEntity.getId()); - } - - //插入项目部门关联表 - itemDeptService.savePeopleSubmitInfo(itemEntity); - // 保存图片 - // 插入项目处理流程表 - ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); - itemHandleProcessEntity.setItemId(itemEntity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); - itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); - itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); - itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); - itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid()); - itemHandleProcessService.insert(itemHandleProcessEntity); - //发送事件至区中心 - ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); - dto.setId(itemEntity.getId()); - dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); - dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); + baseDao.insert(itemEntity); - sendItemToDsf(dto, itemHandleProcessEntity); + // img从hotLine 到 item + try { + changeImgHotLineToItem(itemHotlineEntity.getId(), itemEntity.getId()); + } catch (Exception e) { + log.info("hotline图片转item失败，hotlineId" + itemHotlineEntity.getId()); + } - // 23-6-28执法诉求响应 - itemAutoProcessRedis.produce(itemHandleProcessEntity.getId().concat(":8"), System.currentTimeMillis() + (59 * 1000)); + //插入项目部门关联表 + itemDeptService.savePeopleSubmitInfo(itemEntity); + // 保存图片 + // 插入项目处理流程表 + ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); + itemHandleProcessEntity.setItemId(itemEntity.getId()); + itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); + itemHandleProcessEntity.setHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setOutHandleAdvice("诉求已查收，正在办理。"); + itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); + itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid()); + itemHandleProcessService.insert(itemHandleProcessEntity); + //发送事件至区中心 + ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); + dto.setId(itemEntity.getId()); + dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); + dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); + sendItemToDsf(dto, itemHandleProcessEntity); + // 23-6-28执法诉求响应 + itemAutoProcessRedis.produce(itemHandleProcessEntity.getId().concat(":8"), System.currentTimeMillis() + (59 * 1000)); // }catch (Exception e){ @@ -6865,20 +6862,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result updataCaseEvaluation(QsjbEvaluation formDTO) { - log.info(formDTO.getPjjg()+"111111111111111111111111111111"+formDTO.toString()); ItemEntity itemBySqid = baseDao.getItemBySqid(formDTO.getSqid()); - if(null==itemBySqid){ - return new Result().error(1,"sqid："+formDTO.getSqid()+"不存在"); + if (null == itemBySqid) { + return new Result().error(1, "sqid：" + formDTO.getSqid() + "不存在"); } itemBySqid.setEvaluationState("0"); itemBySqid.setItemState(10); - if("01".equals(formDTO.getPjjg())){ + if ("01".equals(formDTO.getPjjg())) { itemBySqid.setEvaluationScore(2); - }else if("03".equals(formDTO.getPjjg())){ + } else if ("03".equals(formDTO.getPjjg())) { itemBySqid.setEvaluationScore(0); - }else{ + } else { itemBySqid.setEvaluationScore(1); } itemBySqid.setEvaluationTime(DateUtil.parse(formDTO.getPjsj())); @@ -6909,8 +6905,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取没有sqid的数据 筛选出 民生中 不是网格员上报 并且sqid是null的数据 LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper() - .isNull(ItemEntity::getSqid).eq(ItemEntity::getPeopleFlag,0).ne(ItemEntity::getAppealSource,0) - .ge(ItemEntity::getCreatedTime,"2023-11-01 00:00:00"); + .isNull(ItemEntity::getSqid).eq(ItemEntity::getPeopleFlag, 0).ne(ItemEntity::getAppealSource, 0) + .ge(ItemEntity::getCreatedTime, "2023-11-01 00:00:00"); // .orderByAsc(ItemEntity::getCreatedTime).last("limit 100") // List itemList = baseDao.selectList(itemEntityLambdaQueryWrapper); @@ -6926,12 +6922,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem // Thread.sleep(1000); LambdaQueryWrapper hanprocessThree = new LambdaQueryWrapper() - .eq(ItemHandleProcessEntity::getItemId,entity.getId()).eq(ItemHandleProcessEntity::getState,"11").orderByAsc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); + .eq(ItemHandleProcessEntity::getItemId, entity.getId()).eq(ItemHandleProcessEntity::getState, "11").orderByAsc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); ItemHandleProcessEntity itemThree = itemHandleProcessDao.selectOne(hanprocessThree); // 如果诉求处理没有11状态的就不重新推送 - if (itemThree != null){ + if (itemThree != null) { - if (entity.getSqid() == null){ + if (entity.getSqid() == null) { // todo 第一步 诉求登记 CityCaseLivelihoodDTO data = new CityCaseLivelihoodDTO(); data.setSqly(CityPushEnum.SQLY_WLFS.getCode()); @@ -6995,11 +6991,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 找到这一条的processid Thread.sleep(1000); LambdaQueryWrapper reportqw = new LambdaQueryWrapper() - .eq(ItemReportInterfaceLogEntity::getItemId,entity.getId()).eq(ItemReportInterfaceLogEntity::getInterfaceName,"响应接收").orderByAsc(ItemReportInterfaceLogEntity::getCreatedTime).last("limit 1"); + .eq(ItemReportInterfaceLogEntity::getItemId, entity.getId()).eq(ItemReportInterfaceLogEntity::getInterfaceName, "响应接收").orderByAsc(ItemReportInterfaceLogEntity::getCreatedTime).last("limit 1"); ItemReportInterfaceLogEntity itemReportInterfaceLogEntity = itemReportInterfaceLogDao.selectOne(reportqw); - if (itemReportInterfaceLogEntity!=null){ + if (itemReportInterfaceLogEntity != null) { ItemHandleProcessEntity item = itemHandleProcessDao.selectById(itemReportInterfaceLogEntity.getProcessId()); - if (item!=null){ + if (item != null) { // 利用item组装 ReceiveResultDTO dto = new ReceiveResultDTO(); dto.setSqid(entity.getSqid()); @@ -7030,7 +7026,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // todo 第三步 诉求处理 Thread.sleep(1000); - if (itemThree!=null){ + if (itemThree != null) { AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(itemThree.getId(), itemThree.getItemId()); ItemDTO itemDTO = baseDao.getCategoryInfo(itemThree.getItemId()); @@ -7046,7 +7042,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 当前处理环节 data.setDqclhj(CityPushLinkEnum.SQSH.getCode()); //处置标识 01 社区处置 02 街道处置 - data.setCzbs(itemThree.getHandlerDeptId()==0?"02":"01"); + data.setCzbs(itemThree.getHandlerDeptId() == 0 ? "02" : "01"); // 执法类型添加类型，纪要，进度字段 if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) { //办理进度 诉求分类是执法的时候 @@ -7147,9 +7143,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 找到这一条的processid Thread.sleep(1000); reportqw = new LambdaQueryWrapper() - .eq(ItemReportInterfaceLogEntity::getItemId,entity.getId()).eq(ItemReportInterfaceLogEntity::getInterfaceName,"诉求审核").orderByAsc(ItemReportInterfaceLogEntity::getCreatedTime).last("limit 1"); + .eq(ItemReportInterfaceLogEntity::getItemId, entity.getId()).eq(ItemReportInterfaceLogEntity::getInterfaceName, "诉求审核").orderByAsc(ItemReportInterfaceLogEntity::getCreatedTime).last("limit 1"); ItemReportInterfaceLogEntity itemReportInterfaceLogEntityFour = itemReportInterfaceLogDao.selectOne(reportqw); - if (itemReportInterfaceLogEntityFour!=null){ + if (itemReportInterfaceLogEntityFour != null) { ItemHandleProcessEntity item = itemHandleProcessDao.selectById(itemReportInterfaceLogEntityFour.getProcessId()); // 拼接数据 ObjectMapper objectMapper = new ObjectMapper(); @@ -7159,7 +7155,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } catch (IOException e) { } - if (appealHandlingResultDTO != null){ + if (appealHandlingResultDTO != null) { appealHandlingResultDTO.setSqid(entity.getSqid()); // 组装好直接推送 String result = cityGridApi.sendItemToCity(appealHandlingResultDTO, PushToCityGridConstant.APPEAL_AUDIT, "诉求审核"); @@ -7182,7 +7178,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setDqclhj(CityPushLinkEnum.JA.getCode()); dto.setJjqk(item.getSolutionInfo()); //评价结果 01：满意；02：基本满意；03：不满意 - if (item.getEvaluationScore()!=null){ + if (item.getEvaluationScore() != null) { switch (item.getEvaluationScore()) { case NumConstant.ZERO: dto.setCzjg("03"); @@ -7199,7 +7195,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem dto.setCzjg("01"); break; } - }else{ + } else { dto.setCzjg("01"); } //评价时间 @@ -7235,9 +7231,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 找到这一条的processid Thread.sleep(1000); LambdaQueryWrapper hanprocess = new LambdaQueryWrapper() - .eq(ItemHandleProcessEntity::getItemId,entity.getId()).eq(ItemHandleProcessEntity::getState,"60").orderByAsc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); + .eq(ItemHandleProcessEntity::getItemId, entity.getId()).eq(ItemHandleProcessEntity::getState, "60").orderByAsc(ItemHandleProcessEntity::getCreatedTime).last("limit 1"); ItemHandleProcessEntity item = itemHandleProcessDao.selectOne(hanprocess); - if (item!=null) { + if (item != null) { // 组装数据 PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO(); @@ -7298,10 +7294,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } - private void changeImgHotLineToItem(String hotLineId,String itemId){ + private void changeImgHotLineToItem(String hotLineId, String itemId) { List imgList = imgDao.selectListByRefeId(hotLineId); - imgList.forEach(img->{ + imgList.forEach(img -> { img.setId(null); img.setReferenceId(itemId); @@ -7315,7 +7311,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem } - @Override @Transactional public void backItem(ItemDTO dto) { @@ -7341,10 +7336,49 @@ public class ItemServiceImpl extends BaseServiceImpl implem item.setShjg(resultDTO.getShjg()); item.setClsj(resultDTO.getClsj()); item.setShyj(resultDTO.getShyj()); - if("01".equals(resultDTO.getShjg())){ + if ("01".equals(resultDTO.getShjg())) { item.setSolutionInfo(item.getJjqk()); item.setEvaluationScore(item.getPjjg()); } baseDao.updateById(item); } + + @Override + public void merge(ToCityMergeFormDTO mergeFormDTO) { + + } + + @Override + public Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO) { + + ItemEntity itemDTO = baseDao.selectById(appealAuditFormDTO.getItemId()); + + + itemDTO.setStreetAppealFlag("1"); + itemDTO.setAppealUrl(appealAuditFormDTO.getFiles()); + itemDTO.setJjqk(appealAuditFormDTO.getJjqk()); + if ("01".equals(appealAuditFormDTO.getPjjg())) { + itemDTO.setPjjg(2); + } else if ("03".equals(appealAuditFormDTO.getPjjg())) { + itemDTO.setPjjg(0); + } else { + itemDTO.setPjjg(1); + } + itemDTO.setAppealFlag(1); + itemDTO.setSsyy(appealAuditFormDTO.getSsyy()); + ItemEntity itemEntity = ConvertUtils.sourceToTarget(itemDTO, ItemEntity.class); + baseDao.updateById(itemEntity); + return new Result(); + } + + @Override + public void backAppeal(Map params) { + String districtReject = (String) params.get("districtReject"); + String id = (String) params.get("id"); + ItemEntity itemEntity = new ItemEntity(); + itemEntity.setId(id); + itemEntity.setStreetAppealFlag("2"); + itemEntity.setDistrictReject(districtReject); + baseDao.updateById(itemEntity); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 062283346..0c4121222 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -4338,6 +4338,16 @@ AND appeal_source != '3' AND DEL_FLAG = '0' and ITEM_STATE = '10' + + + + and i.STREET_APPEAL_FLAG != '2' + + + and i.STREET_APPEAL_FLAG != '1' + + + and i.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')