diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index 59ec13d9..4b69d1eb 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -394,6 +394,14 @@ public class Cet_4ServiceImpl extends ServiceImpl implements json.put("passRate", df.format(passRate)); ansArray.add(json); } + //将ans按照entrydate从小到大排序 + ansArray.sort((o1, o2) -> { + JSONObject json1 = (JSONObject) o1; + JSONObject json2 = (JSONObject) o2; + String entryDate1 = json1.getString("entryDate"); + String entryDate2 = json2.getString("entryDate"); + return entryDate1.compareTo(entryDate2); + }); ans.put((String) major, ansArray); } } else { @@ -451,6 +459,14 @@ public class Cet_4ServiceImpl extends ServiceImpl implements json.put("passRate", df.format(passRate)); ansArray.add(json); } + //将ans按照entrydate从小到大排序 + ansArray.sort((o1, o2) -> { + JSONObject json1 = (JSONObject) o1; + JSONObject json2 = (JSONObject) o2; + String entryDate1 = json1.getString("entryDate"); + String entryDate2 = json2.getString("entryDate"); + return entryDate1.compareTo(entryDate2); + }); ans.put((String) major, ansArray); } }