回退上报流程bug修复

liyj

2024-09-14 1fa35230344cbc98d02f612635aee38698d40df3

 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;
    }

@@ -189,30 +190,36 @@
     * @return Page
     */
    public Map<String, Object> listFeedback(String id) {
        Map<String, Object> result = new HashMap<>();
        try {
            Map<String, Object> result = new HashMap<>();
            CaseInfoUnfold caseInfoUnfold = unfoldService.getById(id);
            if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
                result.put("manager", caseInfoUnfold.getMediator());
            }
            QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
            caseFeedbackQueryWrapper.eq("case_id", id);
            List<CaseFeedback> caseFeedbackList = mapper.selectList(caseFeedbackQueryWrapper);

        CaseInfoUnfold caseInfoUnfold = unfoldService.getById(id);
        result.put("manager", caseInfoUnfold.getMediator());
        QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
        caseFeedbackQueryWrapper.eq("case_id", id);
        List<CaseFeedback> caseFeedbackList = mapper.selectList(caseFeedbackQueryWrapper);
            String ownerIds = caseFeedbackList.stream().map(CaseFeedback::getId).collect(Collectors.joining("','"));
            ownerIds = "'"+ ownerIds + "'";
            Map<String, Object> map = new HashMap<>();
            map.put("mainId", id);
            map.put("ownerIds", ownerIds);
            List<FileIdInfoBaseDTO> fileInfoList = sysClient.listIdInfoByOwnerIdList(map);

        String ownerIds = caseFeedbackList.stream().map(CaseFeedback::getId).collect(Collectors.joining("','"));
        ownerIds = "'"+ ownerIds + "'";
        Map<String, Object> map = new HashMap<>();
        map.put("mainId", id);
        map.put("ownerIds", ownerIds);
        List<FileIdInfoBaseDTO> fileInfoList = sysClient.listIdInfoByOwnerIdList(map);

        for(CaseFeedback caseFeedback: caseFeedbackList){
            for(FileIdInfoBaseDTO fileInfo: fileInfoList){
                if(caseFeedback.getId().equals(fileInfo.getOwnerId())){
                    caseFeedback.setFileInfoList(fileInfo.getFileList());
            for(CaseFeedback caseFeedback: caseFeedbackList){
                for(FileIdInfoBaseDTO fileInfo: fileInfoList){
                    if(caseFeedback.getId().equals(fileInfo.getOwnerId())){
                        caseFeedback.setFileInfoList(fileInfo.getFileList());
                    }
                }
            }
            result.put("caseFeedbackList", caseFeedbackList);
            return result;
        }catch (Exception e){
            log.error("[caseFeedbackService.listFeedback]调用失败，异常信息："+e, e);
            throw new ServiceException("caseFeedbackService.listFeedback", e);
        }
        result.put("caseFeedbackList", caseFeedbackList);
        return result;
    }

    /**