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/HoleMapper.xml | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
index 396c8c0..3b0c835 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
@@ -27,16 +27,17 @@
<result property="position" column="position" />
<result property="locateTime" column="locate_time" />
<result property="reason" column="reason" />
- <result property="pic1" column="pic1" />
- <result property="pic2" column="pic2" />
- <result property="pic3" column="pic3" />
+ <result property="rate" column="rate" />
+ <result property="footage" column="footage" />
+ <result property="totalFootage" column="total_footage" />
+ <result property="footageCpl" column="footage_cpl" />
<result property="status" column="status" />
<result property="isDeleted" column="is_deleted" />
<result property="isFlag" column="is_flag" />
</resultMap>
<sql id="selectHoleVo">
- select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, pic1, pic2, pic3, status, is_deleted, is_flag from js_hole
+ select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, rate, footage,total_footage, footage_cpl, status, is_deleted, is_flag from js_hole
</sql>
<select id="selectHoleList" parameterType="Hole" resultMap="HoleResult">
@@ -61,9 +62,7 @@
<if test="position != null and position != ''"> and position = #{position}</if>
<if test="locateTime != null "> and locate_time = #{locateTime}</if>
<if test="reason != null and reason != ''"> and reason = #{reason}</if>
- <if test="pic1 != null and pic1 != ''"> and pic1 = #{pic1}</if>
- <if test="pic2 != null and pic2 != ''"> and pic2 = #{pic2}</if>
- <if test="pic3 != null and pic3 != ''"> and pic3 = #{pic3}</if>
+
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
@@ -101,6 +100,20 @@
<include refid="selectHoleVo"/> WHERE project_id = #{projectId}
</select>
+ <select id="selectHoleTotalProcess" resultMap="HoleResult">
+ select sum(footage_cpl) as footage_cpl, sum(footage) as footage from js_hole
+ </select>
+
+ <select id="selectHoleProjectProcess" resultMap="HoleResult">
+ select project_id as project_id, sum(footage_cpl) as footage_cpl, sum(footage) as footage
+ from js_hole GROUP BY project_id
+ </select>
+
+ <select id="selectProjectProcess" resultMap="HoleResult" >
+ select project_id as project_id, sum(footage_cpl) as footage_cpl, sum(footage) as footage
+ from js_hole where project_id = #{projectId}
+ </select>
+
<insert id="insertHole" parameterType="Hole">
insert into js_hole
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -126,9 +139,10 @@
<if test="position != null and position != ''">position,</if>
<if test="locateTime != null ">locate_time,</if>
<if test="reason != null and reason != ''">reason,</if>
- <if test="pic1 != null and pic1 != ''">pic1,</if>
- <if test="pic2 != null and pic2 != ''">pic2,</if>
- <if test="pic3 != null and pic3 != ''">pic3,</if>
+ <if test="rate != null">rate,</if>
+ <if test="footage != null">footage,</if>
+ <if test="totalFootage != null">total_footage,</if>
+ <if test="footageCpl != null">footage_cpl,</if>
<if test="status != null and status != ''">status,</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
<if test="isFlag != null and isFlag != ''">is_flag,</if>
@@ -156,9 +170,10 @@
<if test="position != null and position != ''">#{position},</if>
<if test="locateTime != null ">#{locateTime},</if>
<if test="reason != null and reason != ''">#{reason},</if>
- <if test="pic1 != null and pic1 != ''">#{pic1},</if>
- <if test="pic2 != null and pic2 != ''">#{pic2},</if>
- <if test="pic3 != null and pic3 != ''">#{pic3},</if>
+ <if test="rate != null">#{rate},</if>
+ <if test="footage != null">#{footage},</if>
+ <if test="totalFootage != null">#{totalFootage},</if>
+ <if test="footageCpl != null">#{footageCpl},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
<if test="isFlag != null and isFlag != ''">#{isFlag},</if>
@@ -189,9 +204,10 @@
<if test="position != null and position != ''">position = #{position},</if>
<if test="locateTime != null ">locate_time = #{locateTime},</if>
<if test="reason != null and reason != ''">reason = #{reason},</if>
- <if test="pic1 != null and pic1 != ''">pic1 = #{pic1},</if>
- <if test="pic2 != null and pic2 != ''">pic2 = #{pic2},</if>
- <if test="pic3 != null and pic3 != ''">pic3 = #{pic3},</if>
+ <if test="rate != null">rate = #{rate},</if>
+ <if test="footage != null">footage = #{footage},</if>
+ <if test="totalFootage != null">total_footage = #{totalFootage},</if>
+ <if test="footageCpl != null">footage_cpl = #{footageCpl},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
<if test="isFlag != null and isFlag != ''">is_flag = #{isFlag},</if>
--
Gitblit v1.9.1