From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 682f76b..0e57c8c 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,9 +1,11 @@
package com.dg.core.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.*;
import org.springframework.data.repository.query.Param;
+import java.time.LocalDateTime;
import java.util.List;
public interface IGuideRepairOrderService {
@@ -39,7 +41,17 @@
* @param matterName
* @return
*/
- List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,String matterName,List<String> ids);
+ List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
+ String matterName, List<String> ids, String status, String guideUserId,
+ String createTimeStartTime, String createTimeTimeEndTime, String classifyId);
+
+ /**
+ * 获取工单列表(不分页用于小程序)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
+ String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId);
/**
@@ -47,7 +59,7 @@
* @param matterName
* @return
*/
- int countConfigList(String matterName,List<String> ids);
+ int countConfigList(String matterName,List<String> ids,String status,String guideUserId);
/**
@@ -69,7 +81,7 @@
*/
int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,
String evaluateState,List<String> classifyIds,
- String serviceState);
+ String serviceState,String guideUserId);
/**
* 统计数据
@@ -109,4 +121,23 @@
*/
int deleteConfigById(String Id);
+ /**
+ * 推送超时工单
+ * @return
+ */
+ ResultData pushOvertimeGuideRepairOrder();
+
+ /**
+ * 更改状态为好评
+ * @return
+ */
+ int updateEvaluate();
+
+
+ /**
+ * 删除评论
+ * @return
+ */
+ ResultData deleteComment(Integer id, SysUser sysUser);
+
}
--
Gitblit v1.7.1