From f373bbf83d9d2a7e5f96118d7dcd658c9fea8bc8 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 14 八月 2025 17:27:44 +0800 Subject: [PATCH] 2025.8.14 1. 新增文件导入场景信息接口 2. 新增导出接口文档接口 --- 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