From ff3f4ff4c8a6da4c1650611e11a4551680b10d77 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 21:26:22 +0800
Subject: [PATCH] 9.26。6
---
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 18 +++++++++---------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 11 ++++++++++-
.idea/workspace.xml | 22 +++++++++++++++++-----
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 2 +-
5 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ceef316..a979f4a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,9 +22,12 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。4">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。5">
<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-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -287,7 +290,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="11433000" />
+ <workItem from="1695718856285" duration="15743000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -468,7 +471,15 @@
<option name="project" value="LOCAL" />
<updated>1695730124076</updated>
</task>
- <option name="localTasksCounter" value="25" />
+ <task id="LOCAL-00025" summary="9.26。5">
+ <option name="closed" value="true" />
+ <created>1695730466910</created>
+ <option name="number" value="00025" />
+ <option name="presentableId" value="LOCAL-00025" />
+ <option name="project" value="LOCAL" />
+ <updated>1695730466910</updated>
+ </task>
+ <option name="localTasksCounter" value="26" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -498,7 +509,8 @@
<MESSAGE value="9.26。2" />
<MESSAGE value="9.26。3" />
<MESSAGE value="9.26。4" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。4" />
+ <MESSAGE value="9.26。5" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。5" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -515,7 +527,7 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java</url>
- <line>449</line>
+ <line>458</line>
<option name="timeStamp" value="9" />
</line-breakpoint>
<line-breakpoint type="java-line">
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 786a631..3bf1d28 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
@@ -53,7 +53,7 @@
Long id = Long.valueOf(map.get("id").toString());
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 count1 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 1));
int count2 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 0));
map.put("registered", count2);
map.put("actualArrival", count1);
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index fdf9e32..8f0c860 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -17,14 +17,14 @@
<select id="queryCoursePackageSchedulingList" resultType="map">
- select
- CAST(id AS CHAR(20)) as id,
- DATE_FORMAT(classDate, '%Y-%m-%d') as classDate,
- courseId,
- `status`,
- cancelClasses,
- deductClassHour,
- integral
- from t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
+ SELECT
+ CAST(id AS CHAR(20)) AS id,
+ CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
+ courseId,
+ `status`,
+ cancelClasses,
+ deductClassHour,
+ integral
+ FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
</select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index 2b7d62a..1f11123 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -356,7 +356,6 @@
return coursePackageStudentClient.queryCoursePackageStudentList(queryCoursePackageStudentList);
}
-
/**
* 取消预约
* @param id
@@ -368,9 +367,19 @@
if(coursePackageStudent.getSignInOrNot() == 1){
return ResultUtil.error("无法取消预约");
}
+// TCoursePackagePayment payment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
+// payment.setAbsencesNumber(payment.getAbsencesNumber()+1);
+// coursePackagePaymentClient.editCoursePackagePayment(payment);
+
+
coursePackageStudent = new CoursePackageStudent();
coursePackageStudent.setId(id);
coursePackageStudent.setReservationStatus(0);
+
+
+
+ coursePackageStudent.getCoursePackagePaymentId();
+
coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
return ResultUtil.success();
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
index 6626848..79f80b2 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
@@ -19,7 +19,7 @@
{title: '请假学员', field: 'registered', align: 'center', valign: 'middle'},
{title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle',
formatter: function (v, row) {
- if (row.absencesNumber === undefined) {
+ if (row.cancelClasses === undefined) {
return 0;
} else {
return v;
--
Gitblit v1.7.1