提交代码

zmk

2024-07-18 931f827913133bf3032a1083cba40c5c5b6dc7cb

提交代码

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

@@ -72,12 +72,9 @@
        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
        ( SELECT project_id, tub_name, SUM( number ) AS inbound_number, unit FROM js_tub_log WHERE inbound_date IS NOT NULL and project_id = #{projectId} 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 and project_id = #{projectId} 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">

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html

@@ -187,7 +187,7 @@
                        </div>
                        <el-col :span="10" style="height: 320px;">
                            <template>
                                <el-table :data="tubLogs" border size="small" style="width: 99%"
                                <el-table :data="tubLogs" border size="small" style="width: 99%;" height="250"
                                          :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
                                          :row-class-name="tableRowClassName">
                                    <el-table-column prop="tubName" label="名称"></el-table-column>