工作画像-巡检模块

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

@@ -1813,7 +1813,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         Long deptId = dto.getDeptId();
         if (ObjUtil.isNotNull(deptId)) {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
-            if (!StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+            if (!StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
                 dto.setDeptId(null);
             }
         }
@@ -1851,7 +1851,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         Long deptId = dto.getDeptId();
         if (ObjUtil.isNotNull(deptId)) {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
-            if (!StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+            if (!StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
                 dto.setDeptId(null);
             }
         }
@@ -1899,13 +1899,32 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 }
             });
         }
+        //补充被检查班科室数据
+        List<Long> checkedTeamIdListTemp = all.stream().filter(item -> ObjectUtil.isNull(item.getCheckedDepartmentId())).map(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId).distinct().collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(checkedTeamIdListTemp)) {
+            List<SysDept> checkedTeamListTemp = sysDeptService.selectDeptByIdList(checkedTeamIdListTemp);
+            if (CollUtil.isNotEmpty(checkedTeamListTemp)) {
+                Map<Long, Long> deptIdMap = checkedTeamListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getParentId, (oldValue, newValue) -> newValue));
+                List<Long> checkedDepartmentIdListTemp = checkedTeamListTemp.stream().map(SysDept::getParentId).collect(Collectors.toList());
+                List<SysDept> checkedDepartmentListTemp = sysDeptService.selectDeptByIdList(checkedDepartmentIdListTemp);
+                if (CollUtil.isNotEmpty(checkedDepartmentListTemp)) {
+                    Map<Long, String> deptMap = checkedDepartmentListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName, (oldValue, newValue) -> newValue));
+                    all.forEach(item -> {
+                        if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
+                            item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
+                            item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
+                        }
+                    });
+                }
+            }
+        }
 
         // 筛选部门
         Long deptId = dto.getDeptId();
         if (ObjUtil.isNotNull(deptId)) {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
-            if (StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
-                all = all.stream().filter(item -> item.getCheckedDepartmentId().equals(deptId)).collect(Collectors.toList());
+            if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+                all = all.stream().filter(item -> item.getCheckedBrigadeId().equals(deptId)).collect(Collectors.toList());
             }
         }
 

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

@@ -716,10 +716,7 @@
     </select>
 
     <select id="managementPromotionRecord" resultType="com.sundot.airport.check.domain.CheckLargeScreenPlanOverviewDto">
-        select date_format(case
-        when hour(cr.check_time) >= 9 then date(cr.check_time)
-        else date_sub(date(cr.check_time), interval 1 day)
-        end, '%Y-%m-%d') date,
+        select date_format(cr.check_time, '%Y-%m-%d') date,
         ct.check_category type,
         ct.check_category_desc typeDesc,
         count(cr.id) total
@@ -730,16 +727,13 @@
             and ct.is_self_check=#{isSelfCheck}
         </if>
         <if test="deptId != null">
-            and cr.checked_department_id=#{deptId}
+            and cr.checked_brigade_id=#{deptId}
         </if>
         <if test="startDate != null and endDate != null">
             and (cr.check_time >= #{startDate}
             and cr.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
         </if>
-        group by date_format(case
-        when hour(cr.check_time) >= 9 then date(cr.check_time)
-        else date_sub(date(cr.check_time), interval 1 day)
-        end, '%Y-%m-%d'), ct.check_category, ct.check_category_desc
+        group by date_format(cr.check_time, '%Y-%m-%d'), ct.check_category, ct.check_category_desc
         order by date desc
     </select>
 
@@ -770,7 +764,7 @@
             and cc.process_status=#{processStatus}
         </if>
         <if test="deptId != null">
-            and cc.checked_department_id=#{deptId}
+            and cc.checked_brigade_id=#{deptId}
         </if>
         <if test="startDate != null and endDate != null">
             and (cc.check_time >= #{startDate}