添加解析钉钉打卡记录

src/main/java/com/zanchina/check/controller/FileController.java

@@ -50,31 +50,35 @@ public class FileController {
 
             List<Staff> staffList = new ArrayList<>();
 
-            files = files.stream().filter(f -> StringUtils.isNotBlank(f.getOriginalFilename())).collect(Collectors.toList());
-                files.forEach(file -> {
-                    try {
-
-                        InputStream inputStream = file.getInputStream();
-                        String fileName = file.getOriginalFilename();
-                        ExcelData data = null;
-                        List<Staff> staffs = new ArrayList<>(0);
-
-                        if (fileName.contains("上下班打卡_日报")) {
-                            data = inst.parse(inputStream, fileName, false, 2);
-                            staffs = fileService.wechatWorkInStatistics(data);
-                        } else if (fileName.contains("外出打卡_日报")) {
-                            data = inst.parse(inputStream, fileName, false, 2);
-                            staffs = fileService.wechatWorkOutStatistics(data);
-                        } else if (fileName.contains("考勤导出")) {
-                            data = inst.parse(inputStream, fileName, false, 0);
-                            staffs = fileService.workRecord(data);
-                        }
-                        staffList.addAll(staffs);
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
+            files = files.stream().filter(f -> StringUtils.isNotBlank(f.getOriginalFilename()))
+                .collect(Collectors.toList());
+            files.forEach(file -> {
+                try {
+
+                    InputStream inputStream = file.getInputStream();
+                    String fileName = file.getOriginalFilename();
+                    ExcelData data = null;
+                    List<Staff> staffs = new ArrayList<>(0);
+
+                    if (fileName.contains("上下班打卡_日报")) {
+                        data = inst.parse(inputStream, fileName, false, 2);
+                        staffs = fileService.wechatWorkInStatistics(data);
+                    } else if (fileName.contains("外出打卡_日报")) {
+                        data = inst.parse(inputStream, fileName, false, 2);
+                        staffs = fileService.wechatWorkOutStatistics(data);
+                    } else if (fileName.contains("考勤导出")) {
+                        data = inst.parse(inputStream, fileName, false, 0);
+                        staffs = fileService.workRecord(data);
+                    } else if (fileName.contains("钉钉签到")) {
+                        data = inst.parse(inputStream, fileName, false, 2);
+                        staffs = fileService.dingdingWorkStatistics(data);
                     }
-                });
+                    staffList.addAll(staffs);
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
 
             List<Staff> staffList1 = fileService.staffListCollect(staffList);
             return fileService.checkExport(staffList1);

src/main/java/com/zanchina/check/service/FileService.java

@@ -21,4 +21,6 @@ public interface FileService {
     List<Staff> workRecord(ExcelData data);
 
     List<Staff> staffListCollect(List<Staff> staffList);
+
+    List<Staff> dingdingWorkStatistics(ExcelData data);
 }

src/main/java/com/zanchina/check/service/impl/FileServiceImpl.java

@@ -167,6 +167,52 @@ public class FileServiceImpl implements FileService {
     }
 
     /**
+     * 钉钉考勤记录处理
+     */
+    @Override
+    public List<Staff> dingdingWorkStatistics(ExcelData data) {
+        //1. 拿到数据后根据姓名和日期分组
+        Map<String, Map<String, List<String[]>>> map = data.getDatas().stream()
+            .collect(Collectors.groupingBy(d -> d[0], Collectors.groupingBy(
+                d -> d[4])));
+
+        //2. 取出最大时间和最小时间，计算考勤状态，生成workcheck
+        List<Staff> staffList = new ArrayList<>();
+
+        map.entrySet().forEach(entry -> {
+
+            Staff staff = new Staff();
+            staff.setName(entry.getKey());
+
+            entry.getValue().entrySet().forEach(entry2 -> {
+
+                List<Date> dateList = entry2.getValue().stream().map(e -> DateUtils.parseDate(e[4].concat(" ").concat(e[5])))
+                    .collect(Collectors.toList());
+
+                WorkCheck workCheck = new WorkCheck();
+                workCheck.setDate(entry2.getKey());
+
+//                上班时间算一天当中最小的时间
+                Date minDate = dateList.stream().min(Comparator.comparing(d -> d.getTime())).get();
+                workCheck.setOnTime(DateUtils.formatDate(minDate, DateUtils.yyyyMMddHHmm));
+
+                //下班时间算一天当中最大的时间
+                Date maxDate = dateList.stream().max(Comparator.comparing(d -> d.getTime())).get();
+                workCheck.setOffTime(DateUtils.formatDate(maxDate, DateUtils.yyyyMMddHHmm));
+                workCheck.setState(caculateWorkState(workCheck));
+
+                staff.getWorkCheckList().add(workCheck);
+
+            });
+
+            staff.getWorkCheckList().sort(Comparator.comparing(WorkCheck::getDate));
+            staffList.add(staff);
+        });
+
+        return staffList;
+    }
+
+    /**
      * 计算出勤状态（迟到、早退、迟到和早退、正常）
      */
     private String caculateWorkState(WorkCheck workCheck) {
@@ -336,7 +382,6 @@ public class FileServiceImpl implements FileService {
                         }
                     }
                 }
-
             }
 
             datas.add(d);

src/main/resources/static/index.html

@@ -10,19 +10,31 @@
 <body>
 
 <form enctype="multipart/form-data" method="post" action="/upload">
-  <div class="container" style="padding-top: 20%;">
-    <h4>上传文件类型支持：1 .打卡机导出表 2 .企业微信上下班打卡记录 3 .企业微信外出打卡记录
-    </h4>
-    <p></p>
+  <div class="container" style="padding-top: 10%;">
     <div class="row align-items-center">
-      <div class="col">
-        <p>文件1：<input type="file" name="file"/></p>
-        <p>文件2：<input type="file" name="file"/></p>
-        <p>文件3：<input type="file" name="file"/></p>
-      </div>
-      <div class="col">
-        <button type="submit" class="btn btn-outline-primary btn-lg btn-block">生成考勤记录</button>
-      </div>
+      <table class="table table-bordered">
+        <tbody>
+        <tr>
+          <th scope="row">打卡机考勤记录：</th>
+          <td><input type="file" name="file"/></td>
+        </tr>
+        <tr>
+          <th scope="row">企业微信上下班打卡记录：</th>
+          <td><input type="file" name="file"/></td>
+        </tr>
+        <tr>
+          <th scope="row">企业微信外出打卡记录：</th>
+          <td><input type="file" name="file"/></td>
+        </tr>
+        <tr>
+          <th scope="row">钉钉打卡记录：</th>
+          <td><input type="file" name="file"/></td>
+        </tr>
+        </tbody>
+      </table>
+
+      <button type="submit" class="btn btn-outline-primary btn-lg btn-block">生成考勤记录</button>
+
     </div>
   </div>
 </form>