From 9015e720487b737743232b0b3aa464c2ac9e8d17 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 15 十一月 2024 17:31:24 +0800
Subject: [PATCH] 修改请求地址
---
src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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 70fe063..593b2bd 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
@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.selectRiskAndPeopleInfo.controller;
+import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
@@ -9,14 +10,12 @@
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -26,10 +25,10 @@
* @date 2020-05-08
*/
@Controller
-@RequestMapping("/tr/selectRiskAndPeoplePage")
+@RequestMapping("/tr/riskAndPeopleInfo")
public class selectRiskAndPeopleInfoController extends BaseController
{
- private String prefix = "tr/selectRiskAndPeoplePage";
+ private String prefix = "tr/riskAndPeopleInfo";
@Autowired
private RiskAndPeopleInfoService riskAndPeopleInfoService;
@@ -48,9 +47,47 @@
/**
* 查询隐患台账列表
*/
+ @GetMapping("/getCountInfo")
+ public String countInfo(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());
+
+// mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
+// mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
+ mmap.put("count", 6);
+ mmap.put("complete", ((RiskAndPeopleInfoRespDTO) result.getData()).getComplete());
+ mmap.put("completeRatio", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatio());
+ mmap.put("countOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfHandle());
+ mmap.put("completeOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfHandle());
+ mmap.put("completeRatioOfHandle", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfHandle());
+ mmap.put("countOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfTechnology());
+ mmap.put("completeOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfTechnology());
+ mmap.put("completeRatioOfTechnology", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfTechnology());
+ mmap.put("countOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCountOfMain());
+ mmap.put("completeOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfMain());
+ mmap.put("completeRatioOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfMain());
+
+ return "riskAndPeopleInfo";
+ }
+
+ /**
+ * 查询隐患台账列表
+ */
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(RiskAndPeopleInfoReqBO reqBO)
+ public TableDataInfo list(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
{
// ResultVO resultVO = new ResultVO<>();
// resultVO.setCode("200");
@@ -65,9 +102,19 @@
TableDataInfo dataTable = getDataTable(data.getRiskAndPeopleInfoDTO());
dataTable.setTotal(result.getCount());
+
+
return dataTable;
}
+
+ @GetMapping("/detailRiskAndPeopleInfo/{id}")
+ public String detailDangerPlanFormulate(@PathVariable("id") Long id, ModelMap mmap) {
+ RiskAndPeopleInfo riskAndPeopleInfo = riskAndPeopleInfoService.selectRiskAndPeopleInfoById(id);
+ mmap.put("riskAndPeopleInfo", riskAndPeopleInfo);
+ return prefix + "/detailRiskAndPeopleInfo";
+ }
+
}
--
Gitblit v1.9.2