From 88dcc5f42093de2d793910220446ad2af76b06d2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 11 Jul 2025 16:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquTeamController.java | 22 +++++++++++- .../com/op/device/domain/EquTeamUser.java | 11 ++++++ .../com/op/device/mapper/EquTeamMapper.java | 3 +- .../op/device/mapper/EquTeamUserMapper.java | 5 +++ .../op/device/service/IEquTeamService.java | 5 +++ .../service/impl/EquTeamServiceImpl.java | 35 ++++++++++++++++++- .../resources/mapper/device/EquTeamMapper.xml | 16 ++++++++- .../mapper/device/EquTeamUserMapper.xml | 13 ++++--- 8 files changed, 102 insertions(+), 8 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquTeamController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquTeamController.java index 664614579..771ce930a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquTeamController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquTeamController.java @@ -106,7 +106,7 @@ public class EquTeamController extends BaseController { } /** - * 查询班组人员列表 + * 查询班组人员待选列表 */ @GetMapping("/listTeamMembers") public TableDataInfo listTeamMembers(EquTeamUser equTeamUser) { @@ -114,4 +114,24 @@ public class EquTeamController extends BaseController { List list = equTeamService.selectTeamMembers(equTeamUser); return getDataTable(list); } + + /** + * 查询班组人员待选列表 + */ + @GetMapping("/getTeamUserList") + public TableDataInfo getTeamUserList(EquTeamUser equTeamUser) { + startPage(); + List list = equTeamService.getTeamUserList(equTeamUser); + return getDataTable(list); + } + + @PostMapping("/addTeamUser") + public AjaxResult addTeamUser(@RequestBody EquTeamUser teamUsers) { + return equTeamService.addTeamUser(teamUsers); + } + + @PostMapping("/delTeamUser/{id}") + public AjaxResult delTeamUser(@PathVariable("id") String id) { + return toAjax(equTeamService.delTeamUser(id)); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java index 0c6d311ea..5ac209643 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java @@ -6,6 +6,8 @@ import com.op.system.api.domain.SysDept; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.List; + /** * 班组人员对象 equ_team_user * @@ -25,6 +27,7 @@ public class EquTeamUser extends BaseEntity { */ @Excel(name = "班组id") private String teamId; + private List users; /** * 班组编码 @@ -150,6 +153,14 @@ public class EquTeamUser extends BaseEntity { return phonenumber; } + public List getUsers() { + return users; + } + + public void setUsers(List users) { + this.users = users; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java index 373de40f6..b66185b1f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java @@ -69,10 +69,11 @@ public interface EquTeamMapper { public List getMaintenancePerson(EquTeamUser equTeamUser); //查询所有人员 - @DS("master") public List selectTeamMembers(EquTeamUser equTeamUser); //查询特定人员 @DS("#master") public EquTeamUser selectTeamMember(EquTeamUser equTeamUser); + + List getTeamUserList(EquTeamUser equTeamUser); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamUserMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamUserMapper.java index 658993bcf..11909298a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamUserMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamUserMapper.java @@ -1,6 +1,7 @@ package com.op.device.mapper; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquTeamUser; import java.util.List; @@ -77,4 +78,8 @@ public interface EquTeamUserMapper { public void deleteEquTeamUserByTeamId(String teamId); void deleteEquTeamUserByTeamIds(String[] teamIds); + + int deleteTeamUser(EquTeamUser tuser); + + int delTeamUser(String id); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java index 5069c90f3..1d748b5f3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java @@ -66,4 +66,9 @@ public interface IEquTeamService { //查询所有人员信息 List selectTeamMembers(EquTeamUser equTeamUser); + List getTeamUserList(EquTeamUser equTeamUser); + + AjaxResult addTeamUser(EquTeamUser teamUsers); + + int delTeamUser(String id); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java index cf68ff103..07b2ac387 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java @@ -187,9 +187,42 @@ public class EquTeamServiceImpl implements IEquTeamService { * @return 班组人员 */ @Override - @DS("#master") + @DS("#header.poolName") public List selectTeamMembers(EquTeamUser equTeamUser) { List equTeamUserList =equTeamMapper.selectTeamMembers(equTeamUser); return equTeamUserList; } + + @Override + @DS("#header.poolName") + public List getTeamUserList(EquTeamUser equTeamUser) { + List equTeamUserList =equTeamMapper.getTeamUserList(equTeamUser); + return equTeamUserList; + } + + @Override + @DS("#header.poolName") + public AjaxResult addTeamUser(EquTeamUser tuser) { + EquTeam teamCode = equTeamMapper.selectEquTeamById(tuser.getTeamId()); + //equTeamUserMapper.deleteTeamUser(tuser); + for (int i = 0; i < tuser.getUsers().size(); i++) { + EquTeamUser equTeamUser = new EquTeamUser(); + equTeamUser.setCreateBy(SecurityUtils.getUsername()); + equTeamUser.setCreateTime(DateUtils.getNowDate()); + equTeamUser.setTeamId(tuser.getTeamId()); + equTeamUser.setTeamCode(teamCode.getTeamCode()); + equTeamUser.setId(IdUtils.fastSimpleUUID()); + equTeamUser.setUserId(tuser.getUsers().get(i).getUserId()); + equTeamUser.setUserName(tuser.getUsers().get(i).getUserName()); + equTeamUser.setNickName(tuser.getUsers().get(i).getNickName()); + equTeamUserMapper.insertEquTeamUser(equTeamUser); + } + return success("新增设备班组人员成功！"); + } + + @Override + @DS("#header.poolName") + public int delTeamUser(String id) { + return equTeamUserMapper.delTeamUser(id); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml index 92f439076..1343e1a35 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml @@ -125,8 +125,11 @@ user_name AS userName, nick_name AS nickName, CONCAT(nick_name,user_name) AS teamUserName - from sys_user + from lanju_op_cloud.dbo.sys_user where del_flag = '0' + and user_name like concat('%',#{userName},'%') + and nick_name like concat ('%',#{nickName},'%') + and user_name not in(select user_name userName from equ_team_user where team_id = #{teamId}) + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml index e614767d9..d09da2237 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml @@ -38,10 +38,9 @@ team_code, user_id, user_name, + nick_name, create_by, create_time, - update_by, - update_time, #{id}, @@ -49,10 +48,10 @@ #{teamCode}, #{userId}, #{userName}, + #{nickName}, #{createBy}, #{createTime}, - #{updateBy}, - #{updateTime}, + @@ -131,5 +130,11 @@ #{teamId} + + delete from equ_team_user where team_id = #{teamId} + + + delete from equ_team_user where id = #{id} +