From e28a746eb7cbb23a3d7bbb78dba0ae3023e8215d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 29 Jul 2026 18:07:17 +0800
Subject: [PATCH] feat(workorder): 添加线索事件分页列表功能并优化状态流转
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 133 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index 07badd0..fed63e2 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -13,6 +13,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -34,7 +35,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
- <result column="event_code" property="eventCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="event_location" property="eventLocation"/>
<result column="shoot_time" property="shootTime"/>
<result column="event_image_url" property="eventImageUrl"/>
@@ -48,13 +49,34 @@
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="geojson" property="geojson"/>
+ <result column="attachment_type" property="attachmentType"/>
</resultMap>
<resultMap id="gdClueEventListVoResultMap" type="org.sxkj.gd.workorder.vo.GdClueEventListVO">
<result column="id" property="id"/>
<result column="event_image_url" property="eventImageUrl"/>
<result column="create_time" property="createTime"/>
+ <result column="geojson" property="geojson"/>
+ <result column="attachment_type" property="attachmentType"/>
+ <result column="event_name" property="eventName"/>
+ <result column="shoot_time" property="shootTime"/>
+ <result column="dispose_user_name" property="disposeUserName"/>
+ <result column="dispose_dept_name" property="disposeDeptName"/>
</resultMap>
+
+ <resultMap id="gdClueEventCountVoResultMap" type="org.sxkj.gd.workorder.vo.GdClueEventCountVO">
+ <result column="total_count" property="totalCount"/>
+ <result column="my_count" property="myCount"/>
+ <result column="returned_count" property="returnedCount"/>
+ <result column="disposed_count" property="disposedCount"/>
+ <result column="completed_count" property="completedCount"/>
+ </resultMap>
+
+ <sql id="gdClueEventDeptWhere">
+ where ce.is_deleted = 0
+ and ce.dispose_dept = #{deptId}
+ </sql>
<resultMap id="gdClueEventExcelResultMap" type="org.sxkj.gd.workorder.excel.GdClueEventExcel">
<result column="result_id" property="resultId"/>
@@ -65,6 +87,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="is_deleted" property="isDeleted"/>
</resultMap>
@@ -74,48 +97,112 @@
<select id="selectGdClueEventList" resultMap="gdClueEventVoResultMap">
select ce.*,
- ifnull(bu.real_name, bu.name) as dispose_user_name,
+ COALESCE(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name
from (select * from ja_gd_clue_event ${ew.customSqlSegment}) ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
+ left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
</select>
<select id="selectGdClueEventSimpleList" resultMap="gdClueEventListVoResultMap">
- select ce.id as id,
- tr.result_url as event_image_url,
- ce.create_time as create_time
+ select
+ ce.id as id,
+ ce.event_name,
+ COALESCE(tr.result_url, ce.attach_url) as event_image_url,
+ COALESCE(tr.geojson, ce.geojson) as geojson,
+ COALESCE(tr.attachment_type, ce.attachment_type) as attachment_type,
+ ce.create_time as create_time,
+ tr.shoot_time as shoot_time,
+ COALESCE(bu.real_name, bu.name) as dispose_user_name,
+ bd.dept_name as dispose_dept_name
from ja_gd_clue_event ce
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
- where ce.is_deleted = 0
- and ce.dispose_dept = #{deptId}
+ left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
+ left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
+ <include refid="gdClueEventDeptWhere"/>
+ <if test="statusList != null and statusList.size() > 0">
+ and ce.event_status in
+ <foreach collection="statusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
+ </if>
+ <if test="keyword != null and keyword != ''">
+ and ce.event_num::VARCHAR like concat('%', #{keyword}, '%')
+ </if>
<if test="onlyMine != null and onlyMine == 1">
and ce.dispose_user = #{userId}
</if>
+ <if test="startTime != null and startTime != ''">
+ and tr.shoot_time >= #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and tr.shoot_time <= #{endTime}
+ </if>
+ order by ce.create_time desc
</select>
<select id="selectGdClueEventDetailById" resultMap="gdClueEventVoResultMap">
- select ce.*,
- ifnull(bu.real_name, bu.name) as dispose_user_name,
+ select
+ ce.id,
+ ce.result_id,
+ ce.work_order_id,
+ ce.dispose_user,
+ ce.dispose_dept,
+ ce.longitude,
+ ce.latitude,
+ ce.event_status,
+ ce.area_code,
+ ce.event_num,
+ ce.event_name,
+ ce.create_user,
+ ce.create_dept,
+ ce.create_time,
+ ce.update_user,
+ ce.update_time,
+ ce.status,
+ ce.is_deleted,
+ COALESCE(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name,
- ifnull(cu.real_name, cu.name) as distribute_user_name,
+ COALESCE(cu.real_name, cu.name) as distribute_user_name,
cd.dept_name as distribute_dept_name,
ce.create_time as distribute_time,
concat(ce.longitude, ',', ce.latitude) as event_location,
- tr.result_code as event_code,
- tr.shoot_time as shoot_time,
- tr.result_url as event_image_url
+ ce.event_num as event_num,
+ COALESCE(tr.shoot_time, ce.shoot_time) as shoot_time,
+ COALESCE(tr.result_url, ce.attach_url) as event_image_url,
+ COALESCE(tr.geojson, ce.geojson) as geojson,
+ COALESCE(tr.attachment_type, ce.attachment_type) as attachment_type,
+ tr.id as tr_id,
+ tr.attachment_type as tr_attachment_type_raw
from ja_gd_clue_event ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
- left join blade_user cu on cu.id = ce.create_user and cu.is_deleted = 0
- left join blade_dept cd on cd.id = ce.create_dept and cd.is_deleted = 0
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
- where ce.is_deleted = 0
- and ce.dispose_dept = #{deptId}
+ left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
+ left join blade_user cu on cu.id::VARCHAR = ce.create_user::VARCHAR and cu.is_deleted = 0
+ left join blade_dept cd on cd.id::VARCHAR = ce.create_dept::VARCHAR and cd.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
+ <include refid="gdClueEventDeptWhere"/>
and ce.id = #{id}
</select>
+ <select id="selectGdClueEventCount" resultMap="gdClueEventCountVoResultMap">
+ select count(1) as total_count,
+ COALESCE(sum(case when ce.dispose_user = #{userId} then 1 else 0 end), 0) as my_count,
+ COALESCE(sum(case when ce.event_status = 2 then 1 else 0 end), 0) as returned_count,
+ COALESCE(sum(case when ce.event_status = 3 then 1 else 0 end), 0) as disposed_count,
+ COALESCE(sum(case when ce.event_status = 4 then 1 else 0 end), 0) as completed_count
+ from ja_gd_clue_event ce
+ <include refid="gdClueEventDeptWhere"/>
+ <if test="statusList != null and statusList.size() > 0">
+ and ce.event_status in
+ <foreach collection="statusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
+ </if>
+ <if test="keyword != null and keyword != ''">
+ and ce.event_num like concat('%', #{keyword}, '%')
+ </if>
+ </select>
+
<select id="exportGdClueEvent" resultMap="gdClueEventExcelResultMap">
SELECT * FROM ja_gd_clue_event ${ew.customSqlSegment}
--
Gitblit v1.9.3