From 993bcfbb0ea417891ae1317a560ec426b746dbd6 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 28 三月 2023 09:37:18 +0800
Subject: [PATCH] 新增记录查询页面
---
src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java b/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java
index 3247621..1bc81c4 100644
--- a/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java
+++ b/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java
@@ -1,5 +1,11 @@
package com.ruoyi.project.tr.selectOldRiskInfoPage.controller;
import java.util.List;
+
+import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventPageQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
+import com.ruoyi.doublePrevention.service.baseService.RiskOldInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.company.service.ICompanyService;
@@ -20,11 +26,15 @@
*/
@Controller
@RequestMapping("/tr/selectOldRiskInfoPage")
-public class selectOldRiskInfoPageController extends BaseController {
+public class selectOldRiskInfoPageController extends BaseController
+{
private String prefix = "tr/selectOldRiskInfoPage";
@Autowired
private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
+
+ @Autowired
+ private RiskOldInfoService riskOldInfoService;
@GetMapping()
public String selectOldRiskInfoPage(ModelMap mmap)
@@ -39,15 +49,20 @@
*/
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(HiddenDangerCheckPoint hiddenDangerCheckPoint, String dateRangeLedger, String rectifyStatusLedger, String rectifyDeptIdLedger) {
-
- hiddenDangerCheckPoint.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
- hiddenDangerCheckPoint.setCompanyId(Long.valueOf(getSysUser().getCompanyId()));
-
- startPage();
- List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
-
- return getDataTable(list);
+ public TableDataInfo list(RiskOldInfoQueryReqDTO queryReqDTO)
+ {
+ ResultVO<RiskOldInfoQueryRespDTO> resultVO = riskOldInfoService.selectOldRiskInfoPage(queryReqDTO);
+ List<RiskOldInfoQueryRespDTO> data = (List<RiskOldInfoQueryRespDTO>) resultVO.getData();
+// hiddenDangerCheckPoint.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+// hiddenDangerCheckPoint.setCompanyId(Long.valueOf(getSysUser().getCompanyId()));
+//
+// startPage();
+// List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+//
+// return getDataTable(list);
+ TableDataInfo dataTable = getDataTable(data);
+ dataTable.setTotal(resultVO.getCount());
+ return dataTable;
}
}
--
Gitblit v1.9.2