1、修复bug

beetlsql3-dev
wgf 2 years ago
parent 730011e1cc
commit 521869585e

@ -99,6 +99,9 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
private Date teacherOpenCourseStudentSigninSettingEndTime ; private Date teacherOpenCourseStudentSigninSettingEndTime ;
// 学生签到时间
private Date teacherOpenCourseStudentSigninSettingSigninTime ;
@DictEnum @DictEnum
//开始状态 //开始状态
@ -404,4 +407,12 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
public void setTeacherOpenCourseIdText(String teacherOpenCourseIdText) { public void setTeacherOpenCourseIdText(String teacherOpenCourseIdText) {
this.teacherOpenCourseIdText = teacherOpenCourseIdText; this.teacherOpenCourseIdText = teacherOpenCourseIdText;
} }
public Date getTeacherOpenCourseStudentSigninSettingSigninTime() {
return teacherOpenCourseStudentSigninSettingSigninTime;
}
public void setTeacherOpenCourseStudentSigninSettingSigninTime(Date teacherOpenCourseStudentSigninSettingSigninTime) {
this.teacherOpenCourseStudentSigninSettingSigninTime = teacherOpenCourseStudentSigninSettingSigninTime;
}
} }

@ -365,10 +365,14 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
if (ObjectUtil.isNotNull(single)){ if (ObjectUtil.isNotNull(single)){
single.setTeacherOpenCourseStudentSigninLogRemark(null); single.setTeacherOpenCourseStudentSigninLogRemark(null);
single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN); single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
single.setTeacherOpenCourseStudentSigninLogAddTime(new Date()); single.setTeacherOpenCourseStudentSigninLogAddTime(time);
single.setTeacherOpenCourseStudentSigninLogIp(myIpAddress); single.setTeacherOpenCourseStudentSigninLogIp(myIpAddress);
teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single); teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
}else { }else {
TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(time);
teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
// 学生签到记录添加 // 学生签到记录添加
add(signinLogQuery); add(signinLogQuery);
} }
@ -410,6 +414,10 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
signinLogQuery.setTeacherOpenCourseStudentSigninLogRemark(signinDTO.getTeacherOpenCourseStudentSigninLogRemark()); signinLogQuery.setTeacherOpenCourseStudentSigninLogRemark(signinDTO.getTeacherOpenCourseStudentSigninLogRemark());
} }
// 学生签到记录添加 // 学生签到记录添加
TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(new Date());
teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
add(signinLogQuery); add(signinLogQuery);
} }
@ -473,9 +481,13 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
if (ObjectUtil.isNotNull(single)){ if (ObjectUtil.isNotNull(single)){
single.setTeacherOpenCourseStudentSigninLogRemark(null); single.setTeacherOpenCourseStudentSigninLogRemark(null);
single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN); single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
single.setTeacherOpenCourseStudentSigninLogAddTime(new Date()); single.setTeacherOpenCourseStudentSigninLogAddTime(time);
teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single); teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
}else { }else {
TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(time);
teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
// 学生签到记录添加 // 学生签到记录添加
add(signinLogQuery); add(signinLogQuery);
} }

@ -55,6 +55,9 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
@Query(name = "签到结束日期", display = false) @Query(name = "签到结束日期", display = false)
private Date teacherOpenCourseStudentSigninSettingEndTime; private Date teacherOpenCourseStudentSigninSettingEndTime;
@Query(name = "学生签到时间", display = false)
private Date teacherOpenCourseStudentSigninSettingSigninTime ;
@Query(name = "创建时间", display = false) @Query(name = "创建时间", display = false)
private Date teacherOpenCourseStudentSigninSettingAddTime; private Date teacherOpenCourseStudentSigninSettingAddTime;
@ -105,6 +108,7 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
pojo.setTeacherOpenCourseStudentSigninSettingAddTime(this.getTeacherOpenCourseStudentSigninSettingAddTime()); pojo.setTeacherOpenCourseStudentSigninSettingAddTime(this.getTeacherOpenCourseStudentSigninSettingAddTime());
pojo.setTeacherOpenCourseStudentSigninSettingStatus(this.getTeacherOpenCourseStudentSigninSettingStatus()); pojo.setTeacherOpenCourseStudentSigninSettingStatus(this.getTeacherOpenCourseStudentSigninSettingStatus());
pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(this.getTeacherOpenCourseStudentSigninSettingSessionTime()); pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(this.getTeacherOpenCourseStudentSigninSettingSessionTime());
pojo.setTeacherOpenCourseStudentSigninSettingSigninTime(this.getTeacherOpenCourseStudentSigninSettingSigninTime());
pojo.setOrgId(this.getOrgId()); pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId()); pojo.setUserId(this.getUserId());
return pojo; return pojo;

Loading…
Cancel
Save