From e35ffedea53ee8e629cbb2667ed9814c786380f5 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 13 May 2024 13:57:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E8=A7=A3=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../mscase/impl/MsSignSealServiceImpl.java | 136 +----------------- .../utils/FixSelectFlowDetailUtils.java | 2 +- 3 files changed, 7 insertions(+), 133 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 89ddc74..ace8348 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -190,7 +190,7 @@ imConfig: # 调解机构代码配置 organizeConfig: # creditCode - creditCode: 910000058386410047 + creditCode: 910000870060480009 # 引入仲裁系统url配置 arbitrateConfig: url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index 5db4cfb..6097745 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -77,6 +77,7 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; import static com.google.common.io.Files.getFileExtension; +import static com.ruoyi.common.core.domain.AjaxResult.error; import static com.ruoyi.common.core.domain.AjaxResult.success; @Slf4j @@ -671,7 +672,9 @@ public class MsSignSealServiceImpl implements MsSignSealService { Example msSealSignRecordExample = new Example(MsSealSignRecord.class); msSealSignRecordExample.createCriteria().andEqualTo("signFlowId", signFlowId); MsSealSignRecord sealSignRecordsel = sealSignRecordMapper.selectOneByExample(msSealSignRecordExample); - + if(sealSignRecordsel==null){ + return error("未找到签署流程"); + } String pensonAccountApply = sealSignRecordsel.getPensonAccount(); String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc(); String pensonAccountRes = sealSignRecordsel.getPensonAccountRes(); @@ -874,71 +877,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { //下载审核完成的调解书 msSignSealService.downloadMediationBook(caseApplicationselect, signFlowId, gson, caseAppliId); -// EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId); -// JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(), JsonObject.class); -// JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data"); -// JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray(); -// if (filesArray != null && filesArray.size() > 0) { -// JsonObject fileObject = (JsonObject) filesArray.get(0); -// String fileDownloadUrl = fileObject.get("downloadUrl").toString(); -// LocalDate now = LocalDate.now(); -// String year = Integer.toString(now.getYear()); -// String month = String.format("%02d", now.getMonthValue()); -// String day = String.format("%02d", now.getDayOfMonth()); -// String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; -// String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf"; -// String saveName = fileName; -// String savePath = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; -// -// // 创建日期目录 -// File saveFolder = new File(saveFolderPath); -// if (!saveFolder.exists()) { -// saveFolder.mkdirs(); -// } -// String resultFilePath = saveFolderPath + "/" + fileName; -// File resultFilePathFile = new File(resultFilePath); -// if (!resultFilePathFile.exists()) { -// resultFilePathFile.createNewFile(); -// } -// -// String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1); -// boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath); -// if (downLoadFile) { -// // 先删除已经存在的调解书 -// if(StrUtil.isEmpty(caseApplicationselect.getCaseSource())){ -// List existAttach = msCaseAttachMapper.listCaseAttachByCaseIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode()); -// if(CollectionUtil.isNotEmpty(existAttach)){ -// // 对接北明，同步案件状态，删除 -// for (MsCaseAttach msCaseAttach : existAttach) { -// if(StrUtil.isEmpty(msCaseAttach.getOtherSysFileId())||StrUtil.isEmpty(msCaseAttach.getAnnexPath())){ -// continue; -// } -// beiMingInterfaceService.deleteAttachmentInfo(caseApplicationselect.getCaseNum(), msCaseAttach.getOtherSysFileId(), FileUtil.getName(msCaseAttach.getAnnexPath())); -// } -// } -// } -// msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode()); -// MsCaseAttach caseAttach = new MsCaseAttach(); -// caseAttach.setCaseAppliId(caseAppliId); -// caseAttach.setAnnexType(AnnexTypeEnum.MEDIATE_BOOK.getCode()); -// caseAttach.setAnnexPath(savePath); -// caseAttach.setAnnexName(saveName); -// caseAttachMapper.save(caseAttach); -// // 对接北明，调用上传附件接口 -// if(StrUtil.isEmpty(caseApplicationselect.getCaseSource()) ) { -// String templatePath = "/home/ruoyi" + savePath; -// File file = new File(templatePath.replace("/profile", "/uploadPath")); -// MsCaseFileInfo caseFileInfo = beiMingInterfaceService.pushAttachmentInfo(BMUserName, BMPassword, file, BMSyncSource, caseApplicationselect.getCaseNum(), AttachmentOperateTypeEnum.ADD,DocumentTypeEnum.EVEDENT_AGREEMENT); -// // 更新附件表 -// if(caseFileInfo!=null && StrUtil.isNotEmpty(caseFileInfo.getFileId())){ -// caseAttach.setOtherSysFileId(caseFileInfo.getFileId()); -// msCaseAttachMapper.updateCaseAttachBycaseid(caseAttach); -// } -// -// } -// } -// -// } + } } else if (StringUtils.isNotEmpty(accountMobile) && accountMobile.equals(pensonAccountRes)) { //被申请人签名 @@ -965,71 +904,6 @@ public class MsSignSealServiceImpl implements MsSignSealService { //下载审核完成的调解书 msSignSealService.downloadMediationBook(caseApplicationselect, signFlowId, gson, caseAppliId); -// EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId); -// JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(), JsonObject.class); -// JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data"); -// JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray(); -// if (filesArray != null && filesArray.size() > 0) { -// JsonObject fileObject = (JsonObject) filesArray.get(0); -// String fileDownloadUrl = fileObject.get("downloadUrl").toString(); -// LocalDate now = LocalDate.now(); -// String year = Integer.toString(now.getYear()); -// String month = String.format("%02d", now.getMonthValue()); -// String day = String.format("%02d", now.getDayOfMonth()); -// String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; -// String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf"; -// String saveName = fileName; -// String savePath = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; -// -// // 创建日期目录 -// File saveFolder = new File(saveFolderPath); -// if (!saveFolder.exists()) { -// saveFolder.mkdirs(); -// } -// String resultFilePath = saveFolderPath + "/" + fileName; -// File resultFilePathFile = new File(resultFilePath); -// if (!resultFilePathFile.exists()) { -// resultFilePathFile.createNewFile(); -// } -// -// String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1); -// boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath); -// if (downLoadFile) { -// // 先删除已经存在的调解书 -// if(StrUtil.isEmpty(caseApplicationselect.getCaseSource())){ -// List existAttach = msCaseAttachMapper.listCaseAttachByCaseIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode()); -// if(CollectionUtil.isNotEmpty(existAttach)){ -// // 对接北明，同步案件状态，删除 -// for (MsCaseAttach msCaseAttach : existAttach) { -// if(StrUtil.isEmpty(msCaseAttach.getOtherSysFileId())||StrUtil.isEmpty(msCaseAttach.getAnnexPath())){ -// continue; -// } -// beiMingInterfaceService.deleteAttachmentInfo(caseApplicationselect.getCaseNum(), msCaseAttach.getOtherSysFileId(), FileUtil.getName(msCaseAttach.getAnnexPath())); -// } -// } -// } -// msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode()); -// MsCaseAttach caseAttach = new MsCaseAttach(); -// caseAttach.setCaseAppliId(caseAppliId); -// caseAttach.setAnnexType(7); -// caseAttach.setAnnexPath(savePath); -// caseAttach.setAnnexName(saveName); -// -// // 对接北明，调用上传附件接口 -// -// if(StrUtil.isEmpty(caseApplicationselect.getCaseSource()) ) { -// String templatePath = "/home/ruoyi" + savePath; -// File file = new File(templatePath.replace("/profile", "/uploadPath")); -// MsCaseFileInfo caseFileInfo = beiMingInterfaceService.pushAttachmentInfo(BMUserName, BMPassword, file, BMSyncSource, caseApplicationselect.getCaseNum(), AttachmentOperateTypeEnum.ADD,DocumentTypeEnum.EVEDENT_AGREEMENT); -// // 更新附件表 -// if(caseFileInfo!=null && StrUtil.isNotEmpty(caseFileInfo.getFileId())){ -// caseAttach.setOtherSysFileId(caseFileInfo.getFileId()); -// } -// } -// caseAttachMapper.save(caseAttach); -// } -// -// } } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java index e4320e5..0a1dc64 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java @@ -163,7 +163,7 @@ public class FixSelectFlowDetailUtils { /** * 定时查询印章审核状态 */ - @Scheduled(cron = "0/30 * * * * ?") +// @Scheduled(cron = "0/30 * * * * ?") @Transactional public void searchForInstitutionalSeal() { try { From 8f9f16254a46042e561762ec62e4f11663f67d89 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Thu, 16 May 2024 16:08:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E8=A7=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/MsCaseApplicationService.java | 8 ++- .../impl/MsCaseApplicationServiceImpl.java | 58 +++++++++++++------ .../mscase/impl/MsSignSealServiceImpl.java | 37 +++++++----- .../mscase/MsCaseAffiliateMapper.xml | 2 +- 4 files changed, 68 insertions(+), 37 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java index 3d5bea1..b8e0322 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java @@ -57,15 +57,17 @@ public interface MsCaseApplicationService { * @param affiliate * @param groupOrder 组别 * @param operatorCount 操作人数量 + * @param updateFlag 是否修改案件 */ - public int setCaseAfflicate(MsCaseApplicationVO caseApplication, MsCaseAffiliate affiliate,int groupOrder,int operatorCount); + public int setCaseAfflicate(MsCaseApplicationVO caseApplication, MsCaseAffiliate affiliate,int groupOrder,int operatorCount,boolean updateFlag); /** * 新增案件相关人员信息 * @param affiliate 相关人员信息 - * @param roleId 角色id + * @param roleIdList 角色id + * @param updateFlag 是否修改案件 */ - public void insertAfficateUser(MsCaseAffiliate affiliate, List roleIdList); + public void insertAfficateUser(MsCaseAffiliate affiliate, List roleIdList,boolean updateFlag); /** * 新增案件 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index 6414647..26be72e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -701,17 +701,17 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { if(CollectionUtil.isNotEmpty(applicant)){ for (int i = 0; i < applicant.size(); i++) { // 申请人 - appOperatorCount= setCaseAfflicate(caseApplication, applicant.get(i).getApplicant(),i,appOperatorCount); + appOperatorCount= setCaseAfflicate(caseApplication, applicant.get(i).getApplicant(),i,appOperatorCount,false); // 申请人代理人 - appOperatorCount=setCaseAfflicate(caseApplication, applicant.get(i).getApplicantAgent(),i,appOperatorCount); + appOperatorCount=setCaseAfflicate(caseApplication, applicant.get(i).getApplicantAgent(),i,appOperatorCount,false); } } if(CollectionUtil.isNotEmpty(res)){ for (int i = 0; i < res.size(); i++) { // 申请人 - resOperatorCount= setCaseAfflicate(caseApplication, res.get(i).getRes(),i,resOperatorCount); + resOperatorCount= setCaseAfflicate(caseApplication, res.get(i).getRes(),i,resOperatorCount,false); // 申请人代理人 - resOperatorCount= setCaseAfflicate(caseApplication, res.get(i).getResAgent(),i,resOperatorCount); + resOperatorCount= setCaseAfflicate(caseApplication, res.get(i).getResAgent(),i,resOperatorCount,false); } } if (appOperatorCount < 1 && resOperatorCount < 1) { @@ -769,9 +769,12 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { * 设置案件相关信息 * @param caseApplication * @param affiliate + * @param groupOrder 组别 + * @param operatorCount 操作人数量 + * @param updateFlag 是否修改案件 */ @Transactional - public int setCaseAfflicate(MsCaseApplicationVO caseApplication, MsCaseAffiliate affiliate,int groupOrder,int operatorCount) { + public int setCaseAfflicate(MsCaseApplicationVO caseApplication, MsCaseAffiliate affiliate,int groupOrder,int operatorCount,boolean updateFlag) { if(affiliate==null){ return operatorCount; } @@ -793,8 +796,6 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { } affiliate.setCaseAppliId(caseApplication.getId()); List roleIdList = new ArrayList<>(); - // Long roleId = null; - switch (affiliate.getRoleType()) { case 1: roleIdList.add((Long) applicantObj); @@ -827,19 +828,28 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { } break; default: - break; } // 如果是申请人，则和用户表关联 if (affiliate.getOrganizeFlag() == 0) { - caseApplicationService.insertAfficateUser(affiliate, roleIdList); + caseApplicationService.insertAfficateUser(affiliate, roleIdList, updateFlag); } else { // 申请机构 if (affiliate.getRoleType() == 1 || affiliate.getRoleType()==3) { affiliate.setOperatorFlag(0); // 申请人，从缓存中判断部门是否存在 -// Object deptCache = redisCache.getCacheObject(CacheConstants.DEPT_KEY + affiliate.getName()); - SysDept dept = sysDeptMapper.selectDeptByName(affiliate.getName()); + SysDept dept = null; + if(!updateFlag) { + // 新增则根据部门名称查 + dept = sysDeptMapper.selectDeptByName(affiliate.getName()); + }else { + if(affiliate.getApplicantDeptId()!=null){ + // 修改根据部门id查 + dept = sysDeptMapper.selectDeptById(affiliate.getApplicantDeptId()); + }else { + dept = sysDeptMapper.selectDeptByName(affiliate.getName()); + } + } if (dept==null) { // 不存在该部门，新增 dept = new SysDept(); @@ -872,7 +882,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { } affiliate.setApplicantDeptId(dept.getDeptId()); } else { - caseApplicationService.insertAfficateUser(affiliate, roleIdList); + caseApplicationService.insertAfficateUser(affiliate, roleIdList, updateFlag); } } // 保存人员 @@ -887,15 +897,27 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { * 新增案件相关人员信息 * @param affiliate 相关人员信息 * @param roleIdList 角色id + * @param updateFlag 是否修改案件 */ @Transactional - public void insertAfficateUser(MsCaseAffiliate affiliate, List roleIdList) { + public void insertAfficateUser(MsCaseAffiliate affiliate, List roleIdList,boolean updateFlag) { if(StrUtil.isEmpty(affiliate.getEmail())){ return; } - SysUser user = sysUserMapper.selectUserByEmail(affiliate.getEmail()); + SysUser user=null; + if(!updateFlag) { + // 新增案件则根据邮箱查用户 + user = sysUserMapper.selectUserByEmail(affiliate.getEmail()); + }else { + // 修改案件则根据userId查用户 + if(affiliate.getUserId()!=null) { + user = sysUserMapper.selectUserById(affiliate.getUserId()); + }else { + user = sysUserMapper.selectUserByEmail(affiliate.getEmail()); + } + } // 判断该用户是否存在 if(user==null){ // 不存在，则新增 @@ -1079,17 +1101,17 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { if(CollectionUtil.isNotEmpty(applicant)){ for (int i = 0; i < applicant.size(); i++) { // 申请人 - appOperatorCount=setCaseAfflicate(caseApplication, applicant.get(i).getApplicant(),i,appOperatorCount); + appOperatorCount=setCaseAfflicate(caseApplication, applicant.get(i).getApplicant(),i,appOperatorCount,true); // 申请人代理人 - appOperatorCount= setCaseAfflicate(caseApplication, applicant.get(i).getApplicantAgent(),i,appOperatorCount); + appOperatorCount= setCaseAfflicate(caseApplication, applicant.get(i).getApplicantAgent(),i,appOperatorCount,true); } } if(CollectionUtil.isNotEmpty(res)){ for (int i = 0; i < res.size(); i++) { // 申请人 - resOperatorCount=setCaseAfflicate(caseApplication, res.get(i).getRes(),i,resOperatorCount); + resOperatorCount=setCaseAfflicate(caseApplication, res.get(i).getRes(),i,resOperatorCount,true); // 申请人代理人 - resOperatorCount=setCaseAfflicate(caseApplication, res.get(i).getResAgent(),i,resOperatorCount); + resOperatorCount=setCaseAfflicate(caseApplication, res.get(i).getResAgent(),i,resOperatorCount,true); } } if (appOperatorCount < 1 && resOperatorCount < 1) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index 6097745..58737bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -317,23 +317,30 @@ public class MsSignSealServiceImpl implements MsSignSealService { if (record.getCreateTime() != null) { caseNodeTime = DateUtil.format(record.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER); } - Integer caseNode = record.getCaseNode(); - String createBy = record.getCreateBy(); - if (StrUtil.isNotEmpty(createBy)) { - contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime); - } else { - contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("于").append(caseNodeTime); - } - if (StrUtil.isNotEmpty(record.getContent())) { - contentBuilder.append(record.getContent()); - } else if (caseNode.intValue() == 0) { - contentBuilder.append(record.getCaseStatusName()); + Integer caseNode = record.getCaseNode(); + if(caseNode!=null) { + if(caseNode.equals(17)){ + contentBuilder.append("调解案件于").append(caseNodeTime).append("结束"); + }else { + String createBy = record.getCreateBy(); + if (StrUtil.isNotEmpty(createBy)) { + contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime); + } else { + contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("于").append(caseNodeTime); + } + + if (StrUtil.isNotEmpty(record.getContent())) { + contentBuilder.append(record.getContent()); + } else if (caseNode.intValue() == 0) { + contentBuilder.append(record.getCaseStatusName()); + } + if (StrUtil.isNotEmpty(record.getNotes())) { + contentBuilder.append("，").append(record.getNotes()); + } + } + record.setContent(contentBuilder.toString()); } - if (StrUtil.isNotEmpty(record.getNotes())) { - contentBuilder.append("，").append(record.getNotes()); - } - record.setContent(contentBuilder.toString()); }); } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml index 53d3d2e..ee8ae75 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml @@ -40,7 +40,7 @@ + select t.* from( SELECT - c.id,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus, + c.id,c.create_by creatBy,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus, c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum, u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime, c.mediation_method mediationMethod, @@ -123,7 +133,7 @@ c.id union SELECT - c.id,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus, + c.id,c.create_by creatBy,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus, c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum, u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime, c.mediation_method mediationMethod, @@ -149,7 +159,7 @@ - AND c.case_num = #{req.caseNum} + AND c.case_num like concat('%',#{req.caseNum},'%') From 0bf88192cfcbecbed540a93a1c6394651c144ee8 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 21 May 2024 13:47:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E8=A7=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/MsVideoConferenceController.java | 3 +- .../impl/MsCaseApplicationServiceImpl.java | 3 +- .../mscase/MsCaseApplicationMapper.xml | 37 ++++++++++--------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java index fb42a37..18168db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java @@ -71,6 +71,7 @@ public class MsVideoConferenceController extends BaseController { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); String suffix = getFileExtension(fileName); if(StrUtil.isNotEmpty(suffix)&& suffix.contains("doc")){ @@ -110,7 +111,7 @@ public class MsVideoConferenceController extends BaseController { AjaxResult ajax = AjaxResult.success(); ajax.put("annexId", caseAttach.getAnnexId()); ajax.put("annexType", annexType); - // ajax.put("url", url); + ajax.put("onlyOfficeFileId", caseAttach.getOnlyOfficeFileId()); ajax.put("fileName", fileName); ajax.put("newFileName", FileUtils.getName(fileName)); ajax.put("originalFilename", file.getOriginalFilename()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index 51b2383..949b509 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -311,7 +311,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { if(StrUtil.isEmpty(loginUser.getUsername())){ vo.setAgentFlag(0); }else { - if(StrUtil.equals(loginUser.getUsername(),vo.getCreatBy()) && agentFlag){ + // todo 如果案件流程id变了需要改 + if(StrUtil.equals(loginUser.getUsername(),vo.getCreatBy()) && agentFlag && vo.getCaseFlowId()!=null && mediatorSort!=null && vo.getCaseFlowId() @@ -87,13 +88,7 @@ AND c.case_num like concat('%',#{req.caseNum},'%') - - - and c.create_time >= #{req.startTime} - - - and c.create_time <= #{req.endTime} - + @@ -161,18 +156,26 @@ AND c.case_num like concat('%',#{req.caseNum},'%') - - - and c.create_time >= #{req.startTime} - - - and c.create_time <= #{req.endTime} - + + + + + + + GROUP BY c.id - ) t ORDER BY t.createTime desc,t.caseNum desc + ) t + + + and t.createTime >= #{req.startTime} + + + and t.createTime <= #{req.endTime} + + ORDER BY t.createTime desc,t.caseNum desc + select * + from ms_case_attach + where annex_id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml index db15513..1cb40b8 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml @@ -21,8 +21,7 @@ From 9b8b004edf893470f3ca4c31d34af746ea49f3c0 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 31 May 2024 09:16:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/controller/BaseController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 8221fc1..7b973ab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditorSupport; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -83,6 +84,9 @@ public class BaseController @SuppressWarnings({ "rawtypes", "unchecked" }) protected TableDataInfo getDataTable(List list) { + if(list == null){ + list=new ArrayList<>(); + } TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); @@ -112,7 +116,7 @@ public class BaseController */ public AjaxResult success(String message) { - return AjaxResult.success(message); + return AjaxResult .success(message); } /** From 32846984c067fb237cc3854a6b5fe70821785ada Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 31 May 2024 16:46:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/MsCaseApplicationMapper.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml index f4592dd..0034648 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml @@ -175,6 +175,17 @@ and t.createTime <= #{req.endTime} + + + AND t.caseFlowId = #{req.caseFlowId} + + + AND t.id = #{req.caseId} + + + + AND t.caseNum like concat('%',#{req.caseNum},'%') + ORDER BY t.createTime desc,t.caseNum desc