部分需求
This commit is contained in:
parent
b7952beb37
commit
c965397ebf
|
@ -294,8 +294,8 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
|
||||||
json.put("batch", batchList.get(i));
|
json.put("batch", batchList.get(i));
|
||||||
json.put("attendNumber", attendNumber4[i]);//每个年级的参加人数,
|
json.put("attendNumber", attendNumber4[i]);//每个年级的参加人数,
|
||||||
json.put("passNumber", passNew4[i]);//每个年级的新通过人数
|
json.put("passNumber", passNew4[i]);//每个年级的新通过人数
|
||||||
json.put("batchpassrate", df.format(passNew4[i] / (double) attendNumber4[i]));//每个批次新通过人数/参加人数
|
json.put("batchpassrate", df.format((passNew4[i] / (double) attendNumber4[i])));//每个批次新通过人数/参加人数
|
||||||
json.put("gradepassrate", df.format(passNumber[i] / (double) allStudent));//累计通过 / 总人数
|
json.put("gradepassrate", df.format((passNumber[i] / (double) allStudent)));//累计通过 / 总人数
|
||||||
gradeArray.add(json);
|
gradeArray.add(json);
|
||||||
resultJson.put(grade[i / 2], gradeArray);
|
resultJson.put(grade[i / 2], gradeArray);
|
||||||
} else {
|
} else {
|
||||||
|
@ -305,8 +305,8 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
|
||||||
json.put("batch", batchList.get(j));
|
json.put("batch", batchList.get(j));
|
||||||
json.put("attendNumber", attendNumber4[j]);//每个年级的参加人数,
|
json.put("attendNumber", attendNumber4[j]);//每个年级的参加人数,
|
||||||
json.put("passNumber", passNew4[j]);//每个年级的新通过人数
|
json.put("passNumber", passNew4[j]);//每个年级的新通过人数
|
||||||
json.put("batchpassrate", df.format(passNew4[j] / (double) attendNumber4[i]));//每个批次新通过人数/参加人数
|
json.put("batchpassrate", df.format((passNew4[j] / (double) attendNumber4[i])));//每个批次新通过人数/参加人数
|
||||||
json.put("gradepassrate", df.format(passNumber[i + 1] / (double) allStudent));//累计通过 / 总人数
|
json.put("gradepassrate", df.format((passNumber[i + 1] / (double) allStudent)));//累计通过 / 总人数
|
||||||
gradeArray.add(json);
|
gradeArray.add(json);
|
||||||
}
|
}
|
||||||
resultJson.put(grade[i / 2], gradeArray);
|
resultJson.put(grade[i / 2], gradeArray);
|
||||||
|
@ -315,7 +315,9 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
|
||||||
System.out.println(resultJson.toJSONString());
|
System.out.println(resultJson.toJSONString());
|
||||||
JSONObject result = new JSONObject();
|
JSONObject result = new JSONObject();
|
||||||
result.put("cet4", resultJson);
|
result.put("cet4", resultJson);
|
||||||
result.put("total", allStudent);
|
result.put("total", allStudent);//总人数
|
||||||
|
result.put("passNumber",passNumber[n - 1]);//累计通过人数
|
||||||
|
result.put("passRate", df.format((passNumber[n - 1] / (double) allStudent)));//累计通过率
|
||||||
return Result.ok(result);
|
return Result.ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue