Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
# Conflicts: # ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
This commit is contained in:
hejinbo
+32
-20
@@ -4,19 +4,29 @@ package com.ruoyi.wisdomarbitrate.service.impl;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.ruoyi.common.annotation.DataScope;
|
||||
import com.ruoyi.common.constant.CaseApplicationConstants;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
|
||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.exception.EsignDemoException;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
|
||||
|
||||
|
||||
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.exception.EsignDemoException;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.system.mapper.SysUserMapper;
|
||||
import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
@@ -32,6 +42,8 @@ import com.ruoyi.wisdomarbitrate.utils.SignAward;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
@@ -61,7 +73,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
private SysDeptMapper sysDeptMapper;
|
||||
@Autowired
|
||||
private SysUserMapper sysUserMapper;
|
||||
|
||||
@Autowired
|
||||
private SealSignRecordMapper sealSignRecordMapper;
|
||||
// 手机号正则
|
||||
@@ -104,7 +115,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
caseAffiliate.setCaseAppliId(caseApplication.getId());
|
||||
if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
|
||||
// 将组织机构id设为申请人名称
|
||||
if (deptMap.containsKey(caseApplication.getName())) {
|
||||
if (deptMap.containsKey(caseAffiliate.getName())) {
|
||||
caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
|
||||
} else {
|
||||
// 如果不存在则新增
|
||||
@@ -187,7 +198,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
caseAffiliate.setCaseAppliId(caseApplication.getId());
|
||||
if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
|
||||
// 将组织机构id设为申请人名称
|
||||
if (deptMap.containsKey(caseApplication.getName())) {
|
||||
if (deptMap.containsKey(caseAffiliate.getName())) {
|
||||
caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
|
||||
} else {
|
||||
// 如果不存在则新增
|
||||
@@ -671,6 +682,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
}else {
|
||||
List<Arbitrator> arbitrators = caseApplication.getArbitrators();
|
||||
// 仲裁员信息
|
||||
if(arbitrators!=null&&arbitrators.size()>0){
|
||||
List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
|
||||
List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
|
||||
@@ -910,7 +922,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
|
||||
//发送短信通知
|
||||
SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
|
||||
request.setTemplateId("1948332");
|
||||
request.setTemplateId("1952136");
|
||||
// 1948332 普通短信 开庭审理房间号通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请知晓，如非本人操作，请忽略本短信。
|
||||
request.setPhone(caseAffiliate.getContactTelphone());
|
||||
request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
|
||||
@@ -973,27 +985,27 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
String hearDatestr = dateFormat.format(hearDate);
|
||||
|
||||
String arbitratorId = caseApplicationselect.getArbitratorId();
|
||||
List<Arbitrator> arbitratorList = new ArrayList<>();
|
||||
// List<Arbitrator> arbitratorList = new ArrayList<>();
|
||||
if(StringUtils.isNotEmpty(arbitratorId)){
|
||||
String[] idStrList = arbitratorId.split(",");
|
||||
List<Long> idList = new ArrayList<>();
|
||||
for(int i = 0;i < idStrList.length;i ++ ){
|
||||
idList.add(Long.parseLong(idStrList[i]));
|
||||
}
|
||||
Arbitrator arbitrator = new Arbitrator();
|
||||
arbitrator.setIdList(idList);
|
||||
arbitratorList = arbitratorMapper.selectArbitratorList(arbitrator);
|
||||
if(arbitratorList!=null) {
|
||||
for (int i = 0; i < arbitratorList.size(); i++) {
|
||||
Arbitrator arbitratorselect = arbitratorList.get(i);
|
||||
//给仲裁员发送短信通知
|
||||
request.setPhone(arbitratorselect.getTelephone());
|
||||
// 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
|
||||
String name = arbitratorselect.getArbitratorName();
|
||||
request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
|
||||
SmsUtils.sendSms(request);
|
||||
}
|
||||
}
|
||||
// 查询仲裁员电话号
|
||||
List<SysUser> userList= sysUserMapper.selectUserListByIds(idList);
|
||||
if(CollectionUtil.isNotEmpty(userList)) {
|
||||
for (SysUser user : userList) {
|
||||
//给仲裁员发送短信通知
|
||||
request.setPhone(user.getPhonenumber());
|
||||
// 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
|
||||
String name = user.getNickName();
|
||||
request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
|
||||
SmsUtils.sendSms(request);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
CaseAffiliate caseAffiliate = new CaseAffiliate();
|
||||
@@ -1015,7 +1027,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
if(StrUtil.isNotEmpty(caseAffiliateselect.getName())&&deptMap.containsKey(caseAffiliateselect.getName())){
|
||||
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
|
||||
}
|
||||
caseAffiliateselect.setName(caseAffiliateselect.getName());;
|
||||
|
||||
}
|
||||
//给申请人、被申请人发送短信通知
|
||||
request.setPhone(caseAffiliateselect.getContactTelphone());
|
||||
|
||||
Reference in New Issue
Block a user