From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
index 75ce228..a806eaa 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -1,24 +1,13 @@
package com.ruoyi.project.tr.specialCheck.controller;
-import com.ruoyi.common.constant.DualControlConstants;
import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskControlMeasureDeleteReqDTO;
import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.dc.accidentInformation.domain.AccidentInformation;
-import com.ruoyi.project.enumerate.DcAttachmentTypeEnum;
-import com.ruoyi.project.system.attachment.domain.Attachment;
-import com.ruoyi.project.tr.report.domain.Danger;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.*;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDateDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
@@ -91,6 +80,8 @@
{
List<RiskList> riskList = riskListService.listHazardSource();
mmap.put("hazardList", riskList);
+ List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
+ mmap.put("tbBaseCheckTask", listResult);
return prefix + "/add";
}
@@ -100,9 +91,9 @@
*/
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSpecialTask(TbSpecialCheckTaskLog tbSpecialCheckTaskLog){
+ public AjaxResult addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO){
- ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(tbSpecialCheckTaskLog);
+ ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(taskLogEditBO);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
@@ -128,7 +119,7 @@
}
/**
- * 事故信息详情
+ *
*/
@GetMapping("/detail/{indexId}")
public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
@@ -143,7 +134,7 @@
mmap.put("hazardList", riskList);
List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();
mmap.put("tbBaseCheckTask", listResult);
- return prefix + "/edit";
+ return prefix + "/detail";
}
/**
@@ -151,9 +142,9 @@
*/
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(TbSpecialCheckTaskLogUpdateBO updateBO)
+ public AjaxResult editSave(TbSpecialCheckTaskLogEditBO taskLogEditBO)
{
- ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(updateBO);
+ ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(taskLogEditBO);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
@@ -175,6 +166,18 @@
}
}
+
+//
+// @Autowired
+// private DealDataTask dealDataTask;
+//
+// @GetMapping("/dealDataTask")
+// public AjaxResult dealDataTask()
+// {
+// dealDataTask.dealData();
+// return success();
+// }
+
}
--
Gitblit v1.9.2