Merge remote-tracking branch 'origin/master'

无关风月

2025-07-02 7b9edf1f2f47b196a7876addbab0aca9c8c23c31

 ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml

@@ -198,5 +198,26 @@

        group by t1.user_id,t1.template_id
    </select>
    <select id="pointInspectionHeatDetailTaskList" resultType="com.ruoyi.system.vo.system.TLocationTaskListVO">
        select t1.*,t2.nick_name as nickName,t2.phonenumber AS phoneNumber,t2.deptName,t2.deptId
        from t_task t1
        left join sys_user t2 on t1.user_id = t2.user_id
        <where>
            <if test="query.locationId != null and query.locationId != ''">
                and t1.location_id = #{query.locationId}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                and t1.implement_time between #{query.startTime} and #{query.endTime}
            </if>
            <if test="query.projectIds != null and query.projectIds.size()>0">
                and t2.deptId IN
                <foreach collection="query.projectIds" separator="," item="id" open="(" close=")">
                    #{id}
                </foreach>
            </if>
            and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
         order by t1.implement_time desc
    </select>

</mapper>