From 7be699d3bb6e290d3d0e6f51451484c89eccdead Mon Sep 17 00:00:00 2001
From: wusifan <jilin.cq@163.com>
Date: Thu, 16 Mar 2023 09:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=AF=8A=E6=96=AD=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rzyc/controller/RiskController.java   | 17 ++++++++++++++++
 .../rzyc/controller/ent/RiskController.java   | 20 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java b/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
index 19d291d..ee5c79a 100644
--- a/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
+++ b/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
@@ -39,7 +39,24 @@ import java.util.stream.Collectors;
 @RestController
 @Validated
 public class RiskController extends BaseController {
+    @LoginAuth
+    @ApiOperation(value = "获取当前企业诊断列表", notes = "获取当前企业诊断列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "页数", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "条数", required = true, dataType = "int")
+    })
+    @PostMapping("/getCompanyDiagnosis")
+    @ResponseBody
+    public SingleResult<Pager<RkCompanyDiagnosis>> getCompanyDiagnosis(@Valid RkCompanyDiagnosis rkCompanyDiagnosis, Integer page, Integer pageSize)throws Exception{
+        SingleResult<Pager<RkCompanyDiagnosis>> singleResult = new SingleResult<Pager<RkCompanyDiagnosis>>();
+        Pager<RkCompanyDiagnosis> pager = new Pager<>();
+        PageHelper.startPage(page,pageSize);
+        Page<RkCompanyDiagnosis> emergencyEquipments = (Page<RkCompanyDiagnosis>) rkCompanyDiagnosisMapper.selectQueryCompanyDiagnosis(rkCompanyDiagnosis);
+        getDatePage(pager,emergencyEquipments);
+        singleResult.setData(pager);
 
+        return singleResult;
+    }
     /**
      * 获取单位敏感信息类型
      * @param enterpriseId
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/RiskController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/RiskController.java
index eb900a3..f1b596f 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ent/RiskController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/RiskController.java
@@ -8,6 +8,7 @@ import com.common.utils.TypeConversion;
 import com.common.utils.model.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.rzyc.advice.LoginAuth;
 import com.rzyc.bean.risk.*;
 import com.rzyc.controller.BaseController;
 import com.rzyc.enums.DelState;
@@ -40,6 +41,25 @@ import java.util.stream.Collectors;
 @Validated
 public class RiskController extends BaseController {
 
+    @LoginAuth
+    @ApiOperation(value = "获取当前企业诊断列表", notes = "获取当前企业诊断列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "页数", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "条数", required = true, dataType = "int")
+    })
+    @PostMapping("/getCompanyDiagnosis")
+    @ResponseBody
+    public SingleResult<Pager<RkCompanyDiagnosis>> getCompanyDiagnosis(@Valid RkCompanyDiagnosis rkCompanyDiagnosis, Integer page, Integer pageSize)throws Exception{
+        SingleResult<Pager<RkCompanyDiagnosis>> singleResult = new SingleResult<Pager<RkCompanyDiagnosis>>();
+        Pager<RkCompanyDiagnosis> pager = new Pager<>();
+        PageHelper.startPage(page,pageSize);
+        Page<RkCompanyDiagnosis> emergencyEquipments = (Page<RkCompanyDiagnosis>) rkCompanyDiagnosisMapper.selectQueryCompanyDiagnosis(rkCompanyDiagnosis);
+        getDatePage(pager,emergencyEquipments);
+        singleResult.setData(pager);
+
+        return singleResult;
+    }
+
 
     /**
      * 获取单位敏感信息类型