修复问题

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java

@@ -351,7 +351,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery = new StudentHandsOnTaskVideoQuery();
                 studentHandsOnTaskVideoQuery.setStudentId(student.getStudentId());
                 List<StudentHandsOnTaskVideo> valuesByQuery = studentHandsOnTaskVideoService.getValuesByQuery(studentHandsOnTaskVideoQuery);
-                double sum = valuesByQuery.stream().mapToDouble(v -> v.getVideoScore().doubleValue()).sum();
+                double sum = valuesByQuery.stream().mapToDouble(v -> v.getVideoScore() == null ? 0 : v.getVideoScore().doubleValue()).sum();
                 student.set("sumScore", sum);
             }
         }
@@ -360,7 +360,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery = new StudentHandsOnTaskPptQuery();
                 studentHandsOnTaskPptQuery.setStudentId(student.getStudentId());
                 List<StudentHandsOnTaskPpt> valuesByQuery = studentHandsOnTaskPptService.getValuesByQuery(studentHandsOnTaskPptQuery);
-                double sum = valuesByQuery.stream().mapToDouble(v -> v.getPptScore().doubleValue()).sum();
+                double sum = valuesByQuery.stream().mapToDouble(v -> v.getPptScore() == null ? 0 :v.getPptScore().doubleValue()).sum();
                 student.set("sumScore", sum);
             }
         }
@@ -369,7 +369,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 StudentHandsOnTaskTheoryQuery studentHandsOnTaskTheoryQuery = new StudentHandsOnTaskTheoryQuery();
                 studentHandsOnTaskTheoryQuery.setStudentId(student.getStudentId());
                 List<StudentHandsOnTaskTheory> valuesByQuery = studentHandsOnTaskTheoryService.getValuesByQuery(studentHandsOnTaskTheoryQuery);
-                double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore().doubleValue()).sum();
+                double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 :v.getTheoryScore().doubleValue()).sum();
                 student.set("sumScore", sum);
             }
         }
@@ -378,7 +378,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery = new StudentHandsOnTaskStepQuery();
                 studentHandsOnTaskStepQuery.setStudentId(student.getStudentId());
                 List<StudentHandsOnTaskStep> valuesByQuery = studentHandsOnTaskStepService.getValuesByQuery(studentHandsOnTaskStepQuery);
-                double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore().doubleValue()).sum();
+                double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 :v.getTheoryScore().doubleValue()).sum();
                 student.set("sumScore", sum);
             }
         }
@@ -387,7 +387,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery = new StudentHandsOnTaskReportQuery();
                 studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
                 List<StudentHandsOnTaskReport> valuesByQuery = studentHandsOnTaskReportService.getValuesByQuery(studentHandsOnTaskReportQuery);
-                double sum = valuesByQuery.stream().mapToDouble(v -> v.getReportScore().doubleValue()).sum();
+                double sum = valuesByQuery.stream().mapToDouble(v -> v.getReportScore() == null ? 0 :v.getReportScore().doubleValue()).sum();
                 student.set("sumScore", sum);
             }
         }

web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java

@@ -65,6 +65,24 @@ public class StudentHandsOnTaskReportQuery extends PageParam {
     private String handsOnTaskIdPlural;
     private String orgIdPlural;
     private String userIdPlural;
+    private String teacherIdPlural;
+    private String studentIdPlural;
+
+    public String getTeacherIdPlural() {
+        return teacherIdPlural;
+    }
+
+    public void setTeacherIdPlural(String teacherIdPlural) {
+        this.teacherIdPlural = teacherIdPlural;
+    }
+
+    public String getStudentIdPlural() {
+        return studentIdPlural;
+    }
+
+    public void setStudentIdPlural(String studentIdPlural) {
+        this.studentIdPlural = studentIdPlural;
+    }
 
     private String studentHandsOnTaskReportJsonStr;//json格式
 

web/src/main/resources/sql/jlw/handsOnAchievement.md

@@ -52,15 +52,6 @@ queryByCondition
   @if(!isEmpty(totalScore)){
   and t.total_score =#totalScore#
   @}
-  @if(isEmpty(handOnAchievementStatus) && isEmpty(handOnAchievementStatusPlural)){
-  and t.hand_on_achievement_status != 2
-  @}else{
-  @if(!isEmpty(handOnAchievementStatus)){
-  and t.hand_on_achievement_status =#handOnAchievementStatus#
-  @}else if(!isEmpty(handOnAchievementStatusPlural)){
-  and find_in_set(t.hand_on_achievement_status,#handOnAchievementStatusPlural#)
-  @}
-  @}
   @if(!isEmpty(addTime)){
   and t.add_time =#addTime#
   @}
@@ -441,9 +432,9 @@ getExcelValues
   MAX(LENGTH(t.report_writing_score)) report_writing_score,
   MAX(LENGTH(t.total_score)) total_score,
   MAX(LENGTH(t.hand_on_achievement_status)) hand_on_achievement_status,
-  MAX(LENGTH(t.add_time)) add_time,
+  MAX(LENGTH(t.add_time)) add_time
   from hands_on_achievement t
-  where 1=1 and #function("handsOnAchievement.query")#
+  where 1=1
   @if(!isEmpty(handOnAchievementId)){
   and t.hand_on_achievement_id =#handOnAchievementId#
   @}
@@ -486,15 +477,6 @@ getExcelValues
   @if(!isEmpty(totalScore)){
   and t.total_score =#totalScore#
   @}
-  @if(isEmpty(handOnAchievementStatus) && isEmpty(handOnAchievementStatusPlural)){
-  and t.hand_on_achievement_status != 2
-  @}else{
-  @if(!isEmpty(handOnAchievementStatus)){
-  and t.hand_on_achievement_status =#handOnAchievementStatus#
-  @}else if(!isEmpty(handOnAchievementStatusPlural)){
-  and find_in_set(t.hand_on_achievement_status,#handOnAchievementStatusPlural#)
-  @}
-  @}
   @if(!isEmpty(addTime)){
   and t.add_time =#addTime#
   @}
@@ -524,9 +506,9 @@ getExcelValues
   t.report_writing_score ,
   t.total_score ,
   t.hand_on_achievement_status ,
-  t.add_time ,
+  t.add_time
   from hands_on_achievement t
-  where 1=1 and #function("handsOnAchievement.query")#  
+  where 1=1
   @if(!isEmpty(handOnAchievementId)){
   and t.hand_on_achievement_id =#handOnAchievementId#
   @}
@@ -569,15 +551,6 @@ getExcelValues
   @if(!isEmpty(totalScore)){
   and t.total_score =#totalScore#
   @}
-  @if(isEmpty(handOnAchievementStatus) && isEmpty(handOnAchievementStatusPlural)){
-  and t.hand_on_achievement_status != 2
-  @}else{
-  @if(!isEmpty(handOnAchievementStatus)){
-  and t.hand_on_achievement_status =#handOnAchievementStatus#
-  @}else if(!isEmpty(handOnAchievementStatusPlural)){
-  and find_in_set(t.hand_on_achievement_status,#handOnAchievementStatusPlural#)
-  @}
-  @}
   @if(!isEmpty(addTime)){
   and t.add_time =#addTime#
   @}

web/src/main/resources/sql/jlw/studentHandsOnTaskStep.md

@@ -483,18 +483,6 @@ getExcelValues
   @if(!isEmpty(stem)){
   and t.stem =#stem#
   @}
-  @if(!isEmpty(questionType)){
-  and t.question_type =#questionType#
-  @}
-  @if(!isEmpty(myOptions)){
-  and t.my_options =#myOptions#
-  @}
-  @if(!isEmpty(rightKey)){
-  and t.right_key =#rightKey#
-  @}
-  @if(!isEmpty(theoryStatus)){
-  and t.theory_status =#theoryStatus#
-  @}
   @if(!isEmpty(theoryScore)){
   and t.theory_score =#theoryScore#
   @}
@@ -570,18 +558,6 @@ getExcelValues
   @if(!isEmpty(stem)){
   and t.stem =#stem#
   @}
-  @if(!isEmpty(questionType)){
-  and t.question_type =#questionType#
-  @}
-  @if(!isEmpty(myOptions)){
-  and t.my_options =#myOptions#
-  @}
-  @if(!isEmpty(rightKey)){
-  and t.right_key =#rightKey#
-  @}
-  @if(!isEmpty(theoryStatus)){
-  and t.theory_status =#theoryStatus#
-  @}
   @if(!isEmpty(theoryScore)){
   and t.theory_score =#theoryScore#
   @}