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 2c53e4df..e4eeeaa2 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 @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.dto.getRateByEntryDate; +import org.jeecg.modules.dto.getRateByEntryDateDto; import org.jeecg.modules.dto.getRateByMajorAndLastestBatchDto; import org.jeecg.modules.entity.Cet_6; import org.jeecg.modules.service.CenterService; @@ -139,14 +139,14 @@ public class CenterController { /** - * @param getRateByEntryDateParams + * @param getRateByEntryDateDtoParams * @return {@link Result }<{@link JSONObject }> */ @PostMapping( "/getRateByEntryDate") @ApiOperation(value = "根据学院/专业的每个年级的通过率") - public Result getRateByEntryDate(@RequestBody getRateByEntryDate getRateByEntryDateParams) { - log.info("根据学院/专业的每个年级的通过率: {}", JSONObject.toJSONString(getRateByEntryDateParams)); - return cet4Service.getRateByEntryDate(getRateByEntryDateParams); + public Result getRateByEntryDate(@RequestBody getRateByEntryDateDto getRateByEntryDateDtoParams) { + log.info("根据学院/专业的每个年级的通过率: {}", JSONObject.toJSONString(getRateByEntryDateDtoParams)); + return cet4Service.getRateByEntryDate(getRateByEntryDateDtoParams); } @GetMapping("/getTest") public Result getTest() { diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDate.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDateDto.java similarity index 93% rename from jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDate.java rename to jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDateDto.java index 8557821c..f787b767 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDate.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDateDto.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; @ApiModel(value = "根据专业获取每个年级最新批次的通过率") @Data -public class getRateByEntryDate { +public class getRateByEntryDateDto { // @ApiModelProperty(value = "年级") // @NotBlank // String entrydate; diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java index 5e45d78d..19b27bae 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.dto.getRateByEntryDate; +import org.jeecg.modules.dto.getRateByEntryDateDto; import org.jeecg.modules.dto.getRateByMajorAndLastestBatchDto; import org.jeecg.modules.entity.Cet_4; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,5 +30,5 @@ public interface ICet_4Service extends IService { Result getRateByMajorAndLastestBatch(getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam); - Result getRateByEntryDate(getRateByEntryDate getRateByEntryDateParams); + Result getRateByEntryDate(getRateByEntryDateDto getRateByEntryDateDtoParams); } 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 d79ae80a..1d2ccf86 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 @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.dto.getRateByEntryDate; +import org.jeecg.modules.dto.getRateByEntryDateDto; import org.jeecg.modules.dto.getRateByMajorAndLastestBatchDto; import org.jeecg.modules.entity.Cet4_major; import org.jeecg.modules.entity.CetClean; @@ -614,12 +614,12 @@ public class Cet_4ServiceImpl extends ServiceImpl implements } @Override - public Result getRateByEntryDate(getRateByEntryDate getRateByEntryDateParams) { + public Result getRateByEntryDate(getRateByEntryDateDto getRateByEntryDateDtoParams) { LambdaQueryWrapper cet4Wrapper = new LambdaQueryWrapper<>(); - cet4Wrapper.eq(Cet_4::getCollege, getRateByEntryDateParams.getCollege()); + cet4Wrapper.eq(Cet_4::getCollege, getRateByEntryDateDtoParams.getCollege()); //根据前端数据是否传major 判断是否添加 sql 条件 - if (getRateByEntryDateParams.getMajor() != null && !getRateByEntryDateParams.getMajor().isEmpty()) { - cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateParams.getMajor()); + if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) { + cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor()); } //创建所以年级的list List> maps = cet4Mapper.selectMaps(cet4Wrapper); @@ -630,10 +630,10 @@ public class Cet_4ServiceImpl extends ServiceImpl implements for (Map Date : entryDateList) { //当前年纪的总人数 LambdaQueryWrapper cet4StudentCount = new LambdaQueryWrapper<>(); - cet4StudentCount.eq(Cet_4::getCollege, getRateByEntryDateParams.getCollege()) + cet4StudentCount.eq(Cet_4::getCollege, getRateByEntryDateDtoParams.getCollege()) .eq(Cet_4::getEntrydate, Date.get("entrydate")); - if (getRateByEntryDateParams.getMajor() != null && !getRateByEntryDateParams.getMajor().isEmpty()) { - cet4StudentCount.eq(Cet_4::getMajorname, getRateByEntryDateParams.getMajor()); + if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) { + cet4StudentCount.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor()); } long allStudentCount = cet4Mapper.selectCount(cet4StudentCount); // 统计当前 entryDate 下的通过人数