From d954784593cb24b0455529ea28588a317c5d766f Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 17:05:30 +0800
Subject: [PATCH] 9.26
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 9337926..b29cf19 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -470,7 +470,39 @@
model.addAttribute("times", strings);
model.addAttribute("counts", counts);
+
return PREFIX + "classRecord.html";
+ }
+
+ /**
+ * 假期跳转到上课记录列表页
+ * @param model
+ * @param id
+ * @return
+ */
+ @GetMapping("/openClassRecord1")
+ public String openClassRecord1(Model model, Integer id){
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(id);
+ String[] start = tCoursePackage.getClassStartTime().split(",");
+ String[] end = tCoursePackage.getClassEndTime().split(",");
+ Integer counts = packagePaymentClient.queryByClassId(id);
+
+
+ List<String> strings = new ArrayList<>();
+ for (int i = 0; i <start.length ; i++) {
+ String outTime = start[i] +"-" +end[0];
+ strings.add(outTime);
+ }
+
+ TStore store = storeService.getById(tCoursePackage.getStoreId());
+ Coach coach = coachClient.queryCoachById(tCoursePackage.getCoachId());
+ model.addAttribute("item", tCoursePackage);
+ model.addAttribute("store", store);
+ model.addAttribute("coach", coach);
+ model.addAttribute("times", strings);
+ model.addAttribute("counts", counts);
+
+ return PREFIX + "classRecord2.html";
}
@@ -692,8 +724,9 @@
String jsonString = jsonArray.getString(i);
String[] split = jsonString.split(" - ");
first.add(split[0]);
- second.add(split[1]);
-
+ if (split.length>1) {
+ second.add(split[1]);
+ }
}
String firstString = String.join(",",first);
String secondString = String.join(",",second);
@@ -944,7 +977,7 @@
@ResponseBody
@PostMapping("/makeUpMissedLessons")
public ResultUtil makeUpMissedLessons(Long id){
- System.out.println("==========coursePackagePaymentId======"+id);
+ System.out.println("==========coursePackage补课PaymentId======"+id);
return coursePackageService.makeUpMissedLessons(id);
}
--
Gitblit v1.7.1