diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java index 915a2a9d..cdea64c2 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java @@ -89,8 +89,9 @@ public class CenterController { } //根据batch/college是否为空判断两种查询方式 - @PostMapping("/getRateByCollege") + @GetMapping("/getRateByCollege") public Result getRateByCollege(@RequestParam("college") String college, @RequestParam("level") String level) { + System.out.println(college + " " + level); if (level.equals("cet4")) { Cet_4 cet = new Cet_4(); cet.setCollege(college); 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 cf716324..984520d2 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 @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -37,12 +38,20 @@ public class Cet_4ServiceImpl extends ServiceImpl implements //根据学院查人数 queryWrapper.eq(Cet_4::getCollege, cet.getCollege()).ge(Cet_4::getResult, 425); List result = cet4Mapper.selectList(queryWrapper); +// System.out.println(result); Map> collect = result.stream().collect(Collectors.groupingBy(Cet_4::getBatch)); for (Map.Entry> entry : collect.entrySet()) { double sum = (double) getNumByCollege(cet, entry.getKey()); double size = entry.getValue().size(); double passRate = size / sum; - jsonObject.put(String.valueOf(entry.getKey()), passRate); + DecimalFormat decimalFormat = new DecimalFormat("#.####"); + String rate = decimalFormat.format(passRate); + double res = Double.parseDouble(rate); + System.out.println(res); + Date key = entry.getKey(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String format = sdf.format(key); + jsonObject.put(format, res); } return Result.OK(jsonObject); @@ -69,11 +78,8 @@ public class Cet_4ServiceImpl extends ServiceImpl implements } //对jsonObject的值进行排序 - List> list = new ArrayList<>(jsonObject.entrySet()); - Collections.sort(list, (o1, o2) -> (double) o1.getValue() > (double) o2.getValue() ? -1 : 1); - jsonObject.clear(); for (Map.Entry stringObjectEntry : list) { @@ -81,7 +87,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements } - + System.out.println(jsonObject); return Result.OK(jsonObject); } else return null;