From e8dc9598b482830ca7fa60c6869687a32448137d Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 17 三月 2025 10:57:37 +0800
Subject: [PATCH] 新增储罐管理,数据分析新增导出功能

---
 src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java b/src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java
index 1bd3411..60bd192 100644
--- a/src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java
+++ b/src/main/java/com/hxzkmonitor/mapper/TbEvrydayweiyi2024Mapper.java
@@ -29,12 +29,14 @@
     public List<TbEvrydayweiyi2024> listall(@Param("companyid")Integer companyid );
 
 
-    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${datey} where  filename BETWEEN #{date1} AND #{date2}")
+    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime,anchorname from tb_evrydayweiyi_${datey} where  filename BETWEEN #{date1} AND #{date2}")
     public List<TbEvrydayweiyi2024> listx2(@Param("datey")String datey , @Param("date1")String date1, @Param("date2")String date2);
 
-    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${datey} where tagid=#{tagid} AND filename BETWEEN #{date1} AND #{date2}")
+    @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime,anchorname from tb_evrydayweiyi_${datey} where tagid=#{tagid} AND filename BETWEEN #{date1} AND #{date2}")
     public List<TbEvrydayweiyi2024> listx3(@Param("datey")String datey ,@Param("tagid")String tagid, @Param("date1")String date1, @Param("date2")String date2);
 
+    @Select("select e.*,TbEquipment.onlie from tb_evrydayweiyi_${datey} e JOIN tb_equipment TbEquipment ON TbEquipment.tagid = e.tagid where e.tagid=#{tagid} AND e.filename = #{date1} ")
+    public TbEvrydayweiyi2024 getweiyi(@Param("datey")String datey ,@Param("tagid")String tagid, @Param("date1")String date1);
 
     @Select("select id,tagid,ed,nd,td,end,edmm,ndmm,tdmm,endmm,gpsnum,filename,power,jingdu,weidu,gaodu,addtime from tb_evrydayweiyi_${date} where tagid=#{tagid} order by filename desc limit 1")
     public TbEvrydayweiyi2024 getonedesc(@Param("date")String date,@Param("tagid")String tagid);

--
Gitblit v1.9.3