Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-06-25 4e6d6105915edcc630d6a8bcc1c56a6177c88686

 javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml

@@ -32,21 +32,36 @@
            <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>

    <insert id="insertHoleLog" parameterType="HoleLog">
        insert into js_hole_log
        <trim prefix="(" suffix=")" suffixOverrides=",">