From 97e8f30549a631be2451b5d7f6861a7751663950 Mon Sep 17 00:00:00 2001
From: Cool <747682928@qq.com>
Date: Wed, 23 Oct 2024 19:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AF=BC=E5=85=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CetStudentController.java        |  6 ++++++
 .../service/impl/CetMajorServiceImpl.java       | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetStudentController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetStudentController.java
index 83fb15a4..3e21a2b5 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetStudentController.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CetStudentController.java
@@ -64,4 +64,10 @@ public class CetStudentController extends JeecgController<Cet4_major, CetMajorSe
     public Result<?> downloadTemplate(HttpServletResponse response) {
         return cetMajorService.downloadTemplate(response);
     }
+
+    @RequestMapping("loadTable")
+    @ApiOperation("加载表格")
+    public Result<?> loadTable() {
+        return cetMajorService.loadTable();
+    }
 }
diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetMajorServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetMajorServiceImpl.java
index b307c4a8..9a01401c 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CetMajorServiceImpl.java
@@ -1,5 +1,7 @@
 package org.jeecg.modules.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -10,6 +12,9 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created with IntelliJ IDEA.
@@ -32,4 +37,16 @@ public class CetMajorServiceImpl extends ServiceImpl<Cet4_majorMapper, Cet4_majo
         }
         return null;
     }
+
+    public Result<?> loadTable() {
+        QueryWrapper<Cet4_major> wrapper = new QueryWrapper<>();
+        wrapper.select("entrydate", "count(*) as count");
+        List<Map<String, Object>> list = this.listMaps(wrapper);
+        // 倒序排序
+        list.sort(Comparator.comparing((Map<String, Object> o) -> ((String) o.get("entrydate"))).reversed());
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", list);
+        return Result.OK(jsonObject);
+    }
+
 }