|
|
@@ -9,10 +9,12 @@ import java.math.BigDecimal;
|
|
9
|
9
|
import java.text.DecimalFormat;
|
|
10
|
10
|
import java.util.ArrayList;
|
|
11
|
11
|
import java.util.Arrays;
|
|
|
12
|
+import java.util.Comparator;
|
|
12
|
13
|
import java.util.Date;
|
|
13
|
14
|
import java.util.HashMap;
|
|
14
|
15
|
import java.util.List;
|
|
15
|
16
|
import java.util.Map;
|
|
|
17
|
+import java.util.stream.Collectors;
|
|
16
|
18
|
import javax.servlet.http.HttpServletResponse;
|
|
17
|
19
|
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
|
|
18
|
20
|
import org.apache.poi.ss.usermodel.BorderStyle;
|
|
|
@@ -739,6 +741,7 @@ public class ExcelUtil<T>
|
|
739
|
741
|
}
|
|
740
|
742
|
}
|
|
741
|
743
|
}
|
|
|
744
|
+ this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
|
|
742
|
745
|
}
|
|
743
|
746
|
|
|
744
|
747
|
/**
|