From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index a62107c..94ee0c8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -4,11 +4,94 @@
<!-- 通用查询映射结果 -->
<resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.entity.FwTaskScheduleEntity">
+ <result column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="area_divide_id" property="areaDivideId"/>
+ <result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="longitude" property="longitude"/>
+ <result column="latitude" property="latitude"/>
+ <result column="dispatch_user" property="dispatchUser"/>
+ <result column="dispatch_start_time" property="dispatchStartTime"/>
+ <result column="dispatch_end_time" property="dispatchEndTime"/>
+ <result column="dispatch_content" property="dispatchContent"/>
+ <result column="dispatch_result" property="dispatchResult"/>
+ <result column="dispose_measure" property="disposeMeasure"/>
+ <result column="area_code" property="areaCode"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
- select * from ja_fw_task_schedule where is_deleted = 0
+ select * from ja_fw_task_schedule
+ <where>
+ is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and id = #{param2.id}
+ </if>
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
+ and area_divide_id = #{param2.areaDivideId}
+ </if>
+ <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
+ and defense_scene_id = #{param2.defenseSceneId}
+ </if>
+ <if test="param2.longitude != null and param2.longitude != ''">
+ and longitude = #{param2.longitude}
+ </if>
+ <if test="param2.latitude != null and param2.latitude != ''">
+ and latitude = #{param2.latitude}
+ </if>
+ <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
+ and dispatch_user = #{param2.dispatchUser}
+ </if>
+ <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
+ and dispatch_start_time = #{param2.dispatchStartTime}
+ </if>
+ <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
+ and dispatch_end_time = #{param2.dispatchEndTime}
+ </if>
+ <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
+ and dispatch_content = #{param2.dispatchContent}
+ </if>
+ <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
+ and dispatch_result = #{param2.dispatchResult}
+ </if>
+ <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
+ and dispose_measure = #{param2.disposeMeasure}
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and area_code = #{param2.areaCode}
+ </if>
+ <if test="param2.createUser != null and param2.createUser != ''">
+ and create_user = #{param2.createUser}
+ </if>
+ <if test="param2.createDept != null and param2.createDept != ''">
+ and create_dept = #{param2.createDept}
+ </if>
+ <if test="param2.createTime != null and param2.createTime != ''">
+ and create_time = #{param2.createTime}
+ </if>
+ <if test="param2.updateUser != null and param2.updateUser != ''">
+ and update_user = #{param2.updateUser}
+ </if>
+ <if test="param2.updateTime != null and param2.updateTime != ''">
+ and update_time = #{param2.updateTime}
+ </if>
+ <if test="param2.status != null and param2.status != ''">
+ and status = #{param2.status}
+ </if>
+ <if test="param2.isDeleted != null and param2.isDeleted != ''">
+ and is_deleted = #{param2.isDeleted}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3