From 84f2afb80a67710522eab149b4076bd7200d610b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 28 四月 2023 10:44:33 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..5638e2d 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,8 @@
/**
* 查询隐患台账列表
*/
- @PostMapping("/list")
- @ResponseBody
- public String list(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
+ @GetMapping("/getCountInfo")
+ public String countInfo(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
{
// ResultVO resultVO = new ResultVO<>();
// resultVO.setCode("200");
@@ -65,7 +64,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());
@@ -79,7 +78,32 @@
mmap.put("completeOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfMain());
mmap.put("completeRatioOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfMain());
- return prefix + "/listRiskAndPeopleInfo";
+ return prefix + "/getCountInfo";
+ }
+
+ /**
+ * 查询隐患台账列表
+ */
+ @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