From 6b73802bf74d0a1e478cded327b94969e2f48881 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 28 Nov 2023 10:37:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 13 +++- .../service/ICaseApplicationService.java | 6 ++ .../impl/CaseApplicationServiceImpl.java | 41 +++++------ .../wisdomarbitrate/CaseApplicationMapper.xml | 70 +++++++++---------- 4 files changed, 71 insertions(+), 59 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 15bd80f..e3b4e93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -439,5 +439,16 @@ public class CaseApplicationController extends BaseController { return caseApplicationService.uploadCaseZipFile(file); } - + /** + * 根据附件id修改案件id + * @param caseAttach + * @return + */ + @PostMapping("/updateCaseIdByAnnexId") + public AjaxResult updateCaseIdByAnnexId(@RequestBody CaseAttach caseAttach) { + if(caseAttach.getAnnexId()==null || caseAttach.getCaseAppliId()==null){ + return error("参数校验失败"); + } + return caseApplicationService.updateCaseIdByAnnexId(caseAttach); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 5ffc79d..c974814 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -114,4 +114,10 @@ public interface ICaseApplicationService { AjaxResult uploadCaseZipFile(MultipartFile file); + /** + * 根据附件id修改案件id + * @param caseAttach + * @return + */ + AjaxResult updateCaseIdByAnnexId(CaseAttach caseAttach); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index c7298dc..e4a2ca7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -184,7 +184,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { || "部门长".equals(role.getRoleName())) { List caseStatusList = new ArrayList<>(); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); + // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); caseApplication.setIsOtherRole(1); } @@ -260,7 +260,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { || "部门长".equals(role.getRoleName())) { caseApplication.setIsOtherRole(1); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); + // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); } if ("仲裁员".equals(role.getRoleName())) { @@ -2127,14 +2127,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseApplication.setId(messageVO.getId()); CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); String returnResult = "短信发送成功"; - //todo 需要申请模板，申请人，被申请人发送短信通知 + // 需要申请模板，申请人，被申请人发送短信通知 SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); String startFormat = ""; String endFormat = ""; // 创建房间短信通知 - if (messageVO.getScheduleStartTime() == null) { - request.setTemplateId("1983692"); - } else { String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式 Date startDate = messageVO.getScheduleStartTime(); Date endDate = messageVO.getScheduleEndTime(); @@ -2143,20 +2140,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { endFormat = sdf.format(endDate); // 预约会议短信模板 request.setTemplateId("1983711"); - } + for (CaseAffiliate caseAffiliate : caseAffiliates) { request.setPhone(caseAffiliate.getContactTelphone()); request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()}); - // 1952136 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。 String userId = (null == caseAffiliate.getUserId() ? "" : caseAffiliate.getUserId()); - if (messageVO.getScheduleStartTime() == null) { - // 1983692 开庭审理创建会议通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 - request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId}); - } else { - // 1983711 开庭审理预约会议短信通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 - request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId, startFormat + "-" + endFormat}); - } + // 1983711 开庭审理预约会议短信通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 + request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() , startFormat + "-" + endFormat}); + Boolean aBoolean = SmsUtils.sendSms(request); //保存短信发送记录 SmsSendRecord smsSendRecord = new SmsSendRecord(); @@ -2164,13 +2156,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum()); smsSendRecord.setPhone(request.getPhone()); smsSendRecord.setSendTime(new Date()); - String content = ""; - if (messageVO.getScheduleStartTime() == null) { - content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。"; - } else { - content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "会议时间为" + startFormat + "-" + endFormat + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。"; - - } + String content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + "会议时间为" + startFormat + "-" + endFormat + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。"; smsSendRecord.setSendContent(content); String userName; @@ -2955,6 +2941,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } + /** + * 根据附件id修改案件id + * @param caseAttach + * @return + */ + @Override + public AjaxResult updateCaseIdByAnnexId(CaseAttach caseAttach) { + caseAttachMapper.updateCaseAttach(caseAttach); + return success(); + } + public static List findAndConvertPDF(File directory) { List pdfPaths = new ArrayList<>(); if (directory.isFile()) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 2d1d655..929119d 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -305,7 +305,7 @@ WHERE case_appli_id = c.id ) WHERE - ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31) + ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31) and c.case_status in @@ -676,13 +676,11 @@ - - - - - + + or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1 + and t.case_status in (0,2,17)) - + or (t.identity_type=1 and t.case_status in @@ -708,37 +706,37 @@ union - - + + - select l.case_appli_id id , - c.case_status,ca.application_organ_id, - c.arbitrator_id,ca.identity_num , ca.identity_type - from case_application c - JOIN case_application_log l ON c.id = l.case_appli_id - JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1 and c.version=l.version - - (c.case_status <= 10 or c.case_status=31) AND ca.identity_type=1 + + + + + + + + - - AND ca.application_organ_id = #{applicationOrganId} - - - AND c.case_status = #{caseStatus} - - - AND c.case_num = #{caseNum} - - - AND ca.application_organ_id=#{nameId} - + + + + + + + + + + + + - - AND c.lock_status = #{lockStatus} - - - union - + + + + + + @@ -757,7 +755,7 @@ WHERE case_appli_id = c.id ) WHERE - ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31) + ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31) and ca.application_organ_id in From 6bcb7ac3e81c2fad74b052d0e92bd342f53ac867 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 28 Nov 2023 11:34:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/CaseEvidenceController.java | 13 +++++-------- .../wisdomarbitrate/domain/vo/CaseEvidenceVO.java | 12 ++++++++++++ .../service/ICaseEvidenceService.java | 2 +- .../service/impl/CaseEvidenceServiceImpl.java | 9 +++++---- .../mapper/wisdomarbitrate/CaseEvidenceMapper.xml | 7 +++++-- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java index c4f1455..fdaadcc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java @@ -101,17 +101,14 @@ public class CaseEvidenceController extends BaseController { /** * 查询当前用户案件列表 * - * @param identityNum + * @param caseStatus * @return */ @GetMapping("/all") - public TableDataInfo getCaseListAll(@RequestParam(required = false) String identityNum) { - startPage(); - List list = caseEvidenceService.getCaseListAll(identityNum); - if (list != null) { - return getDataTable(list); - } - return getDataTable(new ArrayList<>()); + public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) { + + return success(caseEvidenceService.getCaseListAll(caseStatus)); + } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java index 7dca799..da1e6f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java @@ -1,8 +1,11 @@ package com.ruoyi.wisdomarbitrate.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + @Data public class CaseEvidenceVO { /** @@ -25,4 +28,13 @@ public class CaseEvidenceVO { * 案件状态 */ private Integer caseStatus; + /** + * 房间号 + */ + private Long roomId; + /** + * 开庭时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date scheduleStartTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java index 816e2e2..cdd7787 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java @@ -17,7 +17,7 @@ public interface ICaseEvidenceService { AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id,String userName,Long userId); - List getCaseListAll(String identityNum); + List getCaseListAll(Integer caseStatus); AjaxResult evidenceConfirmation(CaseApplication caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index 09ea6f9..f3c4ee3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -147,10 +147,10 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { IdentityAuthenticationMapper identityAuthenticationMapper; @Override - public List getCaseListAll(String identityNum) { + public List getCaseListAll(Integer caseStatus) { // 是否为超级管理员 int adMinFlag=0; - if (StringUtils.isBlank(identityNum)) { + String identityNum = ""; IdentityAuthentication authentication = new IdentityAuthentication(); LoginUser loginUser = SecurityUtils.getLoginUser(); // 查询该用户的角色 @@ -175,8 +175,8 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { identityNum = authentication1.getIdentityNo(); } } - } - List caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI); + + List caseStatusList = Arrays.asList(caseStatus); return getCaseEvidenceVOList(identityNum, caseStatusList, 2); } @@ -430,6 +430,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { private List getCaseEvidenceVOList(String identityNum, List caseStatusList, Integer identityType) { List caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType); + // todo 返回房间号和开庭时间 if (caseListByRespondent != null && caseListByRespondent.size() > 0) { for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) { //根据案件id查询姓名 diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml index 898e044..445d757 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml @@ -7,10 +7,13 @@ + +