From 174bd1a78160e561041a8431f6c8ff167a45f03f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 28 四月 2023 10:43:16 +0800
Subject: [PATCH] 临时提交

---
 src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java b/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
index 91847e7..ac7e1e5 100644
--- a/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
+++ b/src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java
@@ -47,9 +47,9 @@
     /**
      * 查询隐患台账列表
      */
-    @PostMapping("/list")
+    @GetMapping("/getCountInfo")
     @ResponseBody
-    public String list(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
+    public String countInfo(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
     {
 //        ResultVO resultVO = new ResultVO<>();
 //        resultVO.setCode("200");
@@ -65,7 +65,7 @@
 //        TableDataInfo dataTable = getDataTable(data.getRiskAndPeopleInfoDTO());
 //        dataTable.setTotal(result.getCount());
 
-        mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
+//        mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
         mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
         mmap.put("complete", ((RiskAndPeopleInfoRespDTO) result.getData()).getComplete());
         mmap.put("completeRatio", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatio());
@@ -82,6 +82,31 @@
         return  prefix + "/listRiskAndPeopleInfo";
     }
 
+    /**
+     * 查询隐患台账列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
+    {
+//        ResultVO resultVO = new ResultVO<>();
+//        resultVO.setCode("200");
+//        resultVO.setMsg("查询成功");
+
+        ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);
+        RiskAndPeopleInfoRespDTO data = (RiskAndPeopleInfoRespDTO) result.getData();
+//        resultVO.setPageSize(result.getPageSize());
+//        resultVO.setPageNum(result.getPageNum());
+//        resultVO.setCount(result.getCount());
+//        resultVO.setData(result.getData());
+
+        TableDataInfo dataTable = getDataTable(data.getRiskAndPeopleInfoDTO());
+        dataTable.setTotal(result.getCount());
+
+
+        return dataTable;
+    }
+
 
 }
 

--
Gitblit v1.9.2