From 931f827913133bf3032a1083cba40c5c5b6dc7cb Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:50:50 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 2 +-
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
index c2f2a92..060c72a 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
+++ b/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">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index 567316f..41acdbf 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/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>
--
Gitblit v1.9.1