报告 现在仅能看到被分配的项目中的报告

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -1,7 +1,7 @@
 package com.management.platform.mapper;
 
-import com.management.platform.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.management.platform.entity.Project;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,6 +16,9 @@ import java.util.Map;
  * @since 2020-01-03
  */
 public interface ProjectMapper extends BaseMapper<Project> {
+    List<Map<String, Object>> getParticipatedProject(@Param("userId") String userId);
+
     List<Map<String, Object>> getTimeCost(@Param("companyId") Integer companyId);
+
     List<Map<String, Object>> getProjectCost(@Param("projectId") Integer projectId);
 }

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

@@ -42,8 +42,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             //通过公司id获取该公司所有的项目列表
-            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
-            httpRespMsg.data = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId));
+//            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+//            httpRespMsg.data = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId));
+            //现在是获取本人相关的项目列表
+            httpRespMsg.data = projectMapper.getParticipatedProject(request.getHeader("Token"));
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;

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

@@ -14,6 +14,18 @@
         id, project_name, company_id
     </sql>
 
+    <!--获取查询者所在公司每个项目的工时成本-->
+    <select id="getParticipatedProject" resultType="java.util.Map">
+        SELECT id, project_name AS projectName
+        FROM project AS a
+        WHERE id IN (
+            SELECT project_id
+            FROM participation
+            WHERE user_id = #{userId}
+        )
+        ORDER BY id DESC
+    </select>
+
     <!--获取查询者所在公司每个项目的工时成本-->
     <select id="getTimeCost" resultType="java.util.Map">
         SELECT a.id, a.project_name AS project, SUM(b.working_time) AS cost, SUM(b.working_time * c.cost) AS costMoney