Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -113,7 +113,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 {
                         // 如果不存在则新增
@@ -196,7 +196,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 {
                         // 如果不存在则新增
@@ -680,6 +680,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());
@@ -944,27 +945,32 @@ 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();
@@ -986,7 +992,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());