From 5d31c99eb79f9b71b1199afa65c4073db5d7a030 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Tue, 15 Aug 2023 22:13:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B-?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java  | 2 ++
 .../com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java  | 2 ++
 .../ibeetl/jlw/service/StudentHandsOnTaskReportService.java   | 4 ++++
 .../com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java | 2 ++
 .../ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java   | 3 +++
 .../ibeetl/jlw/service/StudentHandsOnTaskVideoService.java    | 3 +++
 web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md       | 3 +++
 7 files changed, 19 insertions(+)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java
index 9a3c6c44..9bf8f15e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java
@@ -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);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
index de8611fd..406eb5ce 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
@@ -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();
 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
index 17497176..eb4407ab 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
@@ -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);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
index ea0e232b..c5fc37d6 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
@@ -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();
 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
index 99bfaf77..f2be872b 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
@@ -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);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
index c4b9797f..da779a28 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
@@ -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);
diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md
index 8a64f777..85c76c99 100644
--- a/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md
+++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md
@@ -359,6 +359,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(courseType)){
   and t.course_type =#courseType#
   @}
+  @if(!isEmpty(isCourseCentre)){
+  and t.is_course_centre =#isCourseCentre#
+  @}
 
 
 updateTime