From 80125173e0051ffdd9914d33586b739e80362e78 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 23 五月 2024 17:48:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 90e8385..7410116 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
@@ -18,6 +18,8 @@
<result property="unit" column="unit" />
<result property="createDate" column="create_date" />
<result property="remark" column="remark" />
+ <result property="outboundNumber" column="outbound_number" />
+ <result property="inboundNumber" column="inbound_number" />
</resultMap>
<sql id="selectTubLogVo">
@@ -50,6 +52,17 @@
SELECT MAX(id) FROM js_tub_log where project_id = #{projectId}
</select>
+ <select id="countTubLogDate" resultMap="TubLogResult">
+ SELECT
+ a.tub_name,
+ b.inbound_number,
+ a.outbound_number,
+ a.unit
+ FROM
+ ( 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>
+
<insert id="insertTubLog" parameterType="TubLog" useGeneratedKeys="true" keyProperty="id">
insert into js_tub_log
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.1