From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
index 60bc68c..b06d150 100644
--- a/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
@@ -1,10 +1,7 @@
 package com.dg.core.service;
 
 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.GuideEvolveEntity;
-import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.dg.core.db.gen.entity.*;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
@@ -63,11 +60,17 @@
      * 统计工单用  1 今天   2昨天   3本月   4本年度 String time
      * @return
      */
-    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState);
+    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState,List<String> classifyIds);
 
 
     List<CountListNum> countListNum(String state,
                                     List<String> ids,
                                     Integer time);
 
+    /**
+     * 获取提工单提交交人员信息
+     * @return
+     */
+    SysUser getSubmitUser(GuideRepairOrder guideRepairOrder);
+
 }

--
Gitblit v1.7.1