Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java

@@ -52,6 +52,7 @@ public class BsSgcJsjdWarnResultController extends BaseController
     @ApiOperation("预警结果列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdWarnResult> sp)
     {
+
         return bsSgcJsjdWarnResultService.selectPage(sp);
     }
 

jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java

@@ -1,5 +1,10 @@
 package com.kms.warn.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper;
@@ -14,4 +19,16 @@ import com.kms.warn.domain.BsSgcJsjdWarnResult;
 @Service
 public class BsSgcJsjdWarnResultService extends BaseService<BsSgcJsjdWarnResultMapper, BsSgcJsjdWarnResult>{
 
+    @Autowired
+    private BsSgcJsjdWarnResultMapper  bsSgcJsjdWarnResultMapper;
+
+
+    public IPage selectPage(SearchParam<BsSgcJsjdWarnResult> sp) {
+        return bsSgcJsjdWarnResultMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()),
+                Wrappers.lambdaQuery(BsSgcJsjdWarnResult.class).
+                        eq(BsSgcJsjdWarnResult::getResultType, "2")
+                        .eq(BsSgcJsjdWarnResult::getProCode, sp.getData().getProCode())
+                        .eq(BsSgcJsjdWarnResult::getProNo, sp.getData().getProNo()));
+
+    }
 }