tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、我的课程-实操

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 3de6ef42fa
commit 5d31c99eb7
7 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java
Unescape Escape View File

@ -169,6 +169,7 @@ public class StudentHandsOnTaskLogService extends CoreBaseService<StudentHandsOn
Student student = studentService.getByUserId(coreUser.getId());
studentHandsOnTaskLogQuery.setStudentId(student.getStudentId());
studentHandsOnTaskLogQuery.setIsCourseCentre(1);
studentHandsOnTaskLogQuery.setCourseType(1);
String msg = "";
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogQuery.pojo();
Long studentId = studentHandsOnTaskLog.getStudentId();
@ -190,6 +191,7 @@ public class StudentHandsOnTaskLogService extends CoreBaseService<StudentHandsOn
logQuery.setStudentId(studentId);
logQuery.setHandsOnTaskId(handsOnTaskId);
logQuery.setIsCourseCentre(1);
logQuery.setCourseType(1);
List<StudentHandsOnTaskLog> valuesByQueryNotWithPermission = getValuesByQueryNotWithPermission(logQuery);
if (CollectionUtil.isNotEmpty(valuesByQueryNotWithPermission)) {
studentHandsOnTaskLog = valuesByQueryNotWithPermission.get(0);

2
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
Unescape Escape View File

@ -158,6 +158,7 @@ public class StudentHandsOnTaskPptService extends CoreBaseService<StudentHandsOn
studentHandsOnTaskPptQuery.setStudentSn(student.getStudentSn());
studentHandsOnTaskPptQuery.setStudentName(student.getStudentName());
studentHandsOnTaskPptQuery.setIsCourseCentre(1);
studentHandsOnTaskPptQuery.setCourseType(1);
String msg = "";
StudentHandsOnTaskPpt studentHandsOnTaskPpt = studentHandsOnTaskPptQuery.pojo();
String pptFile = studentHandsOnTaskPpt.getPptFile();
@ -208,6 +209,7 @@ public class StudentHandsOnTaskPptService extends CoreBaseService<StudentHandsOn
.classId(student.getClassId())
.pptScore(BigDecimal.valueOf(i).toPlainString())
.isCourseCentre(1)
.courseType(1)
.orgId(student.getOrgId())
.userId(student.getUserId()).build();

4
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
Unescape Escape View File

@ -280,6 +280,8 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
if (studentHandsOnTaskReportQuery.getHandsOnTaskId() == null) {
return null;
}
studentHandsOnTaskReportQuery.setCourseType(1);
studentHandsOnTaskReportQuery.setIsCourseCentre(1);
StudentHandsOnTaskReport studentHandsOnTaskReport = studentHandsOnTaskReportQuery.pojo();
if (coreUser.isTeacher()) {
@ -296,6 +298,8 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
.studentId(student.getStudentId())
.classId(student.getClassId())
.reportWritingScore(ObjectUtil.defaultIfNull(studentHandsOnTaskReport.getReportScore(),BigDecimal.ZERO).toPlainString())
.courseType(1)
.isCourseCentre(1)
.orgId(student.getOrgId())
.userId(student.getUserId()).build();
handsOnAchievementService.setHandsOnAchievement(build, HandsOnTaskEnum.TASK_REPORT_WRITING);

2
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
Unescape Escape View File

@ -150,6 +150,7 @@ public class StudentHandsOnTaskStepService extends CoreBaseService<StudentHandsO
Student student = studentService.getByUserId(coreUser.getId());
studentHandsOnTaskStepQuery.setStudentId(student.getStudentId());
studentHandsOnTaskStepQuery.setIsCourseCentre(1);
studentHandsOnTaskStepQuery.setCourseType(1);
String msg = "";
StudentHandsOnTaskStep studentHandsOnTaskStep = studentHandsOnTaskStepQuery.pojo();
String stem = studentHandsOnTaskStep.getStem();
@ -207,6 +208,7 @@ public class StudentHandsOnTaskStepService extends CoreBaseService<StudentHandsO
.classId(student.getClassId())
.practicalTrainingScore(initScore.toPlainString())
.isCourseCentre(1)
.courseType(1)
.orgId(student.getOrgId())
.userId(student.getUserId()).build();

3
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
Unescape Escape View File

@ -817,6 +817,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
List<StudentHandsOnTaskTheory> theoryList = this.sqlManager.lambdaQuery(StudentHandsOnTaskTheory.class)
.andEq(StudentHandsOnTaskTheory::getHandsOnTaskId, taskId)
.andEq(StudentHandsOnTaskTheory::getIsCourseCentre,1)
.andEq(StudentHandsOnTaskTheory::getCourseType,1)
.andEq(StudentHandsOnTaskTheory::getStudentId, student.getStudentId()).select();
if (CollectionUtils.isNotEmpty(theoryList)) {
return JsonResult.fail("已提交,重复提交");
@ -883,6 +884,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
}
taskTheory.setCourseType(1);
taskTheory.setIsCourseCentre(1);
taskTheory.setCreateTime(new Date());
taskTheory.setStudentId(student.getStudentId());
@ -907,6 +909,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
.classId(student.getClassId())
.theoryScore(totalScore.toPlainString())
.isCourseCentre(1)
.courseType(1)
.orgId(student.getOrgId())
.userId(student.getUserId()).build();
handsOnAchievementService.setHandsOnAchievement(build, HandsOnTaskEnum.TASK_THEORY);

3
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
Unescape Escape View File

@ -159,6 +159,7 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
Student student = studentService.getByUserId(coreUser.getId());
studentHandsOnTaskVideoQuery.setStudentId(student.getStudentId());
studentHandsOnTaskVideoQuery.setIsCourseCentre(1);
studentHandsOnTaskVideoQuery.setCourseType(1);
String msg = "";
StudentHandsOnTaskVideo studentHandsOnTaskVideo = studentHandsOnTaskVideoQuery.pojo();
String videoFile = studentHandsOnTaskVideo.getVideoFile();
@ -177,6 +178,7 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
//视频成绩 修改为查询观看日志
List<StudentHandsOnTaskLog> selectLog = studentHandsOnTaskLogService.createLambdaQuery()
.andEq(StudentHandsOnTaskLog::getHandsOnTaskId, studentHandsOnTaskVideo.getHandsOnTaskId())
.andEq(StudentHandsOnTaskLog::getCourseType,1)
.andEq(StudentHandsOnTaskLog::getIsCourseCentre,1)
.andEq(StudentHandsOnTaskLog::getStudentId, student.getStudentId()).select();
if (CollectionUtil.isNotEmpty(selectLog)) {
@ -206,6 +208,7 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
.classId(student.getClassId())
.videoScore(BigDecimal.valueOf(i).toPlainString())
.isCourseCentre(1)
.courseType(1)
.orgId(student.getOrgId())
.userId(student.getUserId()).build();
handsOnAchievementService.setHandsOnAchievement(build, HandsOnTaskEnum.TASK_VIDEO);

3
web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md
Unescape Escape View File

@ -359,6 +359,9 @@ getValuesByQueryNotWithPermission
@if(!isEmpty(courseType)){
and t.course_type =#courseType#
@}
@if(!isEmpty(isCourseCentre)){
and t.is_course_centre =#isCourseCentre#
@}
updateTime

Write Preview
Loading…
Cancel
Save