From f16e5b84d8b15202acf505b5e80a9f2ebcc471fe Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 18:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 ec2aac0..8c302ea 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.CountListNum;
 import com.dg.core.db.gen.entity.GuideRepairOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.data.repository.query.Param;
@@ -49,17 +50,35 @@
      * @param matterName
      * @return
      */
-    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName);
+    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
+                                            @Param("ids") List<String> ids);
 
     /**
      * 获取工单列表(求和)
      * @param matterName
      * @return
      */
-    int countConfigList(@Param("matterName") String matterName);
+    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);
 
 
+    /**
+     * 统计工单用   1 今天   2昨天   3本月   4本年度
+     * @return
+     */
+    int countStatisticsNum(@Param("state") String state,
+                           @Param("ids") List<String> ids,
+                           @Param("time") String time,
+                           @Param("isTimeout") String isTimeout,
+                           @Param("evaluateState") String evaluateState,
+                           @Param("classifyIds") List<String> classifyIds);
 
+    /**
+     * 统计工单用
+     * @return
+     */
+    List<CountListNum> countListNum(@Param("state") String state,
+                                    @Param("ids") List<String> ids,
+                                    @Param("time") Integer time);
 
 
 }

--
Gitblit v1.7.1