cs 2 years ago
parent
commit
2e5b207c8f

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

@@ -150,5 +150,5 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Map<String, Object>> getExportDegreeCost(Integer companyId, String startDate, String endDate,Integer projectId, List<Integer> deptIds, List<Integer> filterDeptIds, List<Integer> deptRelatedProjectIds);
 
-    List<Map<String, Object>> getDegreeDetailCost(Integer companyId, String startDate, String endDate, String degreeId, List<Integer> deptIds, List<Integer> filterDeptIds, List<Integer> deptRelatedProjectIds);
+    List<Map<String, Object>> getDegreeDetailCost(Integer companyId, String startDate, String endDate, Integer projectId,String degreeId, List<Integer> deptIds, List<Integer> filterDeptIds, List<Integer> deptRelatedProjectIds);
 }

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

@@ -9165,7 +9165,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if (map.containsKey("id")){
                     degreeId = map.get("id").toString();
                 }
-                List<Map<String, Object>> membList = projectMapper.getDegreeDetailCost(companyId,startDate, endDate,degreeId,deptIds,filterDeptIds,deptRelatedProjectIds);
+                List<Map<String, Object>> membList = projectMapper.getDegreeDetailCost(companyId,startDate, endDate,projectId,degreeId,deptIds,filterDeptIds,deptRelatedProjectIds);
                 map.put("membList", membList);
                 for (Map<String, Object> membMap : membList) {
                     List<String> membRowData = new ArrayList<String>();

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

@@ -1536,6 +1536,9 @@
         left join department on department.department_id = a.dept_id
         WHERE a.company_id=#{companyId}
         and a.state = 1
+        <if test="projectId != null">
+            AND a.project_id = #{projectId}
+        </if>
         <if test="degreeId != null">
             and a.degree_id = #{degreeId}
         </if>