fix

src/main/java/com/zanchina/check/common/ExcelWrite.java

@@ -5,6 +5,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Cell;

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

@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -37,7 +38,7 @@ public class FileController {
     @PostMapping("upload")
     @ResponseBody
     public ResponseEntity<byte[]> uploadAndExport(
-        HttpServletRequest request) {
+        HttpServletRequest request, HttpServletResponse response) {
 
         try {
             ExcelRead inst = ExcelRead.getInst();
@@ -76,7 +77,11 @@ public class FileController {
             return fileService.checkExport(staffList1);
 
         } catch (Exception e) {
-            e.printStackTrace();
+            try {
+                response.getWriter().print(e.getMessage());
+            } catch (IOException e2) {
+                return null;
+            }
         }
 
         return null;

src/main/resources/static/index.html

@@ -11,6 +11,9 @@
 
 <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="row align-items-center">
       <div class="col">
         <p>文件1：<input type="file" name="file"/></p>

src/test/java/com/zanchina/check/CheckApplicationTests.java

@@ -2,8 +2,12 @@ package com.zanchina.check;
 
 import com.zanchina.check.common.DateUtils;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,14 +20,28 @@ public class CheckApplicationTests {
     @Test
     public void contextLoads() throws ParseException {
 
-        Date d1 = DateUtils.parseDate("9:00", DateUtils.HHmm);
-        Date d2 = DateUtils.parseDate("2018/06/19 9:00", DateUtils.yyyyMMddHHmm1);
+//        Date d1 = DateUtils.parseDate("9:00", DateUtils.HHmm);
+//        Date d2 = DateUtils.parseDate("2018/06/19 9:00", DateUtils.yyyyMMddHHmm1);
+//
+//        List<String> allDatesOfTwoDate = DateUtils.getAllDatesOfTwoDate("2018-06-30", "2018-07-15");
+//
+//        Date date = DateUtils.parseDate("2018-07-31".concat(" ").concat("08:55"), DateUtils.yyyyMMddHHmm);
+//
+//        System.out.print(date);
+
+        List<String> strings = new ArrayList<>();
+        strings.add("b1");
+        strings.add("c");
+        strings.add("a1");
+        strings.add("b1");
+        strings.add("a1");
+        strings.add("b2");
+
+        strings.add("a2");
+        System.out.print(strings);
+        strings.sort(Comparator.comparing(s -> s));
+        System.out.print(strings);
 
-        List<String> allDatesOfTwoDate = DateUtils.getAllDatesOfTwoDate("2018-06-30", "2018-07-15");
-
-        Date date = DateUtils.parseDate("2018-07-31".concat(" ").concat("08:55"), DateUtils.yyyyMMddHHmm);
-
-        System.out.print(date);
     }
 
 }