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

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -132,4 +132,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserListByIds(@Param("idList") List<Long> idList);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitratorMapper.java

@@ -8,4 +8,5 @@ import java.util.List;
 public interface ArbitratorMapper {
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.wisdomarbitrate.mapper;
 
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,11 @@ public interface CaseApplicationMapper {
      * @return
      */
     Integer selectCaseNumLike(@Param("caseNum") String caseNum, @Param("length") int length);
+
+    /**
+     * 查询仲裁员根据案件id
+     * @param arbitrator
+     * @return
+     */
+    String selectArbitratorList(@Param("id") String id);
 }

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

@@ -814,21 +814,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             for(int i = 0;i < idStrList.length;i ++ ){
                 idList.add(Long.parseLong(idStrList[i]));
             }
-//            Arbitrator arbitrator = new Arbitrator();
-//            arbitrator.setIdList(idList);
-            // 查询仲裁员
-            List<SysUser> arbitratorList = sysUserMapper.selectUserListByAdRole(new Arbitrator());
-            if(arbitratorList!=null) {
-                for (int i = 0; i < arbitratorList.size(); i++) {
-                    SysUser arbitratorselect = arbitratorList.get(i);
-                    //给仲裁员发送短信通知
-                    request.setPhone(arbitratorselect.getPhonenumber());
-                    // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
-                    String name = arbitratorselect.getNickName();
-                    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();

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -159,6 +159,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 
 
+	</select>
+	<select id="selectUserListByIds" resultMap="SysUserResult">
+		select u.user_id,  u.nick_name, u.user_name, u.phonenumber, u.remark from sys_user u
+
+			<where>
+		<if test="idList != null and idList.size() > 0">
+			AND u.user_id in
+			<foreach item="id" collection="idList" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+		</if>
+			</where>
+
+
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -248,6 +248,9 @@
         select max(substring(case_num, #{length}+1,12)+1) as maxCaseNum
         from case_application where case_num like CONCAT(#{caseNum},'%') ;
     </select>
+    <select id="selectArbitratorList" resultType="java.lang.String">
+        select a.arbitrator_id  id from case_application a where a.id=#{id}
+    </select>
 
 
 </mapper>