工作画像-组织支撑-培训测试平均分趋势图

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysLearningGrowthController.java

@@ -3,7 +3,6 @@ package com.sundot.airport.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthOrganizationalSupportDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthQueryParamDto;
@@ -153,7 +152,7 @@ public class SysLearningGrowthController extends BaseController {
             unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
     )
     @GetMapping("/organizationalSupport")
-    public AjaxResult organizationalSupport(BaseLargeScreenQueryParamDto dto) {
+    public AjaxResult organizationalSupport(SysLargeScreenLearningGrowthQueryParamDto dto) {
         List<SysLargeScreenLearningGrowthOrganizationalSupportDto> result = sysLearningGrowthService.organizationalSupport(dto);
         return success(result);
     }

airport-system/src/main/java/com/sundot/airport/system/mapper/SysLearningGrowthMapper.java

@@ -2,7 +2,6 @@ package com.sundot.airport.system.mapper;
 
 import java.util.List;
 
-import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthOrganizationalSupportDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthQueryParamDto;
 import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthSqlDto;
@@ -77,5 +76,5 @@ public interface SysLearningGrowthMapper {
      * @param dto 大屏查询参数
      * @return 工作画像-组织支撑-培训测试平均分趋势图
      */
-    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(BaseLargeScreenQueryParamDto dto);
+    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(SysLargeScreenLearningGrowthQueryParamDto dto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysLearningGrowthService.java

@@ -96,5 +96,5 @@ public interface ISysLearningGrowthService {
      * @param dto 大屏查询参数
      * @return 工作画像-组织支撑-培训测试平均分趋势图
      */
-    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(BaseLargeScreenQueryParamDto dto);
+    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(SysLargeScreenLearningGrowthQueryParamDto dto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysLearningGrowthServiceImpl.java

@@ -974,7 +974,7 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
      * @return 工作画像-组织支撑-培训测试平均分趋势图
      */
     @Override
-    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(BaseLargeScreenQueryParamDto dto) {
+    public List<SysLargeScreenLearningGrowthOrganizationalSupportDto> organizationalSupport(SysLargeScreenLearningGrowthQueryParamDto dto) {
         // 默认筛选条件
         if (ObjUtil.isNull(dto.getStartDate()) && ObjUtil.isNull(dto.getEndDate()) && ObjUtil.isNull(dto.getSpecifiedDate())) {
             dto.setEndDate(LargeScreenDateUtils.getCurrentDate());
@@ -985,8 +985,14 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
         Long deptId = dto.getDeptId();
         if (ObjUtil.isNotNull(deptId)) {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
-            if (!StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
-                dto.setDeptId(null);
+            if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+                dto.setBrigadeId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+                dto.setDepartmentId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                dto.setTeamId(deptId);
+            } else {
+
             }
         }
 

airport-system/src/main/resources/mapper/system/SysLearningGrowthMapper.xml

@@ -173,9 +173,19 @@
         inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
         inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
         inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
+        inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
         where 1 = 1
-        <if test="deptId != null">
-            and sd_dd.dept_id=#{deptId}
+        <if test="userId != null">
+            and su.user_id=#{userId}
+        </if>
+        <if test="brigadeId != null">
+            and sd_dd.dept_id=#{brigadeId}
+        </if>
+        <if test="departmentId != null">
+            and sd_ks.dept_id=#{departmentId}
+        </if>
+        <if test="teamId != null">
+            and sd_bz.dept_id=#{teamId}
         </if>
         <if test="specifiedDate != null">
             and slg.exam_time=#{specifiedDate}