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