SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #203.
This commit is contained in:
bgy
2023-11-10 22:53:19 +08:00
committed by Gitea
parent ad7a8125db 9282d639b9
commit f6b4d5aceb
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java
+4 -1
View File
@@ -42,6 +42,9 @@ public class CaseAttach {
* 用户账户 * 用户账户
*/ */
private String userName; private String userName;
/**
* 印章状态(0未启用,1已启用)
*/
private Integer sealStatus;
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+17 -16
View File
@@ -131,7 +131,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @param caseApplication * @param caseApplication
* @return * @return
*/ */
// @Override @Override
public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) { public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) {
// 获取登录用户 // 获取登录用户
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
@@ -1773,7 +1773,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
sealIds.add(sealId); sealIds.add(sealId);
} }
} }
EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord,sealIds); EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord, sealIds);
JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody()); JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
if (jsonObject3.getIntValue("code") == 0) { if (jsonObject3.getIntValue("code") == 0) {
//获取签署流程ID //获取签署流程ID
@@ -1905,14 +1905,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
String returnResult = "短信发送成功"; String returnResult = "短信发送成功";
//todo 需要申请模板，申请人，被申请人发送短信通知 //todo 需要申请模板，申请人，被申请人发送短信通知
SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
String startFormat=""; String startFormat = "";
String endFormat=""; String endFormat = "";
// 创建房间短信通知 // 创建房间短信通知
if (messageVO.getScheduleStartTime() == null) { if (messageVO.getScheduleStartTime() == null) {
request.setTemplateId("1983692"); request.setTemplateId("1983692");
} else { } else {
String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式 String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式
Date startDate =messageVO.getScheduleStartTime(); Date startDate = messageVO.getScheduleStartTime();
Date endDate = messageVO.getScheduleEndTime(); Date endDate = messageVO.getScheduleEndTime();
SimpleDateFormat sdf = new SimpleDateFormat(format); SimpleDateFormat sdf = new SimpleDateFormat(format);
startFormat = sdf.format(startDate); startFormat = sdf.format(startDate);
@@ -1925,13 +1925,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
request.setPhone(caseAffiliate.getContactTelphone()); request.setPhone(caseAffiliate.getContactTelphone());
request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()}); 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 请知晓，如非本人操作，请忽略本短信。 // 1952136 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
String userId = (null==caseAffiliate.getUserId()?"" : caseAffiliate.getUserId()); String userId = (null == caseAffiliate.getUserId() ? "" : caseAffiliate.getUserId());
if(messageVO.getScheduleStartTime()==null) { if (messageVO.getScheduleStartTime() == null) {
// 1983692 开庭审理创建会议通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 // 1983692 开庭审理创建会议通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。
request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId}); request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId});
}else { } else {
// 1983711 开庭审理预约会议短信通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。 // 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); Boolean aBoolean = SmsUtils.sendSms(request);
//保存短信发送记录 //保存短信发送记录
@@ -1941,10 +1941,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
smsSendRecord.setPhone(request.getPhone()); smsSendRecord.setPhone(request.getPhone());
smsSendRecord.setSendTime(new Date()); smsSendRecord.setSendTime(new Date());
String content = ""; String content = "";
if(messageVO.getScheduleStartTime()==null) { if (messageVO.getScheduleStartTime() == null) {
content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。"; content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
}else { } else {
content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId +"会议时间为"+startFormat+"-"+endFormat+ "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。"; content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "会议时间为" + startFormat + "-" + endFormat + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
} }
smsSendRecord.setSendContent(content); smsSendRecord.setSendContent(content);
@@ -2550,8 +2550,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
bodyParams.put("scheduleStartTime", startTime); bodyParams.put("scheduleStartTime", startTime);
bodyParams.put("scheduleEndTime", endTime); bodyParams.put("scheduleEndTime", endTime);
bodyParams.put("scheduleStartTime",startTime.getTime()/1000 ); bodyParams.put("scheduleStartTime", startTime.getTime() / 1000);
bodyParams.put("scheduleEndTime",endTime.getTime()/1000); bodyParams.put("scheduleEndTime", endTime.getTime() / 1000);
roomParams.put("roomType", 1); roomParams.put("roomType", 1);
bodyParams.put("roomInfo", roomParams); bodyParams.put("roomInfo", roomParams);
StringEntity postingString = new StringEntity(bodyParams.toString()); StringEntity postingString = new StringEntity(bodyParams.toString());
@@ -2600,7 +2600,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override @Override
public void destroyRoomBack(String body, HttpServletRequest request) { public void destroyRoomBack(String body, HttpServletRequest request) {
// todo 测试回调 // todo 测试回调
reservedConferenceMapper.insert(new ReservedConference(999888L,body,null,null)); reservedConferenceMapper.insert(new ReservedConference(999888L, body, null, null));
JSONObject jsonObject = (JSONObject) JSON.parse(body); JSONObject jsonObject = (JSONObject) JSON.parse(body);
// 事件类型 // 事件类型
Integer eventType = jsonObject.getInteger("EventType"); Integer eventType = jsonObject.getInteger("EventType");
@@ -2617,6 +2617,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
/** /**
* 根据案件id查询已预约的会议 * 根据案件id查询已预约的会议
*
* @param caseId * @param caseId
* @return * @return
*/ */
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1 -1
View File
@@ -118,7 +118,7 @@
applicantName, applicantName,
c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status
from case_application c 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
<where> <where>
<if test="caseStatus != null"> <if test="caseStatus != null">
AND c.case_status = #{caseStatus} AND c.case_status = #{caseStatus}
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml
+1 -1
View File
@@ -75,7 +75,7 @@
</select> </select>
<select id="selectDeptIdentifylistother" parameterType="DeptIdentify" resultMap="DeptIdentifyResult"> <select id="selectDeptIdentifylistother" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.sealName ,d.sealId ,d.annexId SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.seal_name ,d.seal_id ,d.annex_id
from dept_identify d from dept_identify d
<where> <where>
<if test="identifyStatus != null"> <if test="identifyStatus != null">