Преглед изворни кода

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

chenshudong пре 3 месеци
родитељ
комит
f4b10976ec

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

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

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

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

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

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

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

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

+ 12 - 2
airport-system/src/main/resources/mapper/system/SysLearningGrowthMapper.xml

@@ -173,9 +173,19 @@
173
         inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
173
         inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
174
         inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
174
         inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
175
         inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
175
         inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
176
+        inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
176
         where 1 = 1
177
         where 1 = 1
177
-        <if test="deptId != null">
178
-            and sd_dd.dept_id=#{deptId}
178
+        <if test="userId != null">
179
+            and su.user_id=#{userId}
180
+        </if>
181
+        <if test="brigadeId != null">
182
+            and sd_dd.dept_id=#{brigadeId}
183
+        </if>
184
+        <if test="departmentId != null">
185
+            and sd_ks.dept_id=#{departmentId}
186
+        </if>
187
+        <if test="teamId != null">
188
+            and sd_bz.dept_id=#{teamId}
179
         </if>
189
         </if>
180
         <if test="specifiedDate != null">
190
         <if test="specifiedDate != null">
181
             and slg.exam_time=#{specifiedDate}
191
             and slg.exam_time=#{specifiedDate}