From d76c23793f13886f06941228b846690b74e58948 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 10:03:45 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java | 1 +
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 2 ++
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 9 +--------
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java | 2 ++
src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml | 6 ++++++
5 files changed, 12 insertions(+), 8 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 ff8f8a9..914c68f 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,6 @@
package com.ruoyi.project.tr.specialCheck.controller;
+import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -70,14 +71,6 @@
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());
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
index 8e2ec1c..134ad31 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
@@ -22,6 +22,7 @@
private String dangerId;
+ private String dangerName;
private String taskId;
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
index dfb5c73..3b772c6 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
@@ -25,6 +25,8 @@
private String dangerId;
+ private String dangerName;
+
private String taskId;
private String checkType;
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
index a6f9b95..d31ad78 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -148,6 +148,7 @@
// itemDangerLog.setCheckDate(itemDangerLog.getCheckDate());
// itemDangerLog.setCheckPay(itemDangerLog.getCheckPay());
// itemDangerLog.setHarmType(itemDangerLog.getHarmType());
+ itemDangerLog.setDangerName(dangerById.getDangerName());
itemDangerLog.setCheckName(baseCheckItemByItemId.getCheckName());
itemDangerLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
itemDangerLog.setCheckWay(null);
@@ -234,6 +235,7 @@
updateBO.setUpdateBy(sysUser.getUserName());
updateBO.setReportStatus((byte) 1);
+ updateBO.setDangerName(dangerById.getDangerName());
updateBO.setCheckName(baseCheckItemByItemId.getCheckName());
updateBO.setCheckContent(baseCheckItemByItemId.getCheckContent());
updateBO.setCheckWay(null);
diff --git a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
index 8530642..6e930bb 100644
--- a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
+++ b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
@@ -10,6 +10,7 @@
<result property="companyCode" column="company_code"/>
<result property="dangerId" column="danger_id"/>
+ <result property="dangerName" column="danger_name"/>
<result property="taskId" column="task_id"/>
<result property="checkType" column="check_type"/>
<result property="checkItemId" column="check_item_id"/>
@@ -69,6 +70,7 @@
<if test="companyCode != null ">company_code,</if>
<if test="dangerId != null ">danger_id,</if>
+ <if test="dangerName != null ">danger_name,</if>
<if test="taskId != null ">task_id,</if>
<if test="checkType != null ">check_type,</if>
<if test="checkItemId != null ">check_item_id,</if>
@@ -100,6 +102,7 @@
<if test="companyCode != null ">#{companyCode},</if>
<if test="dangerId != null ">#{dangerId},</if>
+ <if test="dangerName != null ">#{dangerName},</if>
<if test="taskId != null ">#{taskId},</if>
<if test="checkType != null ">#{checkType},</if>
<if test="checkItemId != null ">#{checkItemId},</if>
@@ -135,6 +138,9 @@
<if test="dangerId != null ">
danger_id = #{dangerId},
</if>
+ <if test="dangerName != null ">
+ danger_name= #{dangerName},
+ </if>
<if test="taskId != null">
task_id = #{taskId},
</if>
--
Gitblit v1.9.2