From 098b507166a2b23f0256d5c4f097e7f05f11e9be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 09:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java |   53 +++++++----------------------------------------------
 1 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java
index 8befd43..758c87f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java
@@ -3,9 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
 import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
 import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,47 +18,10 @@
 @Mapper
 public interface ComSwPatrolRecordDAO extends BaseMapper<ComSwPatrolRecordDO> {
 
-    @Select("<script> " +
-            "SELECT " +
-            "cspr.id, " +
-            "cspr.community_id AS communityId, " +
-            "cspr.patrol_time AS patrolTime, " +
-            "cspr.weather," +
-            "cspr.temperature," +
-            "cspr.wind," +
-            "cspr.patrol_type AS patrolType, " +
-            "cspr.patrol_person AS patrolPerson, " +
-            "cspr.address, " +
-            "cspr.record_content AS recordContent, " +
-            "cspr.find_record AS findRecord, " +
-            "cspr.record_photo AS recordPhoto, " +
-            "cspr.remark, " +
-            "cspr.succession_person AS successionPerson, " +
-            "cspr.succession_time AS successionTime, " +
-            "cspr.create_at AS createAt, " +
-            "cspr.create_by AS createBy, " +
-            "csprr.report_id AS reportId " +
-            "FROM " +
-            "com_sw_patrol_record as cspr " +
-            "left join com_sw_patrol_record_report as csprr on csprr.patrol_record_id = cspr.id " +
-            "<where>" +
-            "<if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != &quot;&quot;'>" +
-            "AND cspr.community_id = #{comSwPatrolRecordDTO.communityId} " +
-            " </if> " +
-            "<if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != &quot;&quot;'>" +
-            "AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%') " +
-            " </if> " +
-            "<if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != &quot;&quot;'>" +
-            "AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType} " +
-            " </if> " +
-            "<if test='comSwPatrolRecordDTO.patrolAtBegin != null '>" +
-            "AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}  " +
-            " </if> " +
-            "<if test='comSwPatrolRecordDTO.patrolAtEnd != null '>" +
-            "AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}  " +
-            " </if> " +
-            " </where>" +
-            " order by cspr.create_at desc" +
-            "</script>")
-    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordDTO comSwPatrolRecordDTO);
+    /**
+     * 分页查询巡查记录
+     * @param comSwPatrolRecordPageDTO 查询参数
+     * @return 分页集合
+     */
+    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
 }

--
Gitblit v1.7.1