添加修改每日考勤列表返回数据

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

 package com.mortals.xhx.module.attendance.web;
-import com.mortals.framework.exception.AppException;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.GoWorkResultEnum;
+import com.mortals.xhx.common.code.OffWorkResultEnum;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.service.AttendanceClassService;
 import com.mortals.xhx.module.attendance.service.AttendanceGroupService;
@@ -51,7 +52,9 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
         this.addDict(model, "groupId", attendanceGroupService.find(new AttendanceGroupQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getGroupName())));
         this.addDict(model, "classId", attendanceClassService.find(new AttendanceClassQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getClassName())));
-        this.addDict(model,"workResult" ,null);
+        this.addDict(model, "goWorkResult", GoWorkResultEnum.getEnumMap());
+        this.addDict(model, "offWorkResult", OffWorkResultEnum.getEnumMap());
+
         //设置
 
         super.init(model, context);
@@ -62,13 +65,13 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
     protected int doListAfter(AttendanceRecordEntity query, Map<String, Object> model, Context context) throws AppException {
 
         List<AttendanceRecordEntity> list = (List<AttendanceRecordEntity>) model.get(KEY_RESULT_DATA);
-        List<AttendanceRecordDetailEntity> collect = list.stream()
+        List<AttendanceRecordDetailEntity> collect = list.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .distinct()
                 .sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum))
                 .collect(Collectors.toList());
         List<AttDsyncColumn> dsyncColumns = new ArrayList<>();
-        List<AttResultDsyncColumn> resultDsyncColumns = new ArrayList<>();
+        List<AttDsyncColumn> resultDsyncColumns = new ArrayList<>();
         collect.forEach(item -> {
             AttDsyncColumn attDsyncColumn = new AttDsyncColumn();
             attDsyncColumn.setName(String.format("上班%s打卡时间", item.getOrderNum()));