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/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 eaf3b76..99520e5 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,6 +1,7 @@
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;
@@ -39,7 +40,16 @@
* @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);
+
+ /**
+ * 获取工单列表(不分页用于小程序)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
+ String guideUserId);
/**
@@ -47,7 +57,7 @@
* @param matterName
* @return
*/
- int countConfigList(String matterName,List<String> ids);
+ int countConfigList(String matterName,List<String> ids,String status,String guideUserId);
/**
@@ -67,7 +77,9 @@
* 统计工单用 1 今天 2昨天 3本月 4本年度 String time
* @return
*/
- int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState,List<String> classifyIds);
+ int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,
+ String evaluateState,List<String> classifyIds,
+ String serviceState,String guideUserId);
/**
* 统计数据
@@ -100,4 +112,23 @@
*/
void sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder);
+ /**
+ * 删除工单
+ * @param Id
+ * @return
+ */
+ int deleteConfigById(String Id);
+
+ /**
+ * 推送超时工单
+ * @return
+ */
+ ResultData pushOvertimeGuideRepairOrder();
+
+ /**
+ * 更改状态为好评
+ * @return
+ */
+ int updateEvaluate();
+
}
--
Gitblit v1.7.1