获取项目参与者id与name 修改项目参与者

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ParticipationController.java

@@ -32,15 +32,5 @@ public class ParticipationController {
     public HttpRespMsg getParticipation(@RequestParam Integer projectId, HttpServletRequest request) {
         return participationService.getParticipation(projectId, request);
     }
-
-    /**
-     * 编辑某个项目的参与者id
-     * projectId 项目id
-     * userId 用户id数组
-     */
-    @RequestMapping("/edit")
-    public HttpRespMsg editParticipation(@RequestParam Integer projectId, String[] userId, HttpServletRequest request) {
-        return participationService.editParticipation(projectId, userId, request);
-    }
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -5,7 +5,6 @@ import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -49,10 +48,11 @@ public class ProjectController {
      * 添加或编辑项目
      * id 要编辑项目的id 可填
      * name 项目的名称
+     * userId 用户id数组
      */
     @RequestMapping("/editProject")
-    public HttpRespMsg editProject(Integer id, @RequestParam String name) {
-        return projectService.editProject(id, name, request);
+    public HttpRespMsg editProject(Integer id, @RequestParam String name, String[] userId) {
+        return projectService.editProject(id, name, userId, request);
     }
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ParticipationService.java

@@ -16,6 +16,4 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface ParticipationService extends IService<Participation> {
     HttpRespMsg getParticipation(Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg editParticipation(Integer projectId, String[] userIds, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -1,7 +1,7 @@
 package com.management.platform.service;
 
-import com.management.platform.entity.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.Project;
 import com.management.platform.util.HttpRespMsg;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,7 +19,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getProjectPage(Integer pageIndex, Integer pageSize, HttpServletRequest request);
 
-    HttpRespMsg editProject(Integer id, String name, HttpServletRequest request);
+    HttpRespMsg editProject(Integer id, String name, String[] userId, HttpServletRequest request);
 
     HttpRespMsg deleteProject(Integer id);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ParticipationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.management.platform.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.Participation;
 import com.management.platform.mapper.ParticipationMapper;
@@ -48,25 +47,4 @@ public class ParticipationServiceImpl extends ServiceImpl<ParticipationMapper, P
         }
         return httpRespMsg;
     }
-
-    //编辑某个项目的参与者id
-    @Override
-    public HttpRespMsg editParticipation(Integer projectId, String[] userIds, HttpServletRequest request) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        try {
-            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
-            if (projectMapper.selectById(projectId).getCompanyId().equals(companyId)) {
-                participationMapper.delete(new QueryWrapper<Participation>().eq("project_id", projectId));
-                for (String userId : userIds) {
-                    participationMapper.insert(new Participation().setProjectId(projectId).setUserId(userId));
-                }
-            } else {
-                httpRespMsg.setError("无法编辑其他公司的项目");
-            }
-        } catch (NullPointerException e) {
-            httpRespMsg.setError("验证失败");
-            return httpRespMsg;
-        }
-        return httpRespMsg;
-    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -3,8 +3,10 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.Participation;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.Report;
+import com.management.platform.mapper.ParticipationMapper;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.ReportMapper;
 import com.management.platform.mapper.UserMapper;
@@ -35,6 +37,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     private UserMapper userMapper;
     @Resource
     private ReportMapper reportMapper;
+    @Resource
+    private ParticipationMapper participationMapper;
 
     //获取项目列表
     @Override
@@ -71,7 +75,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //添加或编辑项目
     @Override
-    public HttpRespMsg editProject(Integer id, String name, HttpServletRequest request) {
+    public HttpRespMsg editProject(Integer id, String name, String[] userIds, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -90,6 +94,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     httpRespMsg.setError("操作失败");
                 }
             }
+            //编辑关系
+            participationMapper.delete(new QueryWrapper<Participation>().eq("project_id", id));
+            for (String userId : userIds) {
+                participationMapper.insert(new Participation().setProjectId(id).setUserId(userId));
+            }
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ParticipationMapper.xml

@@ -16,9 +16,10 @@
 
     <!--获取查询者所在公司每个项目的工时成本-->
     <select id="getParticipator" resultType="java.lang.String">
-        SELECT user_id
-        FROM participation
-        WHERE project_id = #{projectId}
+        SELECT a.user_id AS id, b.name
+        FROM participation AS a
+        LEFT JOIN user AS b ON a.user_id = b.id
+        WHERE a.project_id = #{projectId}
     </select>
 
 </mapper>