工作画像-巡检模块

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -1813,8 +1813,14 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         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.setCheckedBrigadeId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+                dto.setCheckedDepartmentId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                dto.setCheckedTeamId(deptId);
+            } else {
+
             }
         }
         List<CheckLargeScreenPlanOverviewDto> list = checkLargeScreenMapper.managementPromotionRecord(dto);
@@ -1851,8 +1857,14 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         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.setCheckedBrigadeId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+                dto.setCheckedDepartmentId(deptId);
+            } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                dto.setCheckedTeamId(deptId);
+            } else {
+
             }
         }
         CheckLargeScreenCorrectionDto result = checkLargeScreenMapper.managementPromotionCorrection(dto);
@@ -1925,6 +1937,10 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
             if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
                 all = all.stream().filter(item -> item.getCheckedBrigadeId().equals(deptId)).collect(Collectors.toList());
+            } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+                all = all.stream().filter(item -> item.getCheckedDepartmentId().equals(deptId)).collect(Collectors.toList());
+            } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                all = all.stream().filter(item -> item.getCheckedTeamId().equals(deptId)).collect(Collectors.toList());
             }
         }
 

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -726,8 +726,14 @@
         <if test="isSelfCheck != null">
             and ct.is_self_check=#{isSelfCheck}
         </if>
-        <if test="deptId != null">
-            and cr.checked_brigade_id=#{deptId}
+        <if test="checkedBrigadeId != null">
+            and cr.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cr.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="checkedTeamId != null">
+            and cr.checked_team_id=#{checkedTeamId}
         </if>
         <if test="startDate != null and endDate != null">
             and (cr.check_time >= #{startDate}
@@ -763,8 +769,14 @@
         <if test="processStatus != null">
             and cc.process_status=#{processStatus}
         </if>
-        <if test="deptId != null">
-            and cc.checked_brigade_id=#{deptId}
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
         </if>
         <if test="startDate != null and endDate != null">
             and (cc.check_time >= #{startDate}