From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
index 1718b76..a5e2982 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -50,15 +51,39 @@
      * @param matterName
      * @return
      */
-    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
-                                            @Param("ids") List<String> ids);
+    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
+                                            @Param("matterName") String matterName,
+                                            @Param("ids") List<String> ids,
+                                            @Param("status") String status,
+                                            @Param("guideUserId") String guideUserId,
+                                            @Param("createTimeStartTime") String createTimeStartTime,
+                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
+                                            @Param("classifyId") String classifyId);
+
+
+    /**
+     * 获取工单列表(不分页用于小程序)
+     * @param matterName
+     * @return
+     */
+    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
+                                            @Param("ids") List<String> ids,
+                                            @Param("status") String status,
+                                            @Param("guideUserId") String guideUserId,
+                                            @Param("createTimeStartTime") String createTimeStartTime,
+                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
+                                            @Param("classifyId") String classifyId
+                                            );
 
     /**
      * 获取工单列表(求和)
      * @param matterName
      * @return
      */
-    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);
+    int countConfigList(@Param("matterName") String matterName,
+                        @Param("ids") List<String> ids,
+                        @Param("status") String status,
+                        @Param("guideUserId") String guideUserId);
 
 
     /**
@@ -85,7 +110,8 @@
                            @Param("isTimeout") String isTimeout,
                            @Param("evaluateState") String evaluateState,
                            @Param("classifyIds") List<String> classifyIds,
-                           @Param("serviceState") String serviceState);
+                           @Param("serviceState") String serviceState,
+                           @Param("guideUserId") String guideUserId);
 
     /**
      * 统计工单用
@@ -94,6 +120,24 @@
     List<CountListNum> countListNum(@Param("state") String state,
                                     @Param("ids") List<String> ids,
                                     @Param("time") Integer time);
+    /**
+     * 获取超时工单
+     * @return
+     */
+   List<GuideRepairOrder> selectOvertime();
+
+    /**
+     * 更改状态为好评
+     * @return
+     */
+    List<GuideRepairOrder> selectEvaluate();
+
+
+    /**
+     * 获取需要通知的单据
+     * @return
+     */
+    List<GuideRepairOrder> selectNoticeTime(@Param("minute") Integer minute);
 
 
 }

--
Gitblit v1.7.1