From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑
---
src/main/resources/mapper/ds1/ProblemlistMapper.xml | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/ds1/ProblemlistMapper.xml b/src/main/resources/mapper/ds1/ProblemlistMapper.xml
index ff89068..a648def 100644
--- a/src/main/resources/mapper/ds1/ProblemlistMapper.xml
+++ b/src/main/resources/mapper/ds1/ProblemlistMapper.xml
@@ -76,21 +76,27 @@
LEFT JOIN sm_t_scense AS f ON a.S_GUID = f.S_GUID
LEFT JOIN tm_t_subtask AS c ON a.ST_GUID = c.ST_GUID
<where>
- <if test="startTime != null">
- AND c.ST_PlanStartTime >= #{startTime}
- </if>
- <if test="endTime != null">
- AND c.ST_PlanStartTime <= #{endTime}
- </if>
- <if test="districtCode != null">
- AND f.S_DistrictCode = #{districtCode}
- </if>
- <if test="sceneType != null">
- AND f.S_TypeID = #{sceneType}
- </if>
- <if test="sceneId != null">
- AND a.S_GUID = #{sceneId}
- </if>
+<!-- <if test="startTime != null">-->
+<!-- AND c.ST_PlanStartTime >= #{startTime}-->
+<!-- </if>-->
+<!-- <if test="endTime != null">-->
+<!-- AND c.ST_PlanStartTime <= #{endTime}-->
+<!-- </if>-->
+<!-- <if test="districtCode != null">-->
+<!-- AND f.S_DistrictCode = #{districtCode}-->
+<!-- </if>-->
+ <if test="scensetypeid != null">
+ AND f.S_TypeID = #{scensetypeid}
+ </if>
+ <if test="sceneId != null">
+ AND a.S_GUID = #{sceneId}
+ </if>
+ <include refid="cn.flightfeather.supervision.domain.ds1.mapper.ScenseMapper.Where_Area">
+ <property name="tableAlias" value="f"/>
+ </include>
+ <include refid="cn.flightfeather.supervision.domain.ds1.mapper.SubtaskMapper.Where_Plan_Time">
+ <property name="tableAlias" value="c"/>
+ </include>
</where>
GROUP BY
b.PT_TypeName
@@ -214,11 +220,18 @@
sm_t_scense AS b
LEFT JOIN tm_t_subtask AS a ON a.ST_ScenseID = b.S_GUID
LEFT JOIN im_t_problemlist AS d ON a.ST_GUID = d.ST_GUID
- WHERE
- a.T_GUID = #{topTaskId}
- <if test="sceneTypeId != null">
- and b.S_TypeID = #{sceneTypeId}
- </if>
+ <where>
+ <include refid="cn.flightfeather.supervision.domain.ds1.mapper.ScenseMapper.Where_Area">
+ <property name="tableAlias" value="b"/>
+ </include>
+ <include refid="cn.flightfeather.supervision.domain.ds1.mapper.SubtaskMapper.Where_Plan_Time">
+ <property name="tableAlias" value="a"/>
+ </include>
+<!-- a.T_GUID = #{topTaskId}-->
+ <if test="scensetypeid != null">
+ and b.S_TypeID = #{scensetypeid}
+ </if>
+ </where>
GROUP BY
b.S_GUID
) as t_p
--
Gitblit v1.9.3