From 7d096cd33d8a7fa3ba242234fc16d320746d3a2a Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 20:08:43 +0800
Subject: [PATCH] 9.26。4
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js | 13 ++++++++++++-
.idea/workspace.xml | 36 +++++++++++++++++-------------------
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 5 +++++
3 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad7653d..de83bc3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,16 +22,10 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。2">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。3">
<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/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-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.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-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" />
@@ -294,7 +288,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="9973000" />
+ <workItem from="1695718856285" duration="11011000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -459,7 +453,15 @@
<option name="project" value="LOCAL" />
<updated>1695725709313</updated>
</task>
- <option name="localTasksCounter" value="23" />
+ <task id="LOCAL-00023" summary="9.26。3">
+ <option name="closed" value="true" />
+ <created>1695728959013</created>
+ <option name="number" value="00023" />
+ <option name="presentableId" value="LOCAL-00023" />
+ <option name="project" value="LOCAL" />
+ <updated>1695728959013</updated>
+ </task>
+ <option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -487,7 +489,8 @@
<MESSAGE value="9.26" />
<MESSAGE value="9.26。1" />
<MESSAGE value="9.26。2" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。2" />
+ <MESSAGE value="9.26。3" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。3" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -504,17 +507,12 @@
</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>476</line>
- <option name="timeStamp" value="6" />
- </line-breakpoint>
- <line-breakpoint enabled="true" 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>
<option name="timeStamp" value="9" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
+ <line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
- <line>1305</line>
+ <line>1294</line>
<option name="timeStamp" value="14" />
</line-breakpoint>
</breakpoints>
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 7715d66..b343b7d 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
@@ -58,6 +58,11 @@
map.put("registered", count2);
map.put("actualArrival", count1);
map.put("nonArrival", count - count1);
+// Integer totalClassHours = (Integer) map.get("totalClassHours");
+// Integer laveClassHours = (Integer) map.get("laveClassHours");
+// map.put("already",totalClassHours-laveClassHours);
+
+
}
return list;
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js
index 11084e8..caba542 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js
@@ -33,7 +33,18 @@
}
}
},
- {title: '已上课时数', field: 'already', align: 'center', valign: 'middle'},
+ {
+ title: '已上课时数',
+ field: 'already',
+ align: 'center',
+ valign: 'middle',
+ formatter: function (value, row) {
+ var totalClassHours = row.totalClassHours;
+ var laveClassHours = row.laveClassHours;
+ var alreadyClassHours = totalClassHours - laveClassHours;
+ return alreadyClassHours;
+ }
+ },
{title: '请假次数', field: 'absencesNumber', align: 'center', valign: 'middle'},
{
title: '状态',
--
Gitblit v1.7.1