From 3f47c88e7cb4e53b3637620794420181f47b5a5e Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 23 十月 2024 16:07:13 +0800
Subject: [PATCH] 提交代码

---
 javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 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 5dd1238..b69046d 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
@@ -32,21 +32,50 @@
             <if test="recordPerson != null  and recordPerson != ''"> and record_person = #{recordPerson}</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
             <!-- 寮�濮嬫椂闂存绱� -->
-            <if test="params.beginTime != null and params.beginTime != ''">
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginCreateTime},'%y%m%d')
             </if>
             <!-- 缁撴潫鏃堕棿妫�绱� -->
-            <if test="params.endTime != null and params.endTime != ''">
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
                 and date_format(create_time,'%y%m%d') &lt;= 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>
+
+    <select id="SUMProjectHoleLog" resultType="com.javaweb.geo.vo.DrillDateVo" parameterType="HoleLog">
+        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) and project_id =#{projectId}
+        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