From 6b21882666bcfe9c274b33796577b0881d66db1d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 12 七月 2023 16:56:04 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java | 5 +++--
src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml | 26 +++++++++++++++++++++++---
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
index 5f9621a..d7a2395 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import java.time.LocalDateTime;
+import java.io.Serializable;
import java.util.Date;
@Data
@TableName("prevent_overhaul_log")
-public class PreventOverhaulLog {
+public class PreventOverhaulLog implements Serializable {
+ private static final long serialVersionUID = -61793617513430361L;
/**
* 主键id
diff --git a/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
index 719fb49..8623e7d 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
@@ -4,13 +4,33 @@
<resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
<id column="id" property="id"/>
+ <id column="uuid" property="uuid"/>
<result column="delete_status" property="deleteStatus" />
+
+ <result column="gmt_create" property="gmtCreate" />
+ <result column="create_by_user_name" property="createByUserName" />
+ <result column="gmt_moditify" property="gmtModitify" />
+ <result column="last_edit_user_name" property="lastEditUserName" />
+ <result column="enterprise_id" property="enterpriseId" />
+ <result column="enterprise_uuid" property="enterpriseUuid" />
+
+ <result column="report_time" property="reportTime" />
+ <result column="update_report_data_time" property="updateReportDataTime" />
+ <result column="report_status" property="reportStatus" />
+ <result column="report_switch" property="reportSwitch" />
+
+ <result column="hazard_code" property="hazardCode" />
+ <result column="risk_unit_id" property="riskUnitId" />
+ <result column="risk_unit_uuid" property="riskUnitUuid" />
+ <result column="stop_start_time" property="stopStartTime" />
+ <result column="stop_end_time" property="stopEndTime" />
+ <result column="stop_reason" property="stopReason" />
</resultMap>
<!-- List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);-->
- <select id="selectOverhaulLogPage" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ <select id="selectOverhaulLogPage" resultMap="BaseResultMap">
select * from prevent_overhaul_log
<where>
delete_status = 0
@@ -21,13 +41,13 @@
</select>
<!-- PreventOverhaulLog getOverhaulLogById(Long id);-->
- <select id="getOverhaulLogById" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ <select id="getOverhaulLogById" resultMap="BaseResultMap">
select * from prevent_overhaul_log
where delete_status = 0 and id = #{id}
</select>
<!-- List<PreventOverhaulLog> listReportOverhaulLog();-->
- <select id="listReportOverhaulLog" resultType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ <select id="listReportOverhaulLog" resultMap="BaseResultMap">
select * from prevent_overhaul_log
where report_switch = 0 and delete_status = 0 and (update_report_data_time > report_time or report_time is null)
</select>
--
Gitblit v1.9.2