From 7572552bcebd353050f95a1965526e2fadb31f67 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 08 Aug 2023 16:56:31 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index 4e4f0b5..792049a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.gistack.nky.mapper.AlarmGetMapper">
 
+    <resultMap id="vo" type="cn.gistack.nky.vo.AlarmGetVO">
+        <id column="id" property="id"/>
+        <result property="damId" column="dam_id"/>
+        <result property="type" column="type"/>
+        <result property="status" column="status"/>
+        <result property="baojingzhi" column="baojingzhi"/>
+        <result property="createTime" column="create_time"/>
+        <result property="desc" column="desc"/>
+        <result property="level" column="level"/>
+        <result property="originId" column="origin_id"/>
+        <result property="pointId" column="point_id"/>
+        <result property="value" column="value"/>
+        <result property="time" column="time"/>
+        <result property="taskCategory" column="task_category"/>
+        <result property="forward" column="forward" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="reverse" column="reverse" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="ratio" column="ratio" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+    </resultMap>
+
+
+    <select id="getAlarmDetail" resultMap="vo">
+        SELECT * FROM NKY_ALARM_GET
+        WHERE 1=1
+        <if test="vo.startTime != null and vo.startTime != ''">
+            AND DATE_FORMAT(time,'%Y-%m-%d')  &gt;= #{vo.startTime}
+        </if>
+        <if test="vo.endTime != null and vo.endTime !='' ">
+            AND DATE_FORMAT(time,'%Y-%m-%d') &lt;= #{vo.endTime}
+        </if>
+        <if test="vo.level != null and vo.level !='' ">
+            AND level = #{vo.level}
+        </if>
+        <if test="vo.status != null and vo.status !='' ">
+            AND status = #{vo.status}
+        </if>
+        <if test="vo.type != null and vo.type !='' ">
+            AND type = #{vo.type}
+        </if>
+        AND dam_id =  #{vo.damId}
+    </select>
 </mapper>

--
Gitblit v1.9.3