From 2b67ed2da39eba5824cfee7950e03be2c1a256ec Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 20 十月 2025 13:17:04 +0800
Subject: [PATCH] 新增数据上传准东
---
src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java | 21 ++++++++++++++-------
1 files changed, 14 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 ac7e1e5..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,13 @@
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.dept.domain.Dept;
+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.*;
-import java.math.BigDecimal;
import java.util.List;
/**
@@ -25,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,7 +48,6 @@
* 查询隐患台账列表
*/
@GetMapping("/getCountInfo")
- @ResponseBody
public String countInfo(RiskAndPeopleInfoReqBO reqBO, ModelMap mmap)
{
// ResultVO resultVO = new ResultVO<>();
@@ -66,7 +65,8 @@
// dataTable.setTotal(result.getCount());
// mmap.put("riskAndPeopleInfo", ((RiskAndPeopleInfoRespDTO) result.getData()).getRiskAndPeopleInfoDTO());
- mmap.put("count", ((RiskAndPeopleInfoRespDTO) result.getData()).getCount());
+// 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());
@@ -79,7 +79,7 @@
mmap.put("completeOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteOfMain());
mmap.put("completeRatioOfMain", ((RiskAndPeopleInfoRespDTO) result.getData()).getCompleteRatioOfMain());
- return prefix + "/listRiskAndPeopleInfo";
+ return "riskAndPeopleInfo";
}
/**
@@ -108,6 +108,13 @@
}
+ @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