From 583ff2c3bfa45f6359a792c01f9bc3d37a6b2a0c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 18:55:08 +0800
Subject: [PATCH] 9.26。2
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 1 +
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js | 2 +-
.idea/workspace.xml | 24 +++++++++++++++---------
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 2 +-
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4805b5a..b1816f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,15 +22,12 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。1">
<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/controller/CoursePackageSchedulingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" 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/WEB-INF/view/system/coursePackage/coursePackage_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" 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" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -293,7 +290,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="4120000" />
+ <workItem from="1695718856285" duration="6574000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -442,7 +439,15 @@
<option name="project" value="LOCAL" />
<updated>1695719130696</updated>
</task>
- <option name="localTasksCounter" value="21" />
+ <task id="LOCAL-00021" summary="9.26。1">
+ <option name="closed" value="true" />
+ <created>1695723019798</created>
+ <option name="number" value="00021" />
+ <option name="presentableId" value="LOCAL-00021" />
+ <option name="project" value="LOCAL" />
+ <updated>1695723019798</updated>
+ </task>
+ <option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -468,7 +473,8 @@
<MESSAGE value="学员4" />
<MESSAGE value="9.25" />
<MESSAGE value="9.26" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26" />
+ <MESSAGE value="9.26。1" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。1" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 55722f8..267859a 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1290,7 +1290,7 @@
@ResponseBody
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
public void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment){
- coursePackagePayment.setAppUserId(null);
+ coursePackagePayment.setCoursePackageId(null);
packagePaymentService.updateById(coursePackagePayment);
}
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 e3dd58f..f1247fe 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
@@ -473,6 +473,7 @@
if(coursePackageStudent.getSignInOrNot() == 0){
tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
}
+ System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
CancelledClasses cancelledClasses = new CancelledClasses();
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 fe7937e..6626848 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
@@ -59,7 +59,7 @@
}
},
{title: '扣除课时', field: 'deductClassHour', align: 'center', valign: 'middle'},
- {title: '取消记录', field: 'absencesNumber', align: 'center', valign: 'middle',
+ {title: '消课凭证', field: 'cancelClasses', align: 'center', valign: 'middle',
formatter: function (v) {
if (typeof v === "undefined") {
return '未上传';
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
index 384e4ec..2a643d8 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
@@ -59,7 +59,7 @@
}
},
{title: '扣除课时', field: 'deductClassHour', align: 'center', valign: 'middle'},
- {title: '取消记录', field: 'absencesNumber', align: 'center', valign: 'middle',
+ {title: '消课凭证', field: 'cancelClasses', align: 'center', valign: 'middle',
formatter: function (v) {
if (typeof v === "undefined") {
return '未上传';
--
Gitblit v1.7.1