1、我的课程-实操-理论

web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskTheory.java

@@ -88,6 +88,11 @@ public class StudentHandsOnTaskTheory extends BaseEntity{
      */
     private Integer isCourseCentre;
 
+    /**
+     * 资源id
+     */
+    private Long resourcesQuestionId;
+
     public StudentHandsOnTaskTheory(){
     }
 
@@ -301,4 +306,12 @@ public class StudentHandsOnTaskTheory extends BaseEntity{
     public void setIsCourseCentre(Integer isCourseCentre) {
         this.isCourseCentre = isCourseCentre;
     }
+
+    public Long getResourcesQuestionId() {
+        return resourcesQuestionId;
+    }
+
+    public void setResourcesQuestionId(Long resourcesQuestionId) {
+        this.resourcesQuestionId = resourcesQuestionId;
+    }
 }

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

@@ -420,7 +420,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         }
         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : resourcesQuestions) {
             if (CollectionUtils.isNotEmpty(theoryList)) {
-                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
+                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getResourcesQuestionId(),resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
                         .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                 if (taskTheory == null) {
                     resourcesQuestion.set("myOptions", "");
@@ -501,7 +501,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         }
         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : resourcesQuestions) {
             if (CollectionUtils.isNotEmpty(theoryList)) {
-                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
+                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v ->ObjectUtil.equals(v.getResourcesQuestionId(),resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
                         .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                 if (taskTheory == null) {
                     resourcesQuestion.set("myOptions", "");
@@ -582,7 +582,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         }
         for (ResourcesQuestion resourcesQuestion : resourcesQuestions) {
             if (CollectionUtils.isNotEmpty(theoryList)) {
-                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getResourcesQuestionId()))
+                StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getResourcesQuestionId(), resourcesQuestion.getResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getResourcesQuestionId()))
                         .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                 if (taskTheory == null) {
                     resourcesQuestion.set("myOptions", "");
@@ -666,7 +666,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
                     if (CollectionUtils.isNotEmpty(resourcesQuestions)) {
                         for (ResourcesQuestion resourcesQuestion : resourcesQuestions) {
 
-                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getResourcesQuestionId()))
+                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getResourcesQuestionId(),resourcesQuestion.getResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getResourcesQuestionId()))
                                     .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                             if (taskTheory == null) {
                                 resourcesQuestion.set("myOptions", "");
@@ -711,7 +711,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
                     if (CollectionUtils.isNotEmpty(resourcesQuestions)) {
                         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : resourcesQuestions) {
 
-                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
+                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getOrgId(),resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
                                     .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                             if (taskTheory == null) {
                                 resourcesQuestion.set("myOptions", "");
@@ -887,7 +887,9 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
             taskTheory.setCreateTime(new Date());
             taskTheory.setStudentId(student.getStudentId());
             taskTheory.setUserId(coreUser.getId());
-            taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
+//            taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
+            taskTheory.setOrgId(coreUser.getOrgId());
+            taskTheory.setResourcesQuestionId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
             taskTheoryList.add(taskTheory);
         }
 
@@ -1033,7 +1035,9 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
             taskTheory.setCreateTime(new Date());
             taskTheory.setStudentId(student.getStudentId());
             taskTheory.setUserId(coreUser.getId());
-            taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
+//            taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
+            taskTheory.setOrgId(coreUser.getOrgId());
+            taskTheory.setResourcesQuestionId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
             taskTheoryList.add(taskTheory);
         }
 
@@ -1135,6 +1139,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
             //根据实操id 获取课程id
             List<HandsOn> handsOns = ObjectUtil.isEmpty(handsOnSimulationTasks.getHandsOnId()) ? new ArrayList<>() : handsOnDao.getByIds(handsOnSimulationTasks.getHandsOnId().toString());
             StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory();
+            taskTheory.setResourcesQuestionId(resourcesQuestion.getResourcesQuestionId());
             taskTheory.setCourseType(courseType);
             taskTheory.setTeacherOpenCourseId(CollectionUtils.isEmpty(handsOns) ? null : handsOns.get(0).getCourseInfoId());
             taskTheory.setHandsOnId(handsOnSimulationTasks.getHandsOnId());

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

@@ -91,6 +91,11 @@ public class StudentHandsOnTaskTheoryQuery extends PageParam {
      */
     private Integer isCourseCentre;
 
+    /**
+     * 资源id
+     */
+    private Long resourcesQuestionId;
+
     public Long getStudentHandsOnTaskTheoryId(){
         return  studentHandsOnTaskTheoryId;
     }
@@ -201,6 +206,7 @@ public class StudentHandsOnTaskTheoryQuery extends PageParam {
         pojo.setStudentId(this.getStudentId());
         pojo.setCourseType(this.getCourseType());
         pojo.setIsCourseCentre(this.getIsCourseCentre());
+        pojo.setResourcesQuestionId(this.getResourcesQuestionId());
         return pojo;
     }
 
@@ -280,4 +286,12 @@ public class StudentHandsOnTaskTheoryQuery extends PageParam {
     public void setIsCourseCentre(Integer isCourseCentre) {
         this.isCourseCentre = isCourseCentre;
     }
+
+    public Long getResourcesQuestionId() {
+        return resourcesQuestionId;
+    }
+
+    public void setResourcesQuestionId(Long resourcesQuestionId) {
+        this.resourcesQuestionId = resourcesQuestionId;
+    }
 }