仲裁员改为和用户关联

2023-10-12 16:10:53 +08:00
parent 08bb2af98e
commit 3398f0db3d
6 changed files with 55 additions and 12 deletions
@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;

 import java.util.List;
+
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;

@@ -19,6 +21,12 @@ public interface SysUserMapper
     */
    public List<SysUser> selectUserList(SysUser sysUser);

+    /**
+     * 查询仲裁员角色下的用户
+     * @return
+     */
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);
+
    /**
     * 根据条件分页查询已配用户角色列表
     * 
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;

 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;

 /**
 * 用户 业务层
@@ -17,6 +18,7 @@ public interface ISysUserService
     * @return 用户信息集合信息
     */
    public List<SysUser> selectUserList(SysUser user);
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);

    /**
     * 根据条件分页查询已分配用户角色列表
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +76,11 @@ public class SysUserServiceImpl implements ISysUserService
        return userMapper.selectUserList(user);
    }

+    @Override
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator) {
+        return userMapper.selectUserListByAdRole(arbitrator);
+    }
+
    /**
     * 根据条件分页查询已分配用户角色列表
     * 
@@ -7,7 +7,9 @@ import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SmsUtils;
@@ -39,7 +41,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
    private CaseAffiliateMapper caseAffiliateMapper;

    @Autowired
-    private ArbitratorMapper arbitratorMapper;
+    private SysUserMapper sysUserMapper;
    @Autowired
    private ArbitrateRecordMapper arbitrateRecordMapper;

@@ -170,7 +172,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 {
                        // 如果不存在则新增
@@ -654,6 +656,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());
@@ -804,23 +807,24 @@ 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);
+//            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++) {
-                    Arbitrator arbitratorselect = arbitratorList.get(i);
+                    SysUser arbitratorselect = arbitratorList.get(i);
                    //给仲裁员发送短信通知
-                    request.setPhone(arbitratorselect.getTelephone());
+                    request.setPhone(arbitratorselect.getPhonenumber());
                    // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
-                    String name = arbitratorselect.getArbitratorName();
+                    String name = arbitratorselect.getNickName();
                    request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
                    SmsUtils.sendSms(request);
                }