From a15cca9fecaa11f30358fb0b4b042fdf39553a07 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 27 九月 2023 14:26:06 +0800
Subject: [PATCH] 9.26。12
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 9 +++++----
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 4 +++-
.idea/workspace.xml | 9 ++++++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html | 18 ++++++++++++------
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f05b5b..253cdad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AnalysisUIOptions">
+ <option name="GROUP_BY_SEVERITY" value="true" />
+ </component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
@@ -24,7 +27,9 @@
<component name="ChangeListManager">
<list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。11">
<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/CoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.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/controller/system/TStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -288,6 +293,8 @@
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
<workItem from="1695718856285" duration="22098000" />
+ <workItem from="1695775091167" duration="4246000" />
+ <workItem from="1695794503293" duration="1371000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index 8f0c860..5ea7737 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -25,6 +25,8 @@
cancelClasses,
deductClassHour,
integral
- FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
+ FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} GROUP BY classDate
+ 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/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 4af6710..8bf7816 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -558,8 +558,9 @@
if (resultUtil==""||resultUtil==null){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+
}
@@ -582,8 +583,8 @@
if (resultUtil==""){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
}
//赠课
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
index 8e61277..6b29097 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
@@ -44,20 +44,22 @@
"body": [
{
"type": "form",
- "title": "表单",
- "hidden": true,
+ "id": "u:285d560cf7ab",
+ "title": "表单1",
"body": [
{
"label": "文本",
"type": "input-text",
"name": "id",
- "id": "u:99d3d8869d55"
+ "id": "u:99d3d8869d55",
+ "hidden": true
},
{
"label": "文本",
"type": "input-text",
"name": "ids",
- "id": "u:5b12dc7c90"
+ "id": "u:5b12dc7c90",
+ "hidden": true
}
],
"api": {
@@ -65,10 +67,14 @@
"method": "post",
"requestAdaptor": "",
"adaptor": "",
- "messages": {},
+ "messages": {
+ },
"dataType": "form"
},
- "id": "u:285d560cf7ab"
+ "actions": [
+ ],
+ "wrapWithPanel": false,
+ "visible": true
},
{
"type": "property",
--
Gitblit v1.7.1