电子督察单查询接口增加筛选条件

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganAnalysisController.java

@@ -25,14 +25,18 @@ public class DataJinganAnalysisController {
     /**
      * 电子督察单管理-电子督察单列表查询
      *
+     * @param id  主键ID
+     * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
     @GetMapping("analysisList")
-    public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+    public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "id", required = false) Integer id,
+                                                                  @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
+                                                                  @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataJinganAnalysisService.analysisList(pageNum, pageSize));
+        return ApiResult.success(dataJinganAnalysisService.analysisList(id,handleStatus,pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganAnalysisService.java

@@ -17,11 +17,13 @@ public interface DataJinganAnalysisService extends CrudService<DataJinganAnalysi
     /**
      * 电子督察单管理-电子督察单列表查询
      *
+     * @param id  主键ID
+     * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<DataJinganAnalysis> analysisList(Integer pageNum, Integer pageSize);
+    CommonPage<DataJinganAnalysis> analysisList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
 
     void update(DataJinganAnalysis dataJinganAnalysis);
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganAnalysisServiceImpl.java

@@ -28,11 +28,14 @@ import java.util.List;
 public class DataJinganAnalysisServiceImpl extends AbstractCrudService<DataJinganAnalysisMapper, DataJinganAnalysis> implements DataJinganAnalysisService {
 
     @Override
-    public CommonPage<DataJinganAnalysis> analysisList(Integer pageNum, Integer pageSize) {
+    public CommonPage<DataJinganAnalysis> analysisList(Integer id, Integer handleStatus, Integer pageNum,
+                                                       Integer pageSize) {
         IPage<DataJinganAnalysis> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganAnalysis> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DataJinganAnalysis::getTenantId, SecurityUtils.getTenantId())
-        .orderByDesc(DataJinganAnalysis::getId);
+        queryWrapper
+                .eq(null != handleStatus,DataJinganAnalysis::getHandleStatus, handleStatus)
+                .eq(null != id,DataJinganAnalysis::getId, id)
+                .orderByDesc(DataJinganAnalysis::getId);
         page = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }