班组人员组件修改

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<EquTeamUser> list = equTeamService.selectTeamMembers(equTeamUser);
         return getDataTable(list);
     }
+
+    /**
+     * 查询班组人员待选列表
+     */
+    @GetMapping("/getTeamUserList")
+    public TableDataInfo getTeamUserList(EquTeamUser equTeamUser) {
+        startPage();
+        List<EquTeamUser> 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));
+    }
 }

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<EquTeamUser> users;
 
     /**
      * 班组编码
@@ -150,6 +153,14 @@ public class EquTeamUser extends BaseEntity {
         return phonenumber;
     }
 
+    public List<EquTeamUser> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<EquTeamUser> users) {
+        this.users = users;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java

@@ -69,10 +69,11 @@ public interface EquTeamMapper {
     public List<EquTeamUser> getMaintenancePerson(EquTeamUser equTeamUser);
 
     //查询所有人员
-    @DS("master")
     public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
 
     //查询特定人员
     @DS("#master")
     public EquTeamUser selectTeamMember(EquTeamUser equTeamUser);
+
+    List<EquTeamUser> getTeamUserList(EquTeamUser equTeamUser);
 }

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);
 }

op-modules/op-device/src/main/java/com/op/device/service/IEquTeamService.java

@@ -66,4 +66,9 @@ public interface IEquTeamService {
 
     //查询所有人员信息
     List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
+    List<EquTeamUser> getTeamUserList(EquTeamUser equTeamUser);
+
+    AjaxResult addTeamUser(EquTeamUser teamUsers);
+
+    int delTeamUser(String id);
 }

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<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser) {
         List<EquTeamUser>  equTeamUserList =equTeamMapper.selectTeamMembers(equTeamUser);
         return equTeamUserList;
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<EquTeamUser> getTeamUserList(EquTeamUser equTeamUser) {
+        List<EquTeamUser>  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);
+    }
 }

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'
+        <if test="userName != null">and user_name like concat('%',#{userName},'%')</if>
+        <if test="nickName != null">and nick_name like concat ('%',#{nickName},'%')</if>
+        and user_name not in(select  user_name userName from equ_team_user where team_id = #{teamId})
 	</select>
 
     <select id="selectTeamMember" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
@@ -139,5 +142,16 @@
 	    where del_flag = '0'
 	    and user_id  = #{userId}
 	</select>
+    <select id="getTeamUserList" resultType="com.op.device.domain.EquTeamUser">
+        select
+            id,
+            user_id userId,
+            user_name userName,
+            nick_name nickName
+        from equ_team_user
+        where team_id = #{teamId}
+        <if test="userName != null">and user_name like concat('%',#{userName},'%')</if>
+        <if test="nickName != null">and nick_name like concat ('%',#{nickName},'%')</if>
+    </select>
 
 </mapper>

op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml

@@ -38,10 +38,9 @@
             <if test="teamCode != null">team_code,</if>
             <if test="userId != null">user_id,</if>
             <if test="userName != null">user_name,</if>
+            <if test="nickName != null">nick_name,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -49,10 +48,10 @@
             <if test="teamCode != null">#{teamCode},</if>
             <if test="userId != null">#{userId},</if>
             <if test="userName != null">#{userName},</if>
+            <if test="nickName != null">#{nickName},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+
         </trim>
     </insert>
 
@@ -131,5 +130,11 @@
             #{teamId}
         </foreach>
     </delete>
+    <delete id="deleteTeamUser">
+        delete from equ_team_user where team_id = #{teamId}
+    </delete>
+    <delete id="delTeamUser">
+        delete from equ_team_user where id = #{id}
+    </delete>
 
 </mapper>