From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 534597c..7c68f6d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -202,13 +202,20 @@
@Override
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
- String matterName, List<String> ids,String status) {
- return baseMapper.selectConfigList(page, state, matterName, ids,status);
+ String matterName, List<String> ids,String status,
+ String guideUserId) {
+ return baseMapper.selectConfigList(page, state, matterName, ids,status,guideUserId);
}
@Override
- public int countConfigList(String matterName, List<String> ids,String status) {
- return baseMapper.countConfigList(matterName, ids,status);
+ public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
+ String guideUserId) {
+ return baseMapper.selectConfigList(matterName, ids,status,guideUserId);
+ }
+
+ @Override
+ public int countConfigList(String matterName, List<String> ids,String status,String guideUserId) {
+ return baseMapper.countConfigList(matterName, ids,status,guideUserId);
}
@Override
@@ -263,8 +270,9 @@
@Override
public int countStatisticsNum(String state, List<String> ids, String time,
String isTimeout, String evaluateState,
- List<String> classifyIds,String serviceState) {
- return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState);
+ List<String> classifyIds,String serviceState,
+ String guideUserId) {
+ return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState,guideUserId);
}
@Override
@@ -307,7 +315,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -316,7 +324,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
--
Gitblit v1.7.1