提交代码

zmk

2024-07-03 a1f05ddf1901ef80cb10cff9af57f457c99121c6

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

@@ -17,13 +17,14 @@
        <result property="number"    column="number"    />
        <result property="unit"    column="unit"    />
        <result property="createDate"    column="create_date"    />
        <result property="fileUrl"    column="file_url"    />
        <result property="remark"    column="remark"    />
        <result property="outboundNumber"    column="outbound_number"    />
        <result property="inboundNumber"    column="inbound_number"    />
    </resultMap>

    <sql id="selectTubLogVo">
        select id, code, project_id, tub_name, type, outbound_date, inbound_date, opt_user, apply_user, number, unit, create_date, remark from js_tub_log
        select id, code, project_id, tub_name, type, outbound_date, inbound_date, opt_user, apply_user, number, unit, create_date, file_url, remark from js_tub_log
    </sql>

    <select id="selectTubLogList" parameterType="TubLog" resultMap="TubLogResult">
@@ -52,14 +53,31 @@
        SELECT MAX(id) FROM js_tub_log where project_id = #{projectId}
    </select>

    <select id="countTubLogDate" resultMap="TubLogResult">
    <select id="countTubLogDate2" resultMap="TubLogResult">
        SELECT
            a.tub_name,
            b.inbound_number,
            a.outbound_number
            a.outbound_number,
            a.unit
        FROM
            ( SELECT tub_name, SUM( number ) AS outbound_number FROM js_tub_log WHERE outbound_date IS NOT NULL GROUP BY tub_name ) a
            LEFT JOIN ( SELECT tub_name, SUM( number ) AS inbound_number FROM js_tub_log WHERE inbound_date IS NOT NULL GROUP BY tub_name ) b ON a.tub_name = b.tub_name
            ( SELECT tub_name, SUM( number ) AS outbound_number, unit FROM js_tub_log WHERE outbound_date IS NOT NULL GROUP BY tub_name ) a
            LEFT JOIN ( SELECT tub_name, SUM( number ) AS inbound_number, unit FROM js_tub_log WHERE inbound_date IS NOT NULL GROUP BY tub_name ) b ON a.tub_name = b.tub_name
    </select>

    <select id="countTubLogDate" resultMap="TubLogResult">
        SELECT
        a.project_id,
        a.tub_name,
        a.inbound_number,
        b.outbound_number,
        a.unit
        FROM
        ( SELECT project_id, tub_name, SUM( number ) AS inbound_number, unit FROM js_tub_log WHERE inbound_date IS NOT NULL GROUP BY tub_name ) a
        LEFT JOIN ( SELECT project_id, tub_name, SUM( number ) AS outbound_number, unit FROM js_tub_log WHERE outbound_date IS NOT NULL GROUP BY tub_name ) b ON a.tub_name = b.tub_name
        AND a.project_id = b.project_id
        <where>
            <if test="projectId != null and projectId != ''"> and a.project_id = #{projectId}</if>
        </where>
    </select>

    <insert id="insertTubLog" parameterType="TubLog" useGeneratedKeys="true" keyProperty="id">
@@ -76,6 +94,7 @@
            <if test="number != null ">number,</if>
            <if test="unit != null  and unit != ''">unit,</if>
            <if test="createDate != null ">create_date,</if>
            <if test="fileUrl != null  and fileUrl != ''">file_url,</if>
            <if test="remark != null  and remark != ''">remark,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -90,6 +109,7 @@
            <if test="number != null ">#{number},</if>
            <if test="unit != null  and unit != ''">#{unit},</if>
            <if test="createDate != null ">#{createDate},</if>
            <if test="fileUrl != null  and fileUrl != ''">#{fileUrl},</if>
            <if test="remark != null  and remark != ''">#{remark},</if>
         </trim>
    </insert>
@@ -108,6 +128,7 @@
            <if test="number != null ">number = #{number},</if>
            <if test="unit != null  and unit != ''">unit = #{unit},</if>
            <if test="createDate != null ">create_date = #{createDate},</if>
            <if test="fileUrl != null  and fileUrl != ''">file_url = #{fileUrl},</if>
            <if test="remark != null  and remark != ''">remark = #{remark},</if>
        </trim>
        where id = #{id}