From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
index 0f935d8..07711b0 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
@@ -4,20 +4,33 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="gridPatrolRecordResultMap" type="org.springblade.modules.grid.entity.GridPatrolRecordEntity">
-        <result column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="context" property="context"/>
-        <result column="url" property="url"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user" property="createUser"/>
-        <result column="is_deleted" property="isDeleted"/>
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="context"    column="context"    />
+        <result property="url"    column="url"    />
+        <result property="patrolTime"    column="patrol_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="isDeleted"    column="is_deleted"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="location"    column="location"    />
     </resultMap>
 
     <!--自定义分页查询-->
-    <select id="selectGridPatrolRecordPage" resultMap="gridPatrolRecordResultMap">
-        select * from jczz_grid_patrol_record where is_deleted = 0
+    <select id="selectGridPatrolRecordPage" resultType="org.springblade.modules.grid.vo.GridPatrolRecordVO">
+        select jgpr.* from jczz_grid_patrol_record jgpr
+        LEFT JOIN blade_user bu on bu.id = jgpr.create_user and bu.is_deleted = 0
+        LEFT JOIN blade_dept bd on bd.id = bu.dept_id and bd.is_deleted = 0
+        where jgpr.is_deleted = 0
         <if test="gridPatrolRecord.name!=null and gridPatrolRecord.name!=''">
-            and name like concat('%',#{gridPatrolRecord.name},'%')
+            and jgpr.name like concat('%',#{gridPatrolRecord.name},'%')
+        </if>
+        <if test="gridPatrolRecord.context!=null and gridPatrolRecord.context!=''">
+            and jgpr.context like concat('%',#{gridPatrolRecord.context},'%')
+        </if>
+        <if test="gridPatrolRecord.createUser!=null">
+            and jgpr.create_user = #{gridPatrolRecord.createUser}
         </if>
     </select>
 

--
Gitblit v1.9.3