修改导出动态列

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

@@ -216,6 +216,8 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
             Long subDay = DateUtil.between(startDate, endDate, DateUnit.DAY);
 
 
+            final String[] weekStr={"星期日","星期一","星期二","星期三","星期四","星期五","星期六"};
+            //由于1表示周日，2表示周一所以需要-1后对应上数组下标
             List<List<Map<String, Object>>> lists = list.stream().map(item -> {
 
                 List<AttendanceStaffStatEntity> attendanceStaffStatEntities = item.getAttendanceStaffStatEntities();
@@ -231,12 +233,17 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
                     Integer month = DateUtil.month(curDate) + 1;
                     Integer day = DateUtil.dayOfMonth(curDate);
                     Integer total = year + month + day;
+
+                    int index = DateUtil.dayOfWeek(curDate);
+
+                    String dateStr = curDate.toDateStr() +"("+ weekStr[index - 1]+")";
+
                     Map<String, Object> map = new HashMap<>();
                     if (collect.get(total) != null) {
-                        map.put("name", curDate.toDateStr());
+                        map.put("name", dateStr);
                         map.put("value", collect.get(total));
                     } else {
-                        map.put("name", curDate.toDateStr());
+                        map.put("name", dateStr);
                         map.put("value", "--");
                     }
                     mapList.add(map);
@@ -245,22 +252,6 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
 
             }).collect(Collectors.toList());
 
-
-           /* //构建动态扩展列
-            List<List<Map<String, Object>>> lists = list.stream().map(item -> {
-                List<Map<String, Object>> collect = item.getAttendanceStaffStatEntities().stream().map(item1 -> {
-                    Map<String, Object> map = new HashMap<>();
-                    Integer year = item.getYear();
-                    Integer month = item.getMonth();
-                    Integer day = item.getDay();
-                    StrUtil.padPre(day.toString(), 2, "0");
-                    map.put("name", StrUtil.padPre(month.toString(), 2, "0") + "-" + StrUtil.padPre(day.toString(), 2, "0"));
-                    map.put("value", item1.getAttendanceSummary());
-                    return map;
-                }).collect(Collectors.toList());
-                return collect;
-            }).collect(Collectors.toList());*/
-
             // byte[] data = util.exportExcel(list, properties, name);
             byte[] data = util.exportExcel(list, properties, lists, name);
             this.responseStream(this.response, data, fileName);