From 6b8971db2990a8bcb4c67ba0d07df2368a00a45e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Dec 2023 19:57:42 +0800
Subject: [PATCH] 大坝一张图接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index 83a8a2d..a22a98d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -194,9 +194,13 @@
<select id="customizeGetById" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
T.*,
- U.REAL_NAME AS toUserIdName
+ SPT.NAME AS taskTypeName,
+ U.REAL_NAME AS toUserIdName,
+ arb."center_long" lon ,arb."center_lat" lat
FROM SM_PATROL_TASK T
LEFT JOIN BLADE_USER U ON U.ID = T.TO_USER_ID
+ LEFT JOIN SM_PATROL_TYPE SPT ON SPT.ID = T.TASK_TYPE
+ LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = T.project_id
WHERE T.ID = #{id}
AND T.IS_DELETED = 0
</select>
@@ -273,7 +277,7 @@
<!--行政区统计列表-->
<select id="getRegionReportList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
select * from (
- select "ad_name","ad_grad","order_id", #{patrolTaskReport.startTime} AS startTime,#{patrolTaskReport.endTime} AS endTime,
+ select "ad_name" AS adName ,"guid" AS adCode,"order_id", #{patrolTaskReport.startTime} AS startTime,#{patrolTaskReport.endTime} AS endTime,
(
select count(*) from YWXT.SM_PATROL_TASK spt
left join SJZT_MD."att_res_base" a on (spt.project_id = a."guid")
@@ -448,6 +452,7 @@
t.start_time,
u.real_name patrolUserName,
t.state,
+ t.id,
(
CASE t.state
WHEN '1' THEN '未完成'
--
Gitblit v1.9.3