修改导出动态列

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -91,6 +91,13 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         super.init(model, context);
     }
 
+    @Override
+    public void doExportBefore(Context context, AttendanceRecordEntity query, List<String> properties) throws AppException {
+        if (!ObjectUtils.isEmpty(query.getProperties())) {
+            properties.addAll(query.getProperties());
+        }
+    }
+
     @Override
     public void doExportAfter(Context context, List<AttendanceRecordEntity> list) throws AppException {
         ArrayList<AttendanceRecordEntity> attendanceRecordEntities = new ArrayList<>();
@@ -130,25 +137,25 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         attendanceExportRecordEntity.setFilePath(filePath);
         if (query.getIdList() != null) {
             List<Long> idList = query.getIdList();
-            attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i->i.toString()).collect(Collectors.joining(",")));
+            attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i -> i.toString()).collect(Collectors.joining(",")));
         }
         if (query.getAttendanceDateStart() != null) {
             String attendanceDate = query.getAttendanceDateStart() + "~" + query.getAttendanceDateEnd();
             attendanceExportRecordEntity.setAttendanceDate(attendanceDate);
         }
-        if(!ObjectUtils.isEmpty(query.getAttendanceGroupId())){
+        if (!ObjectUtils.isEmpty(query.getAttendanceGroupId())) {
             AttendanceGroupEntity attendanceGroupEntity = groupService.get(query.getAttendanceGroupId());
-            attendanceExportRecordEntity.setGroupName(attendanceGroupEntity==null?"":attendanceGroupEntity.getGroupName());
+            attendanceExportRecordEntity.setGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
         }
 
-        if(!ObjectUtils.isEmpty(query.getDeptId())){
+        if (!ObjectUtils.isEmpty(query.getDeptId())) {
             DeptEntity deptEntity = deptService.get(query.getDeptId(), context);
-            attendanceExportRecordEntity.setDeptName(deptEntity==null?"":deptEntity.getDeptName());
+            attendanceExportRecordEntity.setDeptName(deptEntity == null ? "" : deptEntity.getDeptName());
         }
 
-        if(!ObjectUtils.isEmpty(query.getClassId())){
+        if (!ObjectUtils.isEmpty(query.getClassId())) {
             AttendanceClassEntity attendanceClassEntity = classService.get(query.getClassId(), context);
-            attendanceExportRecordEntity.setClassName(attendanceClassEntity==null?"":attendanceClassEntity.getClassName());
+            attendanceExportRecordEntity.setClassName(attendanceClassEntity == null ? "" : attendanceClassEntity.getClassName());
         }
         attendanceExportRecordEntity.setCreateUserId(context.getUser().getId());
         attendanceExportRecordEntity.setCreateTime(new Date());
@@ -171,7 +178,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
         } else {
             query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
-           // query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
+            // query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
         }
 
         super.doListBefore(query, model, context);