diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java index 05d366e..c7d7541 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java @@ -42,6 +42,9 @@ public class CaseAttach { * 用户账户 */ private String userName; - + /** + * 印章状态(0未启用,1已启用) + */ + private Integer sealStatus; } 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 252d872..49cdbc4 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 @@ -131,7 +131,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { * @param caseApplication * @return */ -// @Override + @Override public List selectCaseApplicationListByRole(CaseApplication caseApplication) { // 获取登录用户 LoginUser loginUser = getLoginUser(); @@ -1773,7 +1773,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { sealIds.add(sealId); } } - EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord,sealIds); + EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord, sealIds); JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody()); if (jsonObject3.getIntValue("code") == 0) { //获取签署流程ID @@ -1905,14 +1905,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { String returnResult = "短信发送成功"; //todo 需要申请模板，申请人，被申请人发送短信通知 SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); - String startFormat=""; - String endFormat=""; + 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 startDate = messageVO.getScheduleStartTime(); Date endDate = messageVO.getScheduleEndTime(); SimpleDateFormat sdf = new SimpleDateFormat(format); startFormat = sdf.format(startDate); @@ -1925,13 +1925,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { 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) { + 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 { + } else { // 1983711 开庭审理预约会议短信通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 - request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId,startFormat+"-"+endFormat}); + request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId, startFormat + "-" + endFormat}); } Boolean aBoolean = SmsUtils.sendSms(request); //保存短信发送记录 @@ -1941,10 +1941,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { 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, 请知晓，如非本人操作，请忽略本短信。"; + 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, 请知晓，如非本人操作，请忽略本短信。"; } smsSendRecord.setSendContent(content); @@ -2550,8 +2550,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { bodyParams.put("scheduleStartTime", startTime); bodyParams.put("scheduleEndTime", endTime); - bodyParams.put("scheduleStartTime",startTime.getTime()/1000 ); - bodyParams.put("scheduleEndTime",endTime.getTime()/1000); + bodyParams.put("scheduleStartTime", startTime.getTime() / 1000); + bodyParams.put("scheduleEndTime", endTime.getTime() / 1000); roomParams.put("roomType", 1); bodyParams.put("roomInfo", roomParams); StringEntity postingString = new StringEntity(bodyParams.toString()); @@ -2600,7 +2600,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override public void destroyRoomBack(String body, HttpServletRequest request) { // todo 测试回调 - reservedConferenceMapper.insert(new ReservedConference(999888L,body,null,null)); + reservedConferenceMapper.insert(new ReservedConference(999888L, body, null, null)); JSONObject jsonObject = (JSONObject) JSON.parse(body); // 事件类型 Integer eventType = jsonObject.getInteger("EventType"); @@ -2617,6 +2617,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { /** * 根据案件id查询已预约的会议 + * * @param caseId * @return */ diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 2ac9711..7b684c9 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -118,7 +118,7 @@ applicantName, c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status from case_application c - LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id + LEFT JOIN (select * from case_affiliate where application_organ_id is not null ) ca ON ca.case_appli_id = c.id AND c.case_status = #{caseStatus} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml index b6a91d7..36d7a5b 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml @@ -75,7 +75,7 @@