dyh-gateway/src/main/resources/config/application.yml
@@ -54,5 +54,5 @@ #refreshToken过期时间：13小时，比token时间长一点 expire-time: 46800000 #不进行token拦截 auth-skip-urls: /dyh-cust/api/web/ctAccount/login,/dyh-sys/api/v1/sync/universalSync,/dyh-utils/api/web/caseUtils/getNewTimeId,/dyh-utils/api/web/caseUtils/getNewTimeCaseId,/dyh-sys/api/web/fileInfo/show,/dyh-sys/api/web/fileInfo/down,/dyh-sys/api/wechat/fileInfo/show,/dyh-sys/api/wechat/fileInfo/down,/dyh-cust/api/wechat/paAccount/empower,/dyh-cust/api/web/ctAccount/gridLogin auth-skip-urls: /dyh-cust/api/web/ctAccount/login,/dyh-sys/api/v1/sync/universalSync,/dyh-utils/api/web/caseUtils/getNewTimeId,/dyh-utils/api/web/caseUtils/getNewTimeCaseId,/dyh-sys/api/web/fileInfo/show,/dyh-sys/api/web/fileInfo/down,/dyh-sys/api/wechat/fileInfo/show,/dyh-sys/api/wechat/fileInfo/down,/dyh-cust/api/wechat/paAccount/empower,/dyh-cust/api/web/ctAccount/gridLogin,/dyh-mediate/api/web/caseInfo/exportQueryAll
@@ -606,6 +606,7 @@ for (CasePageDTO casePageDTO : caseInfoPage.getContent()) { CaseInfoWeExcelDTO caseInfoWeExcelDTO = new CaseInfoWeExcelDTO(); BeanUtils.copyProperties(casePageDTO,caseInfoWeExcelDTO); caseInfoWeExcelDTO.setCloseTime(DateUtils.DateToString(casePageDTO.getCloseTime(), DateUtils.YYYY_MM_DD)); if(ObjectUtils.isNotEmpty(casePageDTO.getPlaintiffList())){ StringBuffer sb = new StringBuffer(); for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getPlaintiffList()) { dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -82,7 +82,26 @@ <result property="updateTime" column="update_time"/> </resultMap> <resultMap id="dataResult-all" type="cn.huge.module.cases.domain.dto.CasePageDTO"> <result property="id" column="id"/> <result property="status" column="status"/> <result property="statusName" column="status_name"/> <result property="canal" column="canal"/> <result property="canalName" column="canal_name"/> <result property="caseLevel" column="case_level"/> <result property="caseType" column="case_type"/> <result property="caseTypeName" column="case_type_name"/> <result property="inputUnitId" column="input_unit_id"/> <result property="inputUnitName" column="input_unit_name"/> <result property="mediResult" column="medi_result"/> <result property="mediResultName" column="medi_result_name"/> <result property="mediateDeptId" column="mediate_dept_id"/> <result property="mediateDeptName" column="mediate_dept_name"/> <result property="assistUnitId" column="assist_unit_id"/> <result property="assistUnitName" column="assist_unit_name"/> <result property="closeTime" column="close_time"/> <result property="agreeType" column="agree_type"/> <result property="agreeTypeName" column="agree_type_name"/> <result property="agreeContent" column="agree_content"/> </resultMap> <!-- 表 --> <sql id='table-name'>dyh_case_info</sql> @@ -97,9 +116,16 @@ a.case_type_name, a.input_unit_id, a.input_unit_name, b.medi_result, b.medi_result_name, b.mediate_dept_id, b.mediate_dept_name b.mediate_dept_name, b.assist_unit_id, b.assist_unit_name, b.close_time, b.agree_type, b.agree_type_name, b.agree_content </sql> <!-- 字段 --> <sql id="column-part"> dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java
@@ -84,6 +84,21 @@ private String isEvaluate; /** * 达成协议类型 */ private String agreeType; /** * 达成协议类型名称 */ private String agreeTypeName; /** * 已达成协议 */ private String agreeContent; /** * 申请人集合 * */ private List<CasePersonWechatDTO> plaintiffList; dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
@@ -17,14 +17,18 @@ private Integer caseLevel; @ExcelProperty(value="纠纷类型") private String caseTypeName; @ExcelProperty(value="调解结果") private String mediResultName; @ExcelProperty(value="实际调解部门") @ExcelProperty(value="承办部门") private String mediateDeptName; @ExcelProperty(value="登记组织") private String inputUnitName; @ExcelProperty(value="配合部门") private String assistUnitName; @ExcelProperty(value="化解结果") private String mediResultName; @ExcelProperty(value="办结时间") private String closeTime; @ExcelProperty(value="申请人") private String plaintiffStr; @ExcelProperty(value="被申请人") private String defendantStr; @ExcelProperty(value="登记机构") private String inputUnitName; } dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
@@ -1,8 +1,10 @@ package cn.huge.module.cases.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; import java.util.List; /** @@ -86,6 +88,24 @@ * 登记组织名称 */ private String inputUnitName; /** * 办结时间 */ private Date closeTime; /** * 达成协议类型 */ private String agreeType; /** * 达成协议类型名称 */ private String agreeTypeName; /** * 已达成协议 */ private String agreeContent; /** * 申请人集合 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WechatCaseFlowDTO.java
@@ -68,6 +68,8 @@ */ private String evaluateUserName; /** * 流程步骤 1-提交申请，2-事项办理，3-事项办结，4-事项评价 * */ private Integer processStep; } dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -806,6 +806,9 @@ caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName()); caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateDeptId()); caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateDeptName()); caseInfoWeChatDTO.setAgreeType(caseInfoUnfold.getAgreeType()); caseInfoWeChatDTO.setAgreeTypeName(caseInfoUnfold.getAgreeTypeName()); caseInfoWeChatDTO.setAgreeContent(caseInfoUnfold.getAgreeContent()); } QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>(); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -789,55 +789,53 @@ * @return */ public List<WechatCaseFlowDTO> wechatListCaseFlow(String caseId, String userId){ try{ // 封装办理流程 List<WechatCaseFlowDTO> list = new ArrayList<>(); CaseInfo caseInfo = caseInfoService.getById(caseId); // 提交申请 WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO(); tjsq.setProcessName("提交申请"); tjsq.setVisitWayName(caseInfo.getVisitWayName()); tjsq.setShowTime(caseInfo.getCreateTime()); tjsq.setCaseTypeName(caseInfo.getCaseTypeName()); list.add(tjsq); // 办理中 if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId); WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO(); sxbl.setProcessName("事项办理"); sxbl.setShowTime(caseInfoUnfold.getAcceptTime()); sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName()); list.add(sxbl); } // 已结案 if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId); WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO(); sxbj.setProcessName("事项办结"); sxbj.setShowTime(caseInfoUnfold.getCloseTime()); sxbj.setMediResult(caseInfoUnfold.getMediResult()); sxbj.setMediResultName(caseInfoUnfold.getMediResultName()); list.add(sxbj); } // 评价 QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>(); caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time"); List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper); if (CollectionUtils.isNotEmpty(caseEvaluateList)){ CaseEvaluate caseEvaluate = caseEvaluateList.get(0); WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO(); sxpj.setProcessName("事项评价"); sxpj.setShowTime(caseEvaluate.getCreateTime()); sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName()); sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade()); sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark()); list.add(sxpj); } return list; }catch (Exception e){ log.error("[CaseTaskService.wechatListCaseFlow]调用失败，异常信息："+e, e); throw new ServiceException("CaseTaskService.wechatListCaseFlow", e); // 封装办理流程 List<WechatCaseFlowDTO> list = new ArrayList<>(); CaseInfo caseInfo = caseInfoService.getById(caseId); // 提交申请 WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO(); tjsq.setProcessName("提交申请"); tjsq.setVisitWayName(caseInfo.getVisitWayName()); tjsq.setShowTime(caseInfo.getCreateTime()); tjsq.setCaseTypeName(caseInfo.getCaseTypeName()); tjsq.setProcessStep(1); list.add(tjsq); CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId); // 办理中 if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){ WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO(); sxbl.setProcessName("事项办理"); sxbl.setShowTime(caseInfoUnfold.getAcceptTime()); sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName()); sxbl.setProcessStep(2); list.add(sxbl); } // 已结案 if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3.getIndex()){ WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO(); sxbj.setProcessName("事项办结"); sxbj.setShowTime(caseInfoUnfold.getCloseTime()); sxbj.setMediResult(caseInfoUnfold.getMediResult()); sxbj.setMediResultName(caseInfoUnfold.getMediResultName()); sxbj.setProcessStep(3); list.add(sxbj); } // 评价 QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>(); caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time"); List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper); if (CollectionUtils.isNotEmpty(caseEvaluateList)){ CaseEvaluate caseEvaluate = caseEvaluateList.get(0); WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO(); sxpj.setProcessName("事项评价"); sxpj.setShowTime(caseEvaluate.getCreateTime()); sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName()); sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade()); sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark()); sxpj.setProcessStep(4); list.add(sxpj); } return list; } /** dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
@@ -197,6 +197,7 @@ service.deleteFileById(id); return ReturnSucUtils.getRepInfo(); } catch (Exception e) { log.error("controller接口[FileInfoWechatController.deleteFileById]请求异常："+e, e); return ReturnFailUtils.getRepInfo(); } } @@ -211,6 +212,22 @@ try { return ReturnSucUtils.getRepInfo(service.listByMainId(mainId)); } catch (Exception e) { log.error("controller接口[FileInfoWechatController.listByMainId]请求异常："+e, e); return ReturnFailUtils.getRepInfo(); } } /** * 根据多个所属编号查询附件 * @url {ctx}/api/wechat/fileInfo/listByMainIdAndType?mainId=&ownerType= * @return Object */ @GetMapping("/listByMainIdAndType") public Object listByMainIdAndType(@RequestParam(value = "mainId") String mainId,@RequestParam(value = "ownerType") String ownerType) { try { return ReturnSucUtils.getRepInfo(service.listByMainIdAndType(mainId,ownerType)); } catch (Exception e) { log.error("controller接口[FileInfoWechatController.listByMainIdAndType]请求异常："+e, e); return ReturnFailUtils.getRepInfo(); } } dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
@@ -481,27 +481,43 @@ * @return List */ public List<FileInfoBaseDTO> listByMainId(String mainId){ try { List<FileInfoBaseDTO> fileList = new ArrayList<>(); Map<String, Object> terms = new HashMap<>(); terms.put("mainId", mainId); List<FileInfo> fileInfoList = mapper.listFile(terms); if(CollectionUtils.isNotEmpty(fileInfoList)){ for (FileInfo fileInfo : fileInfoList) { FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO(); BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO); fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat())); fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType())); fileList.add(fileInfoBaseDTO); } List<FileInfoBaseDTO> fileList = new ArrayList<>(); Map<String, Object> terms = new HashMap<>(); terms.put("mainId", mainId); List<FileInfo> fileInfoList = mapper.listFile(terms); if(CollectionUtils.isNotEmpty(fileInfoList)){ for (FileInfo fileInfo : fileInfoList) { FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO(); BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO); fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat())); fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType())); fileList.add(fileInfoBaseDTO); } return fileList; }catch (Exception e){ log.error("[FileInfoService.listByMainId]调用失败，异常信息："+e, e); throw new ServiceException("FileInfoService.listByMainId", e); } return fileList; } /** * 根据多个所属编号查询附件 * @param mainId，ownerType * @return List */ public List<FileInfoBaseDTO> listByMainIdAndType(String mainId,String ownerType){ List<FileInfoBaseDTO> fileList = new ArrayList<>(); Map<String, Object> terms = new HashMap<>(); terms.put("mainId", mainId); terms.put("types", ownerType); List<FileInfo> fileInfoList = mapper.listFile(terms); if(CollectionUtils.isNotEmpty(fileInfoList)){ for (FileInfo fileInfo : fileInfoList) { FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO(); BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO); fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat())); fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType())); fileList.add(fileInfoBaseDTO); } } return fileList; } }
