From d18dde2957a5cf877e48847a98e75a5d5ce66201 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 09:25:31 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
index 4402c77..7337210 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.tr.specialCheck.controller;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -42,6 +44,9 @@
@Autowired
private TbBaseCheckService tbBaseCheckService;
+ @Autowired
+ private PreventCJReportDangerInfoService preventCJReportDangerInfoService;
+
@GetMapping()
@@ -54,11 +59,21 @@
@PostMapping("/list")
@ResponseBody
- public TableDataInfo selectSpecialCheckItemDangerLogPage(@RequestBody TbSpecialCheckItemDangerLogBO itemDangerLogBO )
+ public TableDataInfo selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO )
{
ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
+
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ for (TbSpecialCheckItemDangerLogDTO log : data) {
+ for (PreventCJReportDangerInfo danger : dangerList) {
+ if (danger.getId().equals(log.getDangerId())){
+ log.setDangerName(danger.getDangerName());
+ }
+ }
+ }
+
TableDataInfo dataTable = getDataTable(data);
dataTable.setTotal(resultVO.getCount());
@@ -66,24 +81,25 @@
}
/**
- * 新增任务
+ * 新增
*/
@GetMapping("/add")
public String add(ModelMap mmap)
{
- ResultVO<List<RiskList>> resultVO = riskListService.listHazardSource();
- Object data = resultVO.getData();
- mmap.put("hazardList", data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ mmap.put("hazardList", riskList);
+ mmap.put("dangerList", dangerList);
return prefix + "/add";
}
/**
- * 新增任务保存
+ * 新增保存
*/
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSpecialItemDanger(@RequestBody TbSpecialCheckItemDangerLog itemDangerLog){
+ public AjaxResult addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog){
ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.addSpecialItemDanger(itemDangerLog);
String code = resultVO.getCode();
@@ -112,7 +128,7 @@
*/
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(@RequestBody TbSpecialCheckItemDangerLogUpdateBO updateBO)
+ public AjaxResult editSave(TbSpecialCheckItemDangerLogUpdateBO updateBO)
{
ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.updateSpecialCheckItemDangerLog(updateBO);
String code = resultVO.getCode();
@@ -126,7 +142,7 @@
@PostMapping("/remove")
@ResponseBody
- public AjaxResult remove(@RequestBody TbSpecialCheckItemDangerLogUpdateBO updateBO){
+ public AjaxResult remove(TbSpecialCheckItemDangerLogUpdateBO updateBO){
ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.deleteTbSpecialItemDangerTaskLog(updateBO);
String code = resultVO.getCode();
if ("200".equals(code)){
--
Gitblit v1.9.2