提供查询接口

This commit is contained in:
super 2023-10-28 13:57:04 +08:00
parent c92c80f00d
commit 9b7497a1e2
2 changed files with 25 additions and 3 deletions

View File

@ -59,11 +59,27 @@ public class CetEnglishController extends JeecgController<CetEnglish, ICetEnglis
*
* @return
*/
//@AutoLog(value = "四六级英语-分页列表查询")
@AutoLog(value = "四六级英语-分页列表查询")
@ApiOperation(value = "四六级英语-分页列表查询", notes = "四六级英语-分页列表查询")
@GetMapping(value = "/list")
public Result<JSONObject> queryPageList(@RequestBody JSONObject webData) {
System.out.println(webData);
public Result<IPage<CetEnglish>> queryPageList(CetEnglish cetEnglish,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CetEnglish> queryWrapper = QueryGenerator.initQueryWrapper(cetEnglish, req.getParameterMap());
Page<CetEnglish> page = new Page<CetEnglish>(pageNo, pageSize);
IPage<CetEnglish> pageList = cetEnglishService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 通过率查询
*/
@AutoLog(value = "四六级英语-通过信息查询")
@ApiOperation(value = "四六级英语-通过信息查询", notes = "四六级英语-通过信息查询")
@PostMapping(value = "/passRate")
public Result<JSONObject> passRate(@RequestBody JSONObject webData) {
return cetEnglishService.searchCetData(webData);
}

View File

@ -47,9 +47,15 @@ public class CetEnglishServiceImpl extends ServiceImpl<CetEnglishMapper, CetEngl
if (webData.containsKey(field)) {
Object fieldValue = webData.get(field);
if (fieldValue instanceof List) {
if (((List<?>) fieldValue).isEmpty()) {
continue;
}
// 如果值是列表则使用in条件
queryWrapper.in(field, (List<?>) fieldValue);
} else {
if (fieldValue == null || "".equals(fieldValue)) {
continue;
}
queryWrapper.in(field, fieldValue);
}
}