From c875139dbc74a7b3cfb65ec03ac937fbea49c76e Mon Sep 17 00:00:00 2001
From: xbx <1827135378@qq.com>
Date: Wed, 10 Apr 2024 14:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CenterServiceImpl.java       | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java
index 0775d758..f9729707 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java
@@ -284,38 +284,37 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
         //保留三位小数
         DecimalFormat df = new DecimalFormat("#.###");
         String[] grade = {"大一", "大二", "大三", "大四"};
-        JSONArray list = new JSONArray();
+        JSONObject resultJson = new JSONObject();
         //遍历批次分年级
         for (int i = 0; i < n; i += 2) {
-            JSONObject json = new JSONObject();
-            //每个年级的参加人数, 每个年级的新通过人数
-            double attendNumber, passNew;
-            //每个年级的累计通过率保留三位小数
-            double passRate;
-            //每个年级的批次
-            JSONArray batchsGrade = new JSONArray();
             // 检查是否到达数组的最后一个元素
             if (i == n - 1) {
-                attendNumber = attendNumber4[i];
-                passNew = passNew4[i];
-                passRate = passNumber[i] / (double) allStudent;
-                batchsGrade.add(batchList.get(i));
+                JSONObject json = new JSONObject();
+                JSONArray gradeArray = new JSONArray();
+                json.put("batch", batchList.get(i));
+                json.put("attendNumber", attendNumber4[i]);//每个年级的参加人数,
+                json.put("passNumber", passNew4[i]);//每个年级的新通过人数
+                json.put("batchpassrate", df.format(passNew4[i] / (double) attendNumber4[i]));//每个批次新通过人数/参加人数
+                json.put("gradepassrate", df.format(passNumber[i] / (double) allStudent));//累计通过 / 总人数
+                gradeArray.add(json);
+                resultJson.put(grade[i / 2], gradeArray);
             } else {
-                attendNumber = attendNumber4[i] + attendNumber4[i + 1];
-                passNew = passNew4[i] + passNew4[i + 1];
-                passRate = passNumber[i + 1] / (double) allStudent;
-                batchsGrade.add(batchList.get(i) + " + " + batchList.get(i + 1));
+                JSONArray gradeArray = new JSONArray();
+                for (int j = i; j < i + 2; j++) {
+                    JSONObject json = new JSONObject();
+                    json.put("batch", batchList.get(j));
+                    json.put("attendNumber", attendNumber4[j]);//每个年级的参加人数,
+                    json.put("passNumber", passNew4[j]);//每个年级的新通过人数
+                    json.put("batchpassrate", df.format(passNew4[j] / (double) attendNumber4[i]));//每个批次新通过人数/参加人数
+                    json.put("gradepassrate", df.format(passNumber[i + 1] / (double) allStudent));//累计通过 / 总人数
+                    gradeArray.add(json);
+                }
+                resultJson.put(grade[i / 2], gradeArray);
             }
-            //写入json
-            json.put("grade", grade[i / 2]);
-            json.put("batch", batchsGrade);
-            json.put("attendNumber", attendNumber);
-            json.put("passNumber", passNew);
-            json.put("passRate", df.format(passRate));
-            list.add(json);
         }
+        System.out.println(resultJson.toJSONString());
         JSONObject result = new JSONObject();
-        result.put("cet4", list);
+        result.put("cet4", resultJson);
         result.put("total", allStudent);
         return Result.ok(result);
     }