From e0786b57f356db59efc6a4a3dd5e23908775286a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index c220ffb..bb9af63 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -677,9 +677,21 @@
List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
if (recordAppoints.size() > 0) {
if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
+ if (appointStatus ==2){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> record.getStatus().equals(3))
+ .collect(Collectors.toList());
+ }else if (appointStatus ==3){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> record.getStatus().equals(4))
+ .collect(Collectors.toList());
+ }
+ else {
+
recordAppoints = recordAppoints.stream()
.filter(record -> record.getStatus().equals(appointStatus))
.collect(Collectors.toList());
+ }
}
if (ToolUtil.isNotEmpty(search)) {
recordAppoints = recordAppoints.stream()
@@ -697,7 +709,8 @@
.filter(record -> {
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Date time = sdf.parse(record.getTimeFrame().substring(11));
+ String substring = record.getTimeFrame().substring(11);
+ Date time = sdf.parse(substring);
return !time.before(lastWeekStartDate) && !time.after(lastOfDate);
} catch (ParseException e) {
return false;
--
Gitblit v1.7.1