Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

添加学院/专业对比年级多选功能

This commit is contained in:
Cool 2024-04-16 21:58:22 +08:00
parent c965397ebf
commit 9047390717
1 changed files with 126 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
View File

@ -152,7 +152,8 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
public Result<JSONObject> getRateByCollege(JSONObject webData) { public Result<JSONObject> getRateByCollege(JSONObject webData) {
JSONArray colleges = webData.getJSONArray("college"); JSONArray colleges = webData.getJSONArray("college");
String entryDate = webData.getString("entrydate"); JSONArray entryDateArray = webData.getJSONArray("entrydate");
//获取所有batch //获取所有batch
JSONObject batch = centerService.getBatch(); JSONObject batch = centerService.getBatch();
JSONArray batchsArray = batch.getJSONArray("batches"); JSONArray batchsArray = batch.getJSONArray("batches");
@ -161,6 +162,11 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
for (int i = 0; i < batchsArray.size(); i++) { for (int i = 0; i < batchsArray.size(); i++) {
batchs[i] = batchsArray.getJSONObject(i).getString("value"); batchs[i] = batchsArray.getJSONObject(i).getString("value");
} }
JSONObject result = new JSONObject();
JSONObject oneEntryDate = new JSONObject();
for (Object entryDate : entryDateArray) {
//根据entrydate转换为入学年份之后的八次list //根据entrydate转换为入学年份之后的八次list
List<String> batchList = new ArrayList<>(); List<String> batchList = new ArrayList<>();
for (int i = 0; i < batchs.length; i++) { for (int i = 0; i < batchs.length; i++) {
@ -169,9 +175,9 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
} }
String value = batchs[i]; String value = batchs[i];
//获取入学年份之后的批次 //获取入学年份之后的批次
if (Integer.parseInt(value.substring(0, 4)) > Integer.parseInt(entryDate)) { if (Integer.parseInt(value.substring(0, 4)) > Integer.parseInt((String) entryDate)) {
batchList.add(value); batchList.add(value);
} else if (Integer.parseInt(value.substring(0, 4)) == Integer.parseInt(entryDate)) { } else if (Integer.parseInt(value.substring(0, 4)) == Integer.parseInt((String) entryDate)) {
if (Integer.parseInt(value.substring(5, 7)) > 9) { if (Integer.parseInt(value.substring(5, 7)) > 9) {
batchList.add(value); batchList.add(value);
} }
@ -184,7 +190,6 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
LambdaQueryWrapper<Cet4_major> Cet4_majorQW = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Cet4_major> Cet4_majorQW = new LambdaQueryWrapper<>();
///学院/专业的全部在籍学生 ///学院/专业的全部在籍学生
long allStudent = 0; long allStudent = 0;
JSONObject result = new JSONObject();
JSONArray ans = new JSONArray(); JSONArray ans = new JSONArray();
//如果是全校，获取每个学院的数据 //如果是全校，获取每个学院的数据
if (colleges.size() > 1 || colleges.get(0).equals("全校")) { if (colleges.size() > 1 || colleges.get(0).equals("全校")) {
@ -300,8 +305,9 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
} }
} }
} }
result.put("data", ans); oneEntryDate.put((String) entryDate, ans);
}
result.put("data", oneEntryDate);
return Result.ok(result); return Result.ok(result);
} }