dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseFeedbackWebController.java
@@ -184,13 +184,13 @@ /** * 获取办理信息 * @url {ctx}/api/web/CaseFeedback/getFeedbackInfo * @param caseTaskId 纠纷任务编号 * @param caseId 纠纷编号 * @return Object */ @GetMapping("/getFeedbackInfo") public Object getFeedbackInfo(@RequestParam(value = "caseTaskId") String caseTaskId, @CurrentUser String userId) { public Object getFeedbackInfo(@RequestParam(value = "caseId") String caseId, @CurrentUser String userId) { try { return ReturnSucUtils.getRepInfo(service.getFeedbackInfo(caseTaskId, userId)); return ReturnSucUtils.getRepInfo(service.getFeedbackInfo(caseId, userId)); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); } dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
@@ -162,24 +162,25 @@ /** * 获取办理信息 * @param caseTaskId * @param caseId * @param userId * @return */ public Map<String, Object> getFeedbackInfo(String caseTaskId, String userId){ public Map<String, Object> getFeedbackInfo(String caseId, String userId){ // 临时给前端联调数据 Map<String, Object> result = Maps.newHashMap(); result.put("handleUnitName", "白云区教育局"); result.put("handleUserName", "王一顺"); result.put("assistUnitName", "白云区司法局"); result.put("acceptTime", "2024-09-07 12:34"); // CaseTask caseTask = caseTaskService.getById(caseTaskId); // if (ObjectUtils.isNotEmpty(caseTask)){ // result.put("handleUnitName", caseTask.getCandeUnitName()); // result.put("handleUserName", caseTask.getCandeUserName()); // result.put("assistUnitName", caseTask.getCandeUnitName()); // result.put("acceptTime", caseTask.getCreateTime()); // } // result.put("handleUnitName", "白云区教育局"); // result.put("handleUserName", "王一顺"); // result.put("assistUnitName", "白云区司法局"); // result.put("acceptTime", "2024-09-07 12:34"); CaseInfoUnfold caseInfoUnfold = unfoldService.getById(caseId); if (ObjectUtils.isNotEmpty(caseInfoUnfold)){ result.put("handleUserId", caseInfoUnfold.getMediatorId()); result.put("handleUnitName", caseInfoUnfold.getMediateUnitName()); result.put("handleUserName", caseInfoUnfold.getMediator()); result.put("assistUnitName", caseInfoUnfold.getAssistUnitName()); result.put("acceptTime", caseInfoUnfold.getAcceptTime()); } return result; }
@@ -563,25 +563,25 @@ // 为了演示先兼容小程序没属地问题，写死属地 if (ObjectUtils.isEmpty(caseInfo.getQueProv())) { caseInfo.setQueProv("19"); caseInfo.setQueProvName("广东"); caseInfo.setQueCity("1601"); caseInfo.setQueCityName("广州市"); caseInfo.setQueArea("50258"); caseInfo.setQueAreaName("白云区"); caseInfo.setQueRoad("62857"); caseInfo.setQueRoadName("新市街道"); // caseInfo.setQueProv("19"); // caseInfo.setQueProvName("广东"); // caseInfo.setQueCity("1601"); // caseInfo.setQueCityName("广州市"); // caseInfo.setQueArea("50258"); // caseInfo.setQueAreaName("白云区"); // caseInfo.setQueRoad("62857"); // caseInfo.setQueRoadName("新市街道"); // 根据经纬度查询问题属地 // QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat()); // caseInfo.setQueProv(queAddrBaseDTO.getQueProv()); // caseInfo.setQueProvName(queAddrBaseDTO.getQueProvName()); // caseInfo.setQueCity(queAddrBaseDTO.getQueCity()); // caseInfo.setQueCityName(queAddrBaseDTO.getQueCityName()); // caseInfo.setQueArea(queAddrBaseDTO.getQueArea()); // caseInfo.setQueAreaName(queAddrBaseDTO.getQueAreaName()); // caseInfo.setQueRoad(queAddrBaseDTO.getQueRoad()); // caseInfo.setQueRoadName(queAddrBaseDTO.getQueRoadName()); QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat()); caseInfo.setQueProv(queAddrBaseDTO.getQueProv()); caseInfo.setQueProvName(queAddrBaseDTO.getQueProvName()); caseInfo.setQueCity(queAddrBaseDTO.getQueCity()); caseInfo.setQueCityName(queAddrBaseDTO.getQueCityName()); caseInfo.setQueArea(queAddrBaseDTO.getQueArea()); caseInfo.setQueAreaName(queAddrBaseDTO.getQueAreaName()); caseInfo.setQueRoad(queAddrBaseDTO.getQueRoad()); caseInfo.setQueRoadName(queAddrBaseDTO.getQueRoadName()); } caseInfoUnfold.setId(caseInfo.getId()); caseInfoUnfold.setCreateTime(nowDate); @@ -600,7 +600,7 @@ caseInfo.setDagents(dagents.toString()); //todo case_title生成 caseInfo.setCaseTitle(this.createCaseTitle(plaintiffs.toString(), defendants.toString(), caseInfo.getCaseTypeName())); // caseInfo.setCaseTitle(this.createCaseTitle(plaintiffs.toString(), defendants.toString(), caseInfo.getCaseTypeName())); caseInfo.setInfoProcess(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getIndex()); caseInfo.setInfoProcessName(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getDes()); @@ -612,8 +612,15 @@ caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_2.getIndex()); caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes()); caseInfo.setCaseRef(utilsClient.createCaseRef()); caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_2.getIndex()); caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_2.getDes()); // 临时加上一级纠纷类型 caseInfo.setCaseTypeFirst("24_01-2"); caseInfo.setCaseTypeFirstName("劳动社保"); this.saveOrUpdate(caseInfo); caseInfoUnfoldService.saveOrUpdate(caseInfoUnfold); // 启动工作流-自动调度流程 caseTaskService.webStartFlowLFDJ(caseInfo); return registerSaveDTO.getId(); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -15,10 +15,12 @@ import cn.huge.module.mediate.constant.AuditBaseConstsEnum; import cn.huge.module.mediate.constant.CaseBaseConsts; import cn.huge.module.mediate.constant.CaseBaseConstsEnum; import cn.huge.module.sys.constant.FileOwnerTypeBaseEnum; import cn.huge.module.sys.dto.FileIdInfoBaseDTO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -173,29 +175,38 @@ } public TransactResultDTO getTransactResult(String caseId){ //查询办理结果信息 CaseInfoUnfold caseInfoUnfold = this.getById(caseId); try { //查询办理结果信息 CaseInfoUnfold caseInfoUnfold = this.getById(caseId); if(StringUtils.isNotBlank(caseInfoUnfold.getMediResult())) { TransactResultDTO transactResultDTO = new TransactResultDTO(); BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO); if (ObjectUtils.isNotEmpty(transactResultDTO)) { QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>(); caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1) .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex()); CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper); TransactResultDTO transactResultDTO = new TransactResultDTO(); BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO); if(ObjectUtils.isNotEmpty(transactResultDTO)){ QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>(); caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1) .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex()); CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper); if(ObjectUtils.isNotEmpty(caseAssistApply)){ transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName()); if (ObjectUtils.isNotEmpty(caseAssistApply)) { transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName()); } } Map<String, Object> terms = new HashMap<>(); terms.put("mainId", caseId); terms.put("ownerIds", "'" + caseId + "'"); terms.put("types", "'" + FileOwnerTypeBaseEnum.OWNER_TYPE_302.getIndex() + "'"); List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms); if (ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)) { transactResultDTO.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList()); } return transactResultDTO; }else { return null; } }catch (Exception e){ log.error("[CaseInfoUnfoldService.getTransactResult]调用失败，异常信息："+e, e); throw new ServiceException("CaseInfoUnfoldService.getTransactResult", e); } Map<String, Object> terms = new HashMap<>(); terms.put("mainId", caseId); terms.put("ownerIds", "'"+caseId+"'"); List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms); if(ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)){ transactResultDTO.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList()); } return transactResultDTO; } } dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
@@ -173,32 +173,40 @@ * @return */ public QueAddrBaseDTO getQueAddrByBaiduiLngLat(String lng, String lat){ QueAddrBaseDTO queAddrBaseDTO = new QueAddrBaseDTO(); BaiduMapAddrDTO baiduMapAddrDTO = BaiduMapUtils.getAddrByLngLat(lng, lat, BaiduMapUtils.coordtype_bd09ll); if (ObjectUtils.isNotEmpty(baiduMapAddrDTO)) { QueryWrapper<SyRegion> syRegionQueryWrapper = new QueryWrapper<>(); // 查询省 syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getProvince()); SyRegion province = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueProv(province.getId()); queAddrBaseDTO.setQueProvName(province.getName()); // 查询市 syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity()); SyRegion city = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueProv(city.getId()); queAddrBaseDTO.setQueProvName(city.getName()); // 查询区 syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict()); SyRegion district = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueProv(district.getId()); queAddrBaseDTO.setQueProvName(district.getName()); // 查询街道 syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown()); SyRegion town = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueProv(town.getId()); queAddrBaseDTO.setQueProvName(town.getName()); } return queAddrBaseDTO; try{QueAddrBaseDTO queAddrBaseDTO = new QueAddrBaseDTO(); BaiduMapAddrDTO baiduMapAddrDTO = BaiduMapUtils.getAddrByLngLat(lng, lat, BaiduMapUtils.coordtype_bd09ll); if (ObjectUtils.isNotEmpty(baiduMapAddrDTO)) { QueryWrapper<SyRegion> syRegionQueryWrapper = new QueryWrapper<>(); // 查询省 syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getProvince()); SyRegion province = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueProv(province.getId()); queAddrBaseDTO.setQueProvName(province.getName()); // 查询市 syRegionQueryWrapper.clear(); syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity()); SyRegion city = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueCity(city.getId()); queAddrBaseDTO.setQueCityName(city.getName()); // 查询区 syRegionQueryWrapper.clear(); syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict()); SyRegion district = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueArea(district.getId()); queAddrBaseDTO.setQueAreaName(district.getName()); // 查询街道 syRegionQueryWrapper.clear(); syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown()); SyRegion town = mapper.selectOne(syRegionQueryWrapper); queAddrBaseDTO.setQueRoad(town.getId()); queAddrBaseDTO.setQueRoadName(town.getName()); } return queAddrBaseDTO; }catch (Exception e){ log.error("[SyRegionService.getQueAddrByBaiduiLngLat]调用失败，异常信息："+e, e); throw new ServiceException("SyRegionService.getQueAddrByBaiduiLngLat", e); } }
