From b342dee27e2b0384616539118346fc2a2af1de7e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 24 七月 2024 14:12:52 +0800
Subject: [PATCH] 三一车辆查询bug修改提交

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
index 02686cf..de99376 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper">
+<mapper namespace="com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper">
     <resultMap id="BaseResultMap" type="ArdAlarmStealelec">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -24,6 +24,9 @@
         <include refid="Base_Column_List"/>
         from ard_alarm_stealelec
         <where>
+            <if test="name != null  and name != ''">
+                AND name like concat('%', #{name}, '%')
+            </if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
                 AND start_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
             </if>
@@ -128,4 +131,16 @@
         values (#{id}, #{name},#{describe},#{catalogText},#{description}, #{startTime}, #{endTime},
         #{viewTime},#{longitude},#{latitude},#{altitude},#{createBy},#{createTime},#{userId},#{deptId})
     </insert>
-</mapper>
\ No newline at end of file
+
+    <select id="stealelecYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(start_time::DATE, 'MM') as date,count(id)
+        from ard_alarm_stealelec
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
+    </select>
+
+    <select id="stealelecMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(start_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_stealelec
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
+    </select>
+</mapper>

--
Gitblit v1.9.3