From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 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..cd4c724 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
@@ -50,15 +50,32 @@
      * @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 matterName
+     * @return
+     */
+    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
+                                            @Param("ids") List<String> ids,
+                                            @Param("status") String status,
+                                            @Param("guideUserId") String guideUserId);
 
     /**
      * 获取工单列表(求和)
      * @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 +102,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 +112,17 @@
     List<CountListNum> countListNum(@Param("state") String state,
                                     @Param("ids") List<String> ids,
                                     @Param("time") Integer time);
+    /**
+     * 获取超时工单
+     * @return
+     */
+   List<GuideRepairOrder> selectOvertime();
+
+    /**
+     * 更改状态为好评
+     * @return
+     */
+    List<GuideRepairOrder> selectEvaluate();
 
 
 }

--
Gitblit v1.7.1