岗检小组成员

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostTeamUserController.java

@@ -94,7 +94,7 @@ public class PostTeamUserController extends BaseController {
     }
 
     /**
-     * 前端使用使用添加新增，不使用修改，新增接口始终传全量数据
+     * 前端使用新增，不使用修改，新增接口始终传全量数据
      * 修改岗检小组关联成员
      *
      @ApiOperation("修改岗检小组关联成员")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostTeamUser.java

@@ -47,4 +47,24 @@ public class PostTeamUser extends BaseEntity
     @Excel(name = "创建者用户ID")
     private Long createUserId;
 
+    @ApiModelProperty("小组成员姓名")
+    @TableField(exist = false)
+    private String nickName;
+
+    @ApiModelProperty("邮箱")
+    @TableField(exist = false)
+    private String email;
+
+    @ApiModelProperty("电话")
+    @TableField(exist = false)
+    private String phonenumber;
+
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty("岗位名称")
+    @TableField(exist = false)
+    private String postName;
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostTeamUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.postCheck.mapper.PostTeamUserMapper;
 import com.ruoyi.postCheck.domain.PostTeamUser;
 import com.ruoyi.postCheck.service.IPostTeamUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -56,6 +57,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int insertPostTeamUser(List<PostTeamUser> postTeamUserList) {
         if (CollectionUtils.isEmpty(postTeamUserList)) {
             return 0;
@@ -74,6 +76,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
         //新增用户
         int count = 0;
         int index = 0;
+        Long postTeamIdLast = null;
         for (PostTeamUser postTeamUser : postTeamUserList) {
             //类型（1-组长；2-成员；）
             if (index++ == 0) {
@@ -86,6 +89,16 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
                 throw new BaseException("postTeamId为空，请检查！");
             }
 
+            if (postTeamIdLast != null && !postTeamIdLast.equals(postTeamId)) {
+                throw new BaseException("postTeamId出现多个值，不允许多个小组混合添加成员，请检查！");
+            }
+            postTeamIdLast = postTeamId;
+
+            Long userId = postTeamUser.getUserId();
+            if (userId == null) {
+                throw new BaseException("userId为空，请检查！");
+            }
+
             //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
 //        if (postTeamUser.getId() == null)
             postTeamUser.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
@@ -143,6 +156,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
 //        return postTeamUserMapper.updatePostTeamUser(postTeamUser);
     }
 */
+
     /**
      * 批量删除岗检小组关联成员
      *

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostTeamUserMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.postCheck.mapper.PostTeamUserMapper">
-    
+
     <resultMap type="PostTeamUser" id="PostTeamUserResult">
         <result property="id"    column="id"    />
         <result property="postTeamId"    column="post_team_id"    />
@@ -16,27 +16,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="createUserId"    column="create_user_id"    />
+
+        <result property="nickName"    column="nick_name"    />
+        <result property="email"    column="email"/>
+        <result property="phonenumber"    column="phonenumber"/>
+        <result property="deptName"    column="dept_name"/>
+        <result property="postName"    column="post_name"/>
     </resultMap>
 
     <sql id="selectPostTeamUserVo">
-        select id, post_team_id, user_id, type, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id from post_team_user
+        select
+            t1.id,
+            t1.post_team_id,
+            t1.user_id,
+            t1.type,
+            t1.remark,
+            t1.del_flag,
+            t1.create_time,
+            t1.create_by,
+            t1.update_time,
+            t1.update_by,
+            t1.create_user_id,
+            t2.nick_name,
+            t2."email" ,
+            t2."phonenumber" ,
+            t3."dept_name" ,
+            t5."post_name"
+        from post_team_user t1
+        left join public.sys_users t2 on t2.user_id = t1.user_id
+        LEFT JOIN "sys_dept" t3 ON t3."dept_id" = t2."dept_id"
+        LEFT JOIN "sys_user_post" t4 ON t4."user_id" = t2."user_id"
+        LEFT JOIN "sys_post" t5 ON t5."post_id" = t4."post_id"
     </sql>
 
     <select id="selectPostTeamUserList" parameterType="PostTeamUser" resultMap="PostTeamUserResult">
         <include refid="selectPostTeamUserVo"/>
-        <where>  
+        <where>
             <if test="postTeamId != null  and postTeamId != ''"> and post_team_id = #{postTeamId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
         </where>
+        GROUP BY t1."id"
     </select>
-    
+
     <select id="selectPostTeamUserById" parameterType="Long" resultMap="PostTeamUserResult">
         <include refid="selectPostTeamUserVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertPostTeamUser" parameterType="PostTeamUser">
         insert into post_team_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,9 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePostTeamUserByIds" parameterType="String">
-        delete from post_team_user where id in 
+        delete from post_team_user where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>