From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改,根据坐标判断是否在多边形区域内 2.考勤打卡接口修改,根据打卡时间判断打卡的状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
index 41b52c1..df19ba7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml
@@ -58,13 +58,19 @@
            select f.*,d.addvnm from sys_feedback f left join sys_district d on d.addvcd=f.addvcd
     </select>
 
-    <!--App警情反馈信息-->
+    <!--警情反馈信息-->
     <select id="selectFeedEdit" resultMap="feedbackResultMaps">
         SELECT
-            f.*,
-            w.address
+            f.*
         FROM
             sys_feedback f
-                LEFT JOIN sys_wj w ON w.jid = f.jid WHERE f.jid=#{jid}
+                WHERE f.jid=#{jid}
+    </select>
+    <!--音频,视频信息返回-->
+    <select id="selectWjEdit" resultType="java.util.HashMap">
+        SELECT
+            address
+        FROM
+            sys_wj WHERE jid=#{jid}
     </select>
 </mapper>

--
Gitblit v1.9.3