Merge branch 'dev' of http://62.234.217.137:3000/Big-Data-Lab/CET-cmd-2.0 into dev

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<Cet_4Mapper, Cet_4> 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);
                 }

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

@@ -578,7 +578,7 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
         if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) {
             cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor());
         }
-        //创建所以年级的list
+        //创建所有年级的list
         List<Map<String, Object>> maps = cet4Mapper.selectMaps(cet4Wrapper);
         cet4Wrapper.select(Cet_4::getEntrydate).groupBy(Cet_4::getEntrydate);
         List<Map<String, Object>> entryDateList = cet4Mapper.selectMaps(cet4Wrapper);