From ad4fb70a79a07d494de4b3183ff6cf00d94aab08 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 20:23:44 +0800
Subject: [PATCH] 数字孪生库区完善
---
src/main/resources/mapper/ViewDigitalTwinMapper.xml | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/ViewDigitalTwinMapper.xml b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
index bfd8ea2..62ac14c 100644
--- a/src/main/resources/mapper/ViewDigitalTwinMapper.xml
+++ b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
@@ -12,30 +12,36 @@
<!--鎬昏锛氭�诲簱浣嶃�佸凡鐢ㄥ簱浣嶃�佷粖鏃ュ簱瀛樸�佷粖鏃ュ嚭搴撱�佷粖鏃ュ叆搴�-->
<select id="overview" resultType="Double">
- SELECT COUNT(*) FROM asr_loc_mast WHERE loc_sts != 'Z'
-<!-- <if test="areaId != null">-->
-<!-- and area_id = #{areaId}-->
-<!-- </if>-->
+ SELECT COUNT(*)
+ FROM asr_loc_mast
+ WHERE loc_sts != 'Z'
+ <if test="areaId != null and areaId != ''">
+ AND area_id = #{areaId}
+ </if>
UNION ALL
- SELECT COUNT(*) FROM asr_loc_mast WHERE loc_sts = 'F' or loc_sts = 'P' or loc_sts = 'Q' or loc_sts = 'R' or loc_sts = 'S' or loc_sts = 'X'
-<!-- <if test="areaId != null">-->
-<!-- and area_id = #{areaId}-->
-<!-- </if>-->
+ SELECT COUNT(*)
+ FROM asr_loc_mast
+ WHERE loc_sts IN ('F', 'P', 'Q', 'R', 'S', 'X')
+ <if test="areaId != null and areaId != ''">
+ AND area_id = #{areaId}
+ </if>
UNION ALL
- SELECT ISNULL(SUM(anfme), 0) FROM asr_loc_detl
-<!-- <if test="areaId != null">-->
-<!-- WHERE area_id = #{areaId}-->
-<!-- </if>-->
+ SELECT ISNULL(SUM(d.anfme), 0)
+ FROM asr_loc_detl d
+ <if test="areaId != null and areaId != ''">
+ INNER JOIN asr_loc_mast m ON m.loc_no = d.loc_no
+ WHERE m.area_id = #{areaId}
+ </if>
UNION ALL
SELECT ISNULL(SUM(anfme), 0) FROM asr_wrkin_view WHERE CONVERT(VARCHAR, io_time, 23) = CONVERT(VARCHAR, GETDATE(), 23)
-<!-- <if test="areaId != null">-->
-<!-- and area_id = #{areaId}-->
-<!-- </if>-->
+ <if test="areaId != null and areaId != ''">
+ AND area_id = #{areaId}
+ </if>
UNION ALL
SELECT ISNULL(SUM(anfme), 0) FROM asr_wrkout_view WHERE CONVERT(VARCHAR, io_time, 23) = CONVERT(VARCHAR, GETDATE(), 23)
-<!-- <if test="areaId != null">-->
-<!-- and area_id = #{areaId}-->
-<!-- </if>-->
+ <if test="areaId != null and areaId != ''">
+ AND area_id = #{areaId}
+ </if>
</select>
<select id="recentOrder" resultType="com.zy.asrs.entity.digitaltwin.DtOrderVo">
--
Gitblit v1.9.1