diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java index 400ab9c..8701ed8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java @@ -9,10 +9,7 @@ import com.jfinal.plugin.activerecord.Record; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class InvoiceUseService { private static Log log = Log.getLog(InvoiceUseService.class); @@ -172,6 +169,23 @@ public class InvoiceUseService { map2.putAll(map1); // 剩下的不同的全部加到 map2 中 list = new ArrayList<>(map2.values()); + + list.sort(new Comparator() { + @Override + public int compare(Record o1, Record o2) { + try { + if (o1.getDate("create_time").after(o2.getDate("create_time"))) { + return 1; + } else { + return -1; + } + } catch (Exception ignored) { + + } + + return 0; + } + }); } Record out = new Record();