From 3398f0db3d2969a32cb3d61f45924e9f0124192f Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Thu, 12 Oct 2023 16:10:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=B2=E8=A3=81=E5=91=98=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/ArbitratorController.java | 7 ++++-- .../ruoyi/system/mapper/SysUserMapper.java | 8 +++++++ .../ruoyi/system/service/ISysUserService.java | 2 ++ .../service/impl/SysUserServiceImpl.java | 7 ++++++ .../impl/CaseApplicationServiceImpl.java | 22 +++++++++++-------- .../resources/mapper/system/SysUserMapper.xml | 21 +++++++++++++++++- 6 files changed, 55 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java index b87089a..b4af1e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java @@ -1,7 +1,10 @@ package com.ruoyi.web.controller.wisdomarbitrate; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import com.ruoyi.wisdomarbitrate.service.IArbitratorService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +19,7 @@ import java.util.List; @RequestMapping("/arbitrator") public class ArbitratorController extends BaseController { @Autowired - private IArbitratorService arbitratorService; + private ISysUserService sysUserService; /** * 查询仲裁员信息 @@ -26,7 +29,7 @@ public class ArbitratorController extends BaseController { public TableDataInfo list(Arbitrator arbitrator) { startPage(); - List list = arbitratorService.selectArbitratorList(arbitrator); + List list = sysUserService.selectUserListByAdRole(arbitrator); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 76e1c79..63a8468 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -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 selectUserList(SysUser sysUser); + /** + * 查询仲裁员角色下的用户 + * @return + */ + public List selectUserListByAdRole(Arbitrator arbitrator); + /** * 根据条件分页查询已配用户角色列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 10bc2ab..e27184a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -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 selectUserList(SysUser user); + public List selectUserListByAdRole(Arbitrator arbitrator); /** * 根据条件分页查询已分配用户角色列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b371060..49f2720 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -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 selectUserListByAdRole(Arbitrator arbitrator) { + return userMapper.selectUserListByAdRole(arbitrator); + } + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index efd9e38..3d2ba37 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -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 arbitrators = caseApplication.getArbitrators(); + // 仲裁员信息 if(arbitrators!=null&&arbitrators.size()>0){ List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); List 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 arbitratorList = new ArrayList<>(); +// List arbitratorList = new ArrayList<>(); if(StringUtils.isNotEmpty(arbitratorId)){ String[] idStrList = arbitratorId.split(","); List 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 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); } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index eca3694..0d290b2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -141,7 +141,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into sys_user( user_id, -- 2.54.0