From 9de446b0b83610055437fbc5172d216bb374900f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:22:19 +0800
Subject: [PATCH] 1. 2024.11.21 修复部分bug

---
 src/main/resources/mapper/ds1/SubtaskMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ds1/SubtaskMapper.xml b/src/main/resources/mapper/ds1/SubtaskMapper.xml
index e3a8cfe..1e1289b 100644
--- a/src/main/resources/mapper/ds1/SubtaskMapper.xml
+++ b/src/main/resources/mapper/ds1/SubtaskMapper.xml
@@ -403,12 +403,18 @@
     <select id="getSummaryByArea" resultMap="SubTaskSummary">
         <include refid="Sub_Task_Summary_Column_List"/>
         <where>
-            <include refid="Where_Area">
-                <property name="tableAlias" value="a"/>
+            <include refid="cn.flightfeather.supervision.domain.ds1.mapper.ScenseMapper.Where_Area">
+                <property name="tableAlias" value="b"/>
             </include>
             <include refid="Where_Plan_Time">
                 <property name="tableAlias" value="a"/>
             </include>
+            <if test="scensetypeid != null">
+                AND b.S_TypeID = #{scensetypeid}
+            </if>
+            <if test="topTaskId != null">
+                AND a.T_GUID = #{topTaskId}
+            </if>
         </where>
         GROUP BY
         a.ST_GUID

--
Gitblit v1.9.3