From 2f8838d281c9773e8f10610bf034f44d2fff2e69 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 21 Jul 2023 11:39:49 +0800
Subject: [PATCH] 测站经纬度范围查询

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
index f481184..654ffca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
@@ -8,6 +8,7 @@
         <result property="gateStatus" column="gate_status"/>
         <result property="content" column="content"/>
         <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="reportUser" column="real_name"/>
 
         <result property="createDept" column="create_dept"/>
         <result property="createUser" column="create_user"/>
@@ -20,9 +21,25 @@
 
 
     <select id="selectRecordPage" resultMap="vo">
+        SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_SCHEDULING_RECORD R
+        LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
+        LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
+        WHERE R.IS_DELETED = 0
+        <if test="record.reservoirName != null and record.reservoirName !=''">
+            AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
+        </if>
+        <if test="record.gateStatus !=null and record.gateStatus !=''">
+            AND R.gate_status = #{record.gateStatus}
+        </if>
+        <if test="record.createUser !=null and record.createUser !=''">
+            AND R.CREATE_USER = #{record.createUser}
+        </if>
+        ORDER BY R.CREATE_TIME  DESC
+    </select>
+    <select id="customizeGetDetail" resultType="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">
         SELECT R.*,arb."name" reservoirName FROM SM_SCHEDULING_RECORD R
         LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
-        WHERE R.IS_DELETED = 0
+        WHERE R.IS_DELETED = 0 AND r.id = #{record.id}
         <if test="record.reservoirName != null and record.reservoirName !=''">
             AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
         </if>

--
Gitblit v1.9.3