提供查询接口

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/superlilu/controller/CetEnglishController.java

@@ -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) {
+    public Result<IPage<CetEnglish>> queryPageList(CetEnglish cetEnglish,
-        System.out.println(webData);
+                                                   @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);
     }
 

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/demo/superlilu/service/impl/CetEnglishServiceImpl.java

@@ -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);
                 }
             }