修改导出动态列

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -194,7 +194,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         attendanceRecordQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
         attendanceRecordQuery.setAttendanceDateEnd(DateUtil.today());
         List<AttendanceRecordEntity> attendanceRecordEntities = recordService.find(attendanceRecordQuery);
-        //总打卡
+        //总打卡人次
         long total = attendanceRecordEntities.parallelStream().map(item -> item.getStaffId()).distinct().count();
 
         //迟到次数

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -21,9 +21,7 @@ import com.mortals.xhx.module.attendance.service.AttendanceRecordDetailService;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,9 +44,18 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda
             item.setAttendanceRecordDetailList(attendanceRecordDetailEntities);
             return item;
         }).collect(Collectors.toList());
+    }
 
+    @Override
+    protected void findAfter(AttendanceRecordEntity entity, Context context, List<AttendanceRecordEntity> list) throws AppException {
+        Map<Long, List<AttendanceRecordDetailEntity>> collect = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery()).parallelStream().collect(Collectors.groupingBy(x -> x.getRecordId()));
+        list.stream().map(item -> {
+            List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = collect.getOrDefault(item.getId(), new ArrayList<>());
 
-        super.findAfter(params, pageInfo, context, list);
+            //List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery().recordId(item.getId()));
+            item.setAttendanceRecordDetailList(attendanceRecordDetailEntities);
+            return item;
+        }).collect(Collectors.toList());
     }
 
     @Override