From 5606efe6f2778ad09d8b35280d6360cfe8f34d91 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
index 0ff552b..daf359d 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
@@ -40,13 +40,28 @@
and date_format(create_time,'%y%m%d') <= date_format(#{params.endCreateTime},'%y%m%d')
</if>
</where>
+ order by create_time asc
</select>
<select id="selectHoleLogById" parameterType="String" resultMap="HoleLogResult">
<include refid="selectHoleLogVo"/>
where id = #{id}
</select>
-
+
+ <select id="SUMHoleLog" resultType="com.javaweb.geo.vo.DrillDateVo">
+ SELECT
+ DATE_FORMAT(create_time, '%Y-%m-%d') AS drillDate,
+ SUM( end_depth - begin_depth ) AS totalDrilledMeters
+ FROM
+ js_hole_log
+ WHERE
+ create_time >= CURDATE( ) - INTERVAL 10 DAY
+ GROUP BY
+ DATE( create_time )
+ ORDER BY
+ create_time;
+ </select>
+
<insert id="insertHoleLog" parameterType="HoleLog">
insert into js_hole_log
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.1