Merge remote-tracking branch 'origin/master'

mec-education/src/main/java/com/ym/mec/education/controller/CourseScheduleController.java

@@ -40,7 +40,7 @@ public class CourseScheduleController {
     }
 
     @PostMapping("/info")
-    @ApiOperation("课程计划详情")
+    @ApiOperation("点名详情-头信息")
     public BaseResponse<CourseScheduleResp> getInfo(@RequestBody CourseScheduleReq courseScheduleReq) {
         return courseScheduleService.getInfo(courseScheduleReq);
     }

mec-education/src/main/java/com/ym/mec/education/controller/StudentAttendanceController.java

@@ -35,13 +35,13 @@ public class StudentAttendanceController {
     }
 
     @PostMapping("/listByCourse")
-    @ApiOperation("根据课程计划查询考勤列表")
+    @ApiOperation("点名详情-考勤列表")
     public PageResponse listByCourse(@RequestBody CourseScheduleReq courseScheduleReq) {
         return studentAttendanceService.getPageByCourse(courseScheduleReq);
     }
 
     @PostMapping("/statisticsList")
-    @ApiOperation("根据课程计划查询考勤统计列表")
+    @ApiOperation("历史考勤统计-考勤列表")
     public PageResponse statisticsList(@RequestBody CourseScheduleReq courseScheduleReq) {
         return studentAttendanceService.statisticsList(courseScheduleReq);
     }

mec-education/src/main/java/com/ym/mec/education/resp/CourseScheduleResp.java

@@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,8 +33,7 @@ public class CourseScheduleResp implements Serializable {
     private String teacher;
 
     @ApiModelProperty(value = "最后提交时间")
-    @DateTimeFormat(pattern = "MM-dd HH:mm")
-    private Date lastCommitDate;
+    private String lastCommitDate;
 
     @ApiModelProperty(value = "到课比")
     private String attendanceRate;

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -121,7 +121,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
             List<StudentAttendance> studentAttendanceList = studentAttendanceService.list(studentAttendanceQueryWrapper);
             if (!CollectionUtils.isEmpty(studentAttendanceList)) {
                 studentAttendanceList.stream().findFirst().ifPresent(studentAttendance ->
-                        courseScheduleResp.setLastCommitDate(studentAttendance.getCreateTime()));
+                        courseScheduleResp.setLastCommitDate(DateUtil.date2String(studentAttendance.getCreateTime(), DateUtil.DATE_FORMAT_HOUR)));
             }
             QueryWrapper<StudentAttendance> leaveWrapper = new QueryWrapper<>();
             QueryWrapper<StudentAttendance> normalWrapper = new QueryWrapper<>();

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -161,9 +161,11 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
                         QueryWrapper<MusicGroupStudentFee> musicGroupStudentFeeQueryWrapper = new QueryWrapper<MusicGroupStudentFee>();
                         musicGroupStudentFeeQueryWrapper.lambda().eq(true, MusicGroupStudentFee::getMusicGroupId, classGroup.getMusicGroupId())
                                 .eq(true, MusicGroupStudentFee::getUserId, item.getUserId());
-                        if (Optional.of(musicGroupStudentFeeService.getOne(musicGroupStudentFeeQueryWrapper)).get()
-                                .getContinuousAbsenteeismTimes() > 1) {
-                            resp.setTruant(true);
+                        MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeService.getOne(musicGroupStudentFeeQueryWrapper);
+                        if (Objects.nonNull(musicGroupStudentFee) && Objects.nonNull(musicGroupStudentFee.getContinuousAbsenteeismTimes())) {
+                            if (musicGroupStudentFee.getContinuousAbsenteeismTimes() > 1) {
+                                resp.setTruant(true);
+                            }
                         }
                         //到课天数
                         QueryWrapper<StudentAttendance> normalWrapper = new QueryWrapper<>();

mec-education/src/main/java/com/ym/mec/education/utils/DateUtil.java

@@ -19,14 +19,12 @@ public class DateUtil {
     private static final String DATE_FORMAT_CHINESE = "MM月dd日";
     private static final String TIME_FORMAT = "HH:mm";
     public static final String DATE_FORMAT = "MM-dd";
+    public static final String DATE_FORMAT_HOUR = "MM-dd HH:mm";
     private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>();
 
     public static DateFormat getDateFormat(String dateFormat) {
-        DateFormat df = threadLocal.get();
-        if (df == null) {
-            df = new SimpleDateFormat(dateFormat);
-            threadLocal.set(df);
-        }
+        DateFormat df = new SimpleDateFormat(dateFormat);
+        threadLocal.set(df);
         return df;
     }