From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
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 5b4453d..6b15485 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
@@ -260,17 +260,19 @@
//查询学员信息
TStudentDto tStudentDto = itStudentService.listOne(tStudentId);
model.addAttribute("item", tStudentDto);
- if (tStudentDto.getLateralSurface()!=null) {
+ if (tStudentDto.getLateralSurface()!=null&&!tStudentDto.getLateralSurface().equals("")) {
String[] pics = tStudentDto.getLateralSurface().split(";");
- model.addAttribute("pic1", pics[0]);
- System.out.println("=====pic1==" + pics[0]);
- if (pics.length > 1) {
- model.addAttribute("pic2", pics[1]);
- System.out.println("=====pic2==" + pics[1]);
- }
- if (pics.length > 2) {
- model.addAttribute("pic3", pics[2]);
- System.out.println("=====pic3==" + pics[2]);
+ if (pics.length>0) {
+ model.addAttribute("pic1", pics[0]);
+ System.out.println("=====pic1==" + pics[0]);
+ if (pics.length > 1) {
+ model.addAttribute("pic2", pics[1]);
+ System.out.println("=====pic2==" + pics[1]);
+ }
+ if (pics.length > 2) {
+ model.addAttribute("pic3", pics[2]);
+ System.out.println("=====pic3==" + pics[2]);
+ }
}
}
@@ -306,7 +308,7 @@
model.addAttribute("item", tStudentDto);
- if (tStudentDto.getLateralSurface()!=null) {
+ if (tStudentDto.getLateralSurface()!=null&&!tStudentDto.equals("")) {
String[] pics = tStudentDto.getLateralSurface().split(";");
model.addAttribute("pic1", pics[0]);
System.out.println("=====pic1==" + pics[0]);
@@ -434,8 +436,6 @@
List<Map<String,Object>> maps = studentClient.listCom(id);
-
-
return maps;
}
@@ -450,7 +450,8 @@
evaluateStudent.setImgs(image);
// evaluateStudent.setInsertTime(new Date());
-
+ User user = UserExt.getUser();
+ evaluateStudent.setCoachId(user.getId());
appUserClient.save(evaluateStudent);
// evaluateStudentService.save(evaluateStudent);
@@ -578,7 +579,7 @@
//// insertBackDto.setIds(ids);
// System.out.println("=====insertBackDto========"+insertBackDto);
- courseStuddentClient.changeStatus(id);
+ courseStuddentClient.noStatus(id);
courseStuddentClient.backStausClass(id);
// courseStuddentClient.zeroClass(id);
@@ -697,15 +698,15 @@
List<SelectDto> selectDtos = appUserClient.giftSelect(giftSearchDto);
// 只查询当前用户下 同时也报名了该课程的学员
- for (SelectDto selectDto : selectDtos) {
- // 获取课包id
- TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(giftSearchDto.getId());
-
- Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
- // 学员id 拿到学员id 判断当前学员是否报名了这门课程
- Long id = selectDto.getId();
- //
- }
+// for (SelectDto selectDto : selectDtos) {
+// // 获取课包id
+// TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(giftSearchDto.getId());
+//
+// Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
+// // 学员id 拿到学员id 判断当前学员是否报名了这门课程
+// Long id = selectDto.getId();
+// //
+// }
Map<String,List<SelectDto>> map = new HashMap<>();
map.put("options",selectDtos);
// Map<String,List<SelectDto>> map = new HashMap<>();
--
Gitblit v1.7.1