Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

解决冲突

This commit is contained in:
YuNan 2024-10-17 14:19:00 +08:00
parent 7fc7e8a602
commit 42c5fe68be
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java
View File

@ -130,6 +130,11 @@ public class CenterController {
return cet4Service.getRateByMajor(webData); return cet4Service.getRateByMajor(webData);
} }
/**
* @param getRateByMajorAndLastestBatchParam
* @param bindingResult
* @return {@link Wrapper }
*/
@PostMapping("/getRateByMajorAndLastestBatch") @PostMapping("/getRateByMajorAndLastestBatch")
@ApiOperation(value = "根据专业获取每个年级最新批次的通过率") @ApiOperation(value = "根据专业获取每个年级最新批次的通过率")
public Wrapper getRateByMajorAndLastestBatch(@Valid @RequestBody getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam, BindingResult bindingResult) { public Wrapper getRateByMajorAndLastestBatch(@Valid @RequestBody getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam, BindingResult bindingResult) {
@ -145,6 +150,12 @@ public class CenterController {
return WrapMapper.error("调用根据专业获取最新批次的通过率出现错误!" + e.getMessage()); return WrapMapper.error("调用根据专业获取最新批次的通过率出现错误!" + e.getMessage());
} }
} }
/**
* @param getRateByEntryDateParams
* @param bindingResult
* @return {@link Wrapper }
*/
@PostMapping( "/getRateByEntryDate") @PostMapping( "/getRateByEntryDate")
@ApiOperation(value = "根据学院/专业的每个年级的通过率") @ApiOperation(value = "根据学院/专业的每个年级的通过率")
public Wrapper getRateByEntryDate(@RequestBody getRateByEntryDate getRateByEntryDateParams, BindingResult bindingResult) { public Wrapper getRateByEntryDate(@RequestBody getRateByEntryDate getRateByEntryDateParams, BindingResult bindingResult) {

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

@ -571,7 +571,7 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
Date lastestBatch = cet4Mapper.lastestDate(); Date lastestBatch = cet4Mapper.lastestDate();
cet4Wrapper.eq(Cet_4::getCollege, getRateByMajorAndLastestBatchParam.getCollege()); cet4Wrapper.eq(Cet_4::getCollege, getRateByMajorAndLastestBatchParam.getCollege());
cet4Wrapper.eq(Cet_4::getBatch, lastestBatch); cet4Wrapper.eq(Cet_4::getBatch, lastestBatch);
//根据前端数据是否传major 判断是否添加 sql 条件
if (getRateByMajorAndLastestBatchParam.getMajor() != null && !getRateByMajorAndLastestBatchParam.getMajor().isEmpty()) { if (getRateByMajorAndLastestBatchParam.getMajor() != null && !getRateByMajorAndLastestBatchParam.getMajor().isEmpty()) {
cet4Wrapper.eq(Cet_4::getMajorname, getRateByMajorAndLastestBatchParam.getMajor()); cet4Wrapper.eq(Cet_4::getMajorname, getRateByMajorAndLastestBatchParam.getMajor());
} }
@ -624,6 +624,7 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
public Wrapper getRateByEntryDate(getRateByEntryDate getRateByEntryDateParams) { public Wrapper getRateByEntryDate(getRateByEntryDate getRateByEntryDateParams) {
LambdaQueryWrapper<Cet_4> cet4Wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Cet_4> cet4Wrapper = new LambdaQueryWrapper<>();
cet4Wrapper.eq(Cet_4::getCollege, getRateByEntryDateParams.getCollege()); cet4Wrapper.eq(Cet_4::getCollege, getRateByEntryDateParams.getCollege());
//根据前端数据是否传major 判断是否添加 sql 条件
if (getRateByEntryDateParams.getMajor() != null && !getRateByEntryDateParams.getMajor().isEmpty()) { if (getRateByEntryDateParams.getMajor() != null && !getRateByEntryDateParams.getMajor().isEmpty()) {
cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateParams.getMajor()); cet4Wrapper.eq(Cet_4::getMajorname, getRateByEntryDateParams.getMajor());
} }
@ -676,8 +677,6 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
} }
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("data", ansArray); result.put("data", ansArray);
return new Wrapper<>(Wrapper.SUCCESS_CODE, Wrapper.SUCCESS_MESSAGE, result); return new Wrapper<>(Wrapper.SUCCESS_CODE, Wrapper.SUCCESS_MESSAGE, result);
} }