From 69aad4110b31a4a29f2875eb1e33029a95325b4d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 28 四月 2023 09:30:05 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java | 33 ++++++++++++++++++++++++---------
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java | 7 ++++---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 3 +--
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
index dbe8f12..c671d3b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
@@ -132,18 +132,19 @@
completeRatioOfMain = completeCheckJobLogListOfMain.size() / allCheckJobLogListOfMain.size();
}
respDTO.setRiskAndPeopleInfoDTO(riskAndPeopleList);
+ //所有责任人
respDTO.setCount(allCheckJobLogList.size());
respDTO.setComplete(completeCheckJobLogList.size());
respDTO.setCompleteRatio(BigDecimal.valueOf(completeRatio));
-
+ //操作责任人
respDTO.setCountOfHandle(allCheckJobLogListOfHandle.size());
respDTO.setCompleteOfHandle(completeCheckJobLogListOfHandle.size());
respDTO.setCompleteRatioOfHandle(BigDecimal.valueOf(completeRatioOfHandle));
-
+ //技术责任人
respDTO.setCountOfTechnology(allCheckJobLogListOfTechnology.size());
respDTO.setCompleteOfTechnology(completeCheckJobLogListOfTechnology.size());
respDTO.setCompleteRatioOfTechnology(BigDecimal.valueOf(completeRatioOfTechnology));
-
+ //主要责任人
respDTO.setCountOfMain(allCheckJobLogListOfMain.size());
respDTO.setCompleteOfMain(completeCheckJobLogListOfMain.size());
respDTO.setCompleteRatioOfMain(BigDecimal.valueOf(completeRatioOfMain));
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 32f3fc0..4190b28 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -362,7 +362,6 @@
return getDataTable(list);
}
-
//companyId下总的数据统计
public void getDangerDataStatistics(String companyId, ModelMap mmap) {
HiddenDangerCheckPoint hdcpQuery = new HiddenDangerCheckPoint();
@@ -514,7 +513,7 @@
}
/**
- * 列表页面（根据companyId）
+ * 列表页面（根据companyId） todo
*/
@GetMapping("/listByCompanyId/{companyId}")
public String listByCompanyId(@PathVariable("companyId") Long companyId, ModelMap mmap) {
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..91847e7 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
@@ -9,15 +9,14 @@
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.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.math.BigDecimal;
import java.util.List;
/**
@@ -50,24 +49,40 @@
*/
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(RiskAndPeopleInfoReqBO reqBO)
+ public String 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();
+// 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;
+// 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("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 prefix + "/listRiskAndPeopleInfo";
}
+
}
--
Gitblit v1.9.2