From de966932523a5e4cd99eba99e4d6db69957e16c9 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 20:14:26 +0800
Subject: [PATCH] 9.26。5
---
.idea/workspace.xml | 18 +++++++++++++-----
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de83bc3..ceef316 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,10 +22,9 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。3">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。4">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -288,7 +287,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="11011000" />
+ <workItem from="1695718856285" duration="11433000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -461,7 +460,15 @@
<option name="project" value="LOCAL" />
<updated>1695728959013</updated>
</task>
- <option name="localTasksCounter" value="24" />
+ <task id="LOCAL-00024" summary="9.26。4">
+ <option name="closed" value="true" />
+ <created>1695730124076</created>
+ <option name="number" value="00024" />
+ <option name="presentableId" value="LOCAL-00024" />
+ <option name="project" value="LOCAL" />
+ <updated>1695730124076</updated>
+ </task>
+ <option name="localTasksCounter" value="25" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -490,7 +497,8 @@
<MESSAGE value="9.26。1" />
<MESSAGE value="9.26。2" />
<MESSAGE value="9.26。3" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。3" />
+ <MESSAGE value="9.26。4" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。4" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
index b343b7d..786a631 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -54,7 +54,7 @@
int count = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 1));
// map.put("registered", count);
int count1 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("signInOrNot", 1));
- int count2 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("signInOrNot", 2));
+ int count2 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 0));
map.put("registered", count2);
map.put("actualArrival", count1);
map.put("nonArrival", count - count1);
--
Gitblit v1.7.1