From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 3ba94f2..1806a5f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -247,7 +247,7 @@
}
List<StuListVo> stuListVos = new ArrayList<>();
List<TStudent> tStudents = istuService.list(new QueryWrapper<TStudent>()
- .eq("appUserId",userIdFormRedis));
+ .eq("appUserId",userIdFormRedis).eq("state",1));
if (tStudents.size() > 0){
tStudents.forEach(sts -> {
StuListVo vo = new StuListVo();
@@ -263,6 +263,7 @@
vo.setStuWeight(sts.getWeight());
vo.setIsNot(sts.getIsDefault());
vo.setStuPhone(sts.getPhone());
+ vo.setSex(sts.getSex());
stuListVos.add(vo);
});
}
@@ -341,13 +342,27 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil commitEditStu(StuEditInfoReq stu){
+ public ResultUtil commitEditStu(StuDetailsReq stu){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(istuService.commitEditStudentInfo(stu,userIdFormRedis));
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+ TStudent tStudent = new TStudent();
+ tStudent.setId(stu.getStuId());
+ tStudent.setBirthday(format.parse(stu.getBirthday()));
+ tStudent.setHeadImg(stu.getHeadImg());
+ tStudent.setHeight(stu.getHeight());
+ tStudent.setWeight(stu.getWeight());
+ tStudent.setPhone(stu.getPhone());
+ tStudent.setSex(stu.getSex());
+ tStudent.setName(stu.getName());
+ tStudent.setIdCard(stu.getIdCard());
+ return ResultUtil.success(istuService.updateById(tStudent));
+
+// return ResultUtil.success(istuService.commitEditStudentInfo(stu,userIdFormRedis));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -546,6 +561,9 @@
})
public ResultUtil<List<StuMedalVo>> queryStuMedal( Integer stuId){
try {
+
+
+
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
@@ -592,16 +610,16 @@
@ApiImplicitParam(value = "时间类型 0=全部 1=近一周 2=近一个月 3=近一年", name = "timeType", required = false, dataType = "int"),
@ApiImplicitParam(value = "课程名称", name = "appointStatus", required = false, dataType = "string"),
})
- public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search){
- try {
+ public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search,Integer pageNum){
+// try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search,pageNum));
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1