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 5fe80ba5..68fc6a7a 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 @@ -350,7 +350,7 @@ public class CenterServiceImpl extends ServiceImpl implement 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("batchpassrate", df.format((passNew4[j] / (double) attendNumber4[j])));//每个批次新通过人数/参加人数 json.put("gradepassrate", df.format((passNumber[i + 1] / (double) allStudent)));//累计通过 / 总人数 gradeArray.add(json); } 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 78ea35d3..7a01f491 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 @@ -577,7 +577,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) { cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor()); } - //创建所以年级的list + //创建所有年级的list List> maps = cet4Mapper.selectMaps(cet4Wrapper); cet4Wrapper.select(Cet_4::getEntrydate).groupBy(Cet_4::getEntrydate); List> entryDateList = cet4Mapper.selectMaps(cet4Wrapper);