From 30dc5b1fa3bb545cb1c2f2445f26cb033d8295b9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 14:13:49 +0800
Subject: [PATCH] test: 注释类型字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
index e8ee43e..696716d 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
@@ -24,6 +24,7 @@
<result column="distribute_user_name" property="distributeUserName"/>
<result column="distribute_dept_name" property="distributeDeptName"/>
<result column="patrol_task_name" property="patrolTaskName"/>
+ <result column="attachment_type" property="attachmentType"/>
</resultMap>
<resultMap id="gdTaskResultExcelResultMap" type="org.sxkj.gd.workorder.excel.GdTaskResultExcel">
@@ -50,8 +51,11 @@
<if test="gdTaskResult.workOrderId != null">
AND wo.id = #{gdTaskResult.workOrderId}
</if>
- <if test="gdTaskResult.patrolTaskId != null">
- AND tr.patrol_task_id = #{gdTaskResult.patrolTaskId}
+ <if test="gdTaskResult.patrolTaskIds != null and gdTaskResult.patrolTaskIds.size() > 0">
+ AND tr.patrol_task_id IN
+ <foreach collection="gdTaskResult.patrolTaskIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
</if>
<if test="gdTaskResult.patrolTaskName != null and gdTaskResult.patrolTaskName != ''">
AND pt.patrol_task_name LIKE concat('%', #{gdTaskResult.patrolTaskName}, '%')
@@ -123,4 +127,22 @@
WHERE id = #{id}
</update>
+ <!-- 批量插入成果信息 -->
+ <insert id="insertBatch" parameterType="java.util.List">
+ INSERT INTO ja_gd_task_result (
+ patrol_task_id, result_code, result_url, shoot_time,
+ photo_data, longitude, latitude, distribute_status, area_code,
+ create_user, create_dept, create_time, update_user, update_time,
+ status, is_deleted
+ ) VALUES
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.patrolTaskId}, #{item.resultCode}, #{item.resultUrl}, #{item.shootTime},
+ CASE WHEN #{item.photoData} IS NULL THEN NULL ELSE #{item.photoData}::jsonb END, #{item.longitude}, #{item.latitude}, #{item.distributeStatus}, #{item.areaCode},
+ #{item.createUser}, #{item.createDept}, #{item.createTime}, #{item.updateUser}, #{item.updateTime},
+ #{item.status}, #{item.isDeleted}
+ )
+ </foreach>
+ </insert>
+
</mapper>
--
Gitblit v1.9.3