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

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

Browse Source
This commit was merged in pull request #80.
This commit is contained in:
wangqiong123
2023-10-13 09:05:00 +08:00
committed by Gitea
parent cf73d6e338 b28a16dcea
commit dbc73da777
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+24 -18
View File
@@ -112,7 +112,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseAffiliate.setCaseAppliId(caseApplication.getId()); caseAffiliate.setCaseAppliId(caseApplication.getId());
if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) { if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
// 将组织机构id设为申请人名称 // 将组织机构id设为申请人名称
if (deptMap.containsKey(caseApplication.getName())) { if (deptMap.containsKey(caseAffiliate.getName())) {
caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName()))); caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
} else { } else {
// 如果不存在则新增 // 如果不存在则新增
@@ -195,7 +195,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseAffiliate.setCaseAppliId(caseApplication.getId()); caseAffiliate.setCaseAppliId(caseApplication.getId());
if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) { if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
// 将组织机构id设为申请人名称 // 将组织机构id设为申请人名称
if (deptMap.containsKey(caseApplication.getName())) { if (deptMap.containsKey(caseAffiliate.getName())) {
caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName()))); caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
} else { } else {
// 如果不存在则新增 // 如果不存在则新增
@@ -679,6 +679,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
rows = caseApplicationMapper.submitCaseApplication(caseApplication); rows = caseApplicationMapper.submitCaseApplication(caseApplication);
}else { }else {
List<Arbitrator> arbitrators = caseApplication.getArbitrators(); List<Arbitrator> arbitrators = caseApplication.getArbitrators();
// 仲裁员信息
if(arbitrators!=null&&arbitrators.size()>0){ if(arbitrators!=null&&arbitrators.size()>0){
List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList()); List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
@@ -942,27 +943,32 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
String hearDatestr = dateFormat.format(hearDate); String hearDatestr = dateFormat.format(hearDate);
String arbitratorId = caseApplicationselect.getArbitratorId(); String arbitratorId = caseApplicationselect.getArbitratorId();
List<Arbitrator> arbitratorList = new ArrayList<>(); // List<Arbitrator> arbitratorList = new ArrayList<>();
if(StringUtils.isNotEmpty(arbitratorId)){ if(StringUtils.isNotEmpty(arbitratorId)){
String[] idStrList = arbitratorId.split(","); String[] idStrList = arbitratorId.split(",");
List<Long> idList = new ArrayList<>(); List<Long> idList = new ArrayList<>();
for(int i = 0;i < idStrList.length;i ++ ){ for(int i = 0;i < idStrList.length;i ++ ){
idList.add(Long.parseLong(idStrList[i])); idList.add(Long.parseLong(idStrList[i]));
} }
Arbitrator arbitrator = new Arbitrator(); //
arbitrator.setIdList(idList);
arbitratorList = arbitratorMapper.selectArbitratorList(arbitrator); // 查询仲裁员电话号
if(arbitratorList!=null) { List<SysUser> userList= sysUserMapper.selectUserListByIds(idList);
for (int i = 0; i < arbitratorList.size(); i++) { if(CollectionUtil.isNotEmpty(userList)) {
Arbitrator arbitratorselect = arbitratorList.get(i); for (SysUser user : userList) {
//给仲裁员发送短信通知
request.setPhone(arbitratorselect.getTelephone());
// 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。 //给仲裁员发送短信通知
String name = arbitratorselect.getArbitratorName(); request.setPhone(user.getPhonenumber());
request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr}); // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
SmsUtils.sendSms(request); String name = user.getNickName();
} request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
} SmsUtils.sendSms(request);
}
}
} }
CaseAffiliate caseAffiliate = new CaseAffiliate(); CaseAffiliate caseAffiliate = new CaseAffiliate();
@@ -984,7 +990,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if(StrUtil.isNotEmpty(caseAffiliateselect.getName())&&deptMap.containsKey(caseAffiliateselect.getName())){ if(StrUtil.isNotEmpty(caseAffiliateselect.getName())&&deptMap.containsKey(caseAffiliateselect.getName())){
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName())); caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
} }
caseAffiliateselect.setName(caseAffiliateselect.getName());;
} }
//给申请人、被申请人发送短信通知 //给申请人、被申请人发送短信通知
request.setPhone(caseAffiliateselect.getContactTelphone()); request.setPhone(caseAffiliateselect.getContactTelphone());