feiyu02
2024-11-21 9de446b0b83610055437fbc5172d216bb374900f
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 &lt;= #{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 &lt;= #{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