From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java |   72 +++++++++++------------------------
 1 files changed, 23 insertions(+), 49 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 25c91a1..1038b7d 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
@@ -1,16 +1,16 @@
 package com.panzhihua.service_community.dao;
 
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 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;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * @auther txb
@@ -20,47 +20,21 @@
 @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_time AS createTime," +
-            "csprr.report_id AS reportId" +
-            "FROM  " +
-            "com_sw_patrol_record AS cspr" +
-            "left join com_sw_patrol_record_report AS csprr on cspr.id = csprr.patrol_record_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 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);
+
+    Map<String, String> getPbServiceTeamById(@Param("teamId") String teamId);
+
+    Map<String, Object> getPbServiceTeamCardNo(@Param("userId") String userId);
+
+    String getCreateName(@Param("userId") Long userId);
+
+    Map<String, String> getPatrolPersonName(@Param("dangerId") Long dangerId);
 }

--
Gitblit v1.7.1