岗检小组成员批量添加/修改

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

@@ -83,7 +83,6 @@ public class PostTeamController extends BaseController {
 
     /**
      * 导出岗检小组列表
-     */
     @ApiOperation("导出岗检小组列表")
     @PreAuthorize("@ss.hasPermi('postCheck:team:export')")
     @Log(title = "岗检小组", businessType = BusinessType.EXPORT)
@@ -93,6 +92,7 @@ public class PostTeamController extends BaseController {
         ExcelUtil<PostTeam> util = new ExcelUtil<PostTeam>(PostTeam.class);
         util.exportExcel(response, list, "岗检小组数据");
     }
+     */
 
     /**
      * 获取岗检小组详细信息

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

@@ -54,16 +54,15 @@ public class PostTeamUserController extends BaseController {
 
     /**
      * 导出岗检小组关联成员列表
+     @ApiOperation("导出岗检小组关联成员列表")
+     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:export')")
+     @Log(title = "岗检小组关联成员", businessType = BusinessType.EXPORT)
+     @PostMapping("/export") public void export(HttpServletResponse response, PostTeamUser postTeamUser) {
+     List<PostTeamUser> list = postTeamUserService.selectPostTeamUserList(postTeamUser);
+     ExcelUtil<PostTeamUser> util = new ExcelUtil<PostTeamUser>(PostTeamUser.class);
+     util.exportExcel(response, list, "岗检小组关联成员数据");
+     }
      */
-    @ApiOperation("导出岗检小组关联成员列表")
-    @PreAuthorize("@ss.hasPermi('postCheck:teamUser:export')")
-    @Log(title = "岗检小组关联成员", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostTeamUser postTeamUser) {
-        List<PostTeamUser> list = postTeamUserService.selectPostTeamUserList(postTeamUser);
-        ExcelUtil<PostTeamUser> util = new ExcelUtil<PostTeamUser>(PostTeamUser.class);
-        util.exportExcel(response, list, "岗检小组关联成员数据");
-    }
 
     /**
      * 获取岗检小组关联成员详细信息
@@ -90,20 +89,21 @@ public class PostTeamUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:add')")
     @Log(title = "岗检小组关联成员", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PostTeamUser postTeamUser) {
-        return toAjax(postTeamUserService.insertPostTeamUser(postTeamUser));
+    public AjaxResult add(@RequestBody List<PostTeamUser> postTeamUserList) {
+        return toAjax(postTeamUserService.insertPostTeamUser(postTeamUserList));
     }
 
     /**
+     * 前端使用使用添加新增，不使用修改，新增接口始终传全量数据
      * 修改岗检小组关联成员
+     *
+     @ApiOperation("修改岗检小组关联成员")
+     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:edit')")
+     @Log(title = "岗检小组关联成员", businessType = BusinessType.UPDATE)
+     @PutMapping public AjaxResult edit(@RequestBody List<PostTeamUser> postTeamUserList) {
+     return toAjax(postTeamUserService.updatePostTeamUser(postTeamUserList));
+     }
      */
-    @ApiOperation("修改岗检小组关联成员")
-    @PreAuthorize("@ss.hasPermi('postCheck:teamUser:edit')")
-    @Log(title = "岗检小组关联成员", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PostTeamUser postTeamUser) {
-        return toAjax(postTeamUserService.updatePostTeamUser(postTeamUser));
-    }
 
     /**
      * 删除岗检小组关联成员

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

@@ -40,7 +40,7 @@ public class PostTeamUser extends BaseEntity
     @ApiModelProperty("类型（1-组长；2-成员；）")
     @TableField(value = "type")
     @Excel(name = "类型", readConverterExp = "类型（1-组长；2-成员；）")
-    private Long type;
+    private Integer type;
 
     @ApiModelProperty("创建者用户ID")
     @TableField(value = "create_user_id")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostTeamUserService.java

@@ -31,18 +31,18 @@ public interface IPostTeamUserService extends IService<PostTeamUser>
     /**
      * 新增岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
-    public int insertPostTeamUser(PostTeamUser postTeamUser);
+    public int insertPostTeamUser(List<PostTeamUser> postTeamUserList);
 
     /**
      * 修改岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
+    public int updatePostTeamUser(List<PostTeamUser> postTeamUserList);
      */
-    public int updatePostTeamUser(PostTeamUser postTeamUser);
 
     /**
      * 批量删除岗检小组关联成员

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

@@ -1,8 +1,12 @@
 package com.ruoyi.postCheck.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,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.util.CollectionUtils;
 
 /**
  * 岗检小组关联成员Service业务层处理
@@ -18,8 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2023-12-19
  */
 @Service
-public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, PostTeamUser> implements IPostTeamUserService
-{
+public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, PostTeamUser> implements IPostTeamUserService {
     @Autowired
     private PostTeamUserMapper postTeamUserMapper;
 
@@ -30,8 +34,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 岗检小组关联成员
      */
     @Override
-    public PostTeamUser selectPostTeamUserById(Long id)
-    {
+    public PostTeamUser selectPostTeamUserById(Long id) {
         return postTeamUserMapper.selectPostTeamUserById(id);
     }
 
@@ -42,40 +45,104 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 岗检小组关联成员
      */
     @Override
-    public List<PostTeamUser> selectPostTeamUserList(PostTeamUser postTeamUser)
-    {
+    public List<PostTeamUser> selectPostTeamUserList(PostTeamUser postTeamUser) {
         return postTeamUserMapper.selectPostTeamUserList(postTeamUser);
     }
 
     /**
      * 新增岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
     @Override
-    public int insertPostTeamUser(PostTeamUser postTeamUser)
-    {
-        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-        if (postTeamUser.getId() == null)
+    public int insertPostTeamUser(List<PostTeamUser> postTeamUserList) {
+        if (CollectionUtils.isEmpty(postTeamUserList)) {
+            return 0;
+        }
+
+        List<Long> postTeamIdList = postTeamUserList.stream().map(t -> t.getPostTeamId()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(postTeamIdList)) {
+            throw new BaseException("postTeamId为空，请检查！");
+        }
+
+        //删除原来的用户
+        LambdaQueryWrapper<PostTeamUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(PostTeamUser::getPostTeamId, postTeamIdList);
+        postTeamUserMapper.delete(wrapper);
+
+        //新增用户
+        int count = 0;
+        int index = 0;
+        for (PostTeamUser postTeamUser : postTeamUserList) {
+            //类型（1-组长；2-成员；）
+            if (index++ == 0) {
+                postTeamUser.setType(1);
+            } else {
+                postTeamUser.setType(2);
+            }
+            Long postTeamId = postTeamUser.getPostTeamId();
+            if (postTeamId == null) {
+                throw new BaseException("postTeamId为空，请检查！");
+            }
+
+            //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postTeamUser.getId() == null)
             postTeamUser.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-        postTeamUser.setCreateDefault();
-        return postTeamUserMapper.insertPostTeamUser(postTeamUser);
+            postTeamUser.setCreateDefault();
+            count += postTeamUserMapper.insertPostTeamUser(postTeamUser);
+        }
+        return count;
     }
 
     /**
      * 修改岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
-    @Override
-    public int updatePostTeamUser(PostTeamUser postTeamUser)
-    {
-        postTeamUser.setUpdateDefault();
-        return postTeamUserMapper.updatePostTeamUser(postTeamUser);
-    }
+  /*  @Override
+    public int updatePostTeamUser(List<PostTeamUser> postTeamUserList) {
+        if (CollectionUtils.isEmpty(postTeamUserList)) {
+            return 0;
+        }
+
+        List<Long> postTeamIdList = postTeamUserList.stream().map(t -> t.getPostTeamId()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(postTeamIdList)) {
+            throw new BaseException("postTeamId为空，请检查！");
+        }
+        //删除原来的用户
+        LambdaQueryWrapper<PostTeamUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(PostTeamUser::getPostTeamId, postTeamIdList);
+        postTeamUserMapper.delete(wrapper);
+
+        //新增用户
+        int count = 0;
+        int index = 0;
+        for (PostTeamUser postTeamUser : postTeamUserList) {
+            //类型（1-组长；2-成员；）
+            if (index++ == 0) {
+                postTeamUser.setType(1);
+            } else {
+                postTeamUser.setType(2);
+            }
 
+            Long postTeamId = postTeamUser.getPostTeamId();
+            if (postTeamId == null) {
+                throw new BaseException("postTeamId为空，请检查！");
+            }
+            //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postTeamUser.getId() == null)
+            postTeamUser.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            postTeamUser.setCreateDefault();
+            count += postTeamUserMapper.insertPostTeamUser(postTeamUser);
+        }
+        return count;
+
+//        postTeamUser.setUpdateDefault();
+//        return postTeamUserMapper.updatePostTeamUser(postTeamUser);
+    }
+*/
     /**
      * 批量删除岗检小组关联成员
      *
@@ -83,8 +150,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 结果
      */
     @Override
-    public int deletePostTeamUserByIds(Long[] ids)
-    {
+    public int deletePostTeamUserByIds(Long[] ids) {
         return postTeamUserMapper.deletePostTeamUserByIds(ids);
     }
 
@@ -95,8 +161,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 结果
      */
     @Override
-    public int deletePostTeamUserById(Long id)
-    {
+    public int deletePostTeamUserById(Long id) {
         return postTeamUserMapper.deletePostTeamUserById(id);
     }
 }