1、课程中心-实操-理论

web/src/main/java/com/ibeetl/jlw/dao/HandsOnAchievementDao.java

@@ -29,7 +29,7 @@ public interface HandsOnAchievementDao extends BaseMapper<HandsOnAchievement>{
     List<HandsOnAchievement> getByIds(String ids);
     List<HandsOnAchievement> getValuesByQuery(HandsOnAchievementQuery handsOnAchievementQuery);
 
-    List<HandsOnAchievement> getListByhandIdsAndClassId(List<Long> handIds, Long classId);
+    List<HandsOnAchievement> getListByhandIdsAndClassId(List<Long> handIds, Long classId,Integer isCourseCentre);
 
     List<Map<String, Object>> getExcelValues(HandsOnAchievementQuery handsOnAchievementQuery);
 }

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

@@ -245,7 +245,7 @@ public class HandsOnAchievementService extends CoreBaseService<HandsOnAchievemen
     }
 
     public List<HandsOnAchievement> getListByhandIdsAndClassId(List<Long> handIds, Long classId) {
-        return handsOnAchievementDao.getListByhandIdsAndClassId(handIds, classId);
+        return handsOnAchievementDao.getListByhandIdsAndClassId(handIds, classId,1);
     }
 
     public List<Map<String, Object>> getExcelValues(HandsOnAchievementQuery handsOnAchievementQuery) {

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

@@ -711,7 +711,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
                     if (CollectionUtils.isNotEmpty(resourcesQuestions)) {
                         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : resourcesQuestions) {
 
-                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getOrgId(),resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()) || v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
+                            StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> ObjectUtil.equals(v.getResourcesQuestionId(),resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()) || 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", "");

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java

@@ -845,7 +845,11 @@ public class TeacherOpenCourseHandsOnController{
         if (teacherOpenCourseId == null) {
             return JsonResult.fail();
         }
-        return teacherOpenCourseHandsOnService.getCourseCentreHandsListByOpenCourseIdAndStudent(teacherOpenCourseId, coreUser);
+        if (coreUser.isTeacher()){
+            return teacherOpenCourseHandsOnService.getHandsListCenterByOpenCourseId(teacherOpenCourseId, coreUser);
+        }else {
+            return teacherOpenCourseHandsOnService.getCourseCentreHandsListByOpenCourseIdAndStudent(teacherOpenCourseId, coreUser);
+        }
     }
 
     /**

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

@@ -420,6 +420,9 @@ getListByhandIdsAndClassId
   @if(!isEmpty(classId)){
   and t.class_id =#classId#
   @}
+  @if(!isEmpty(isCourseCentre)){
+  and t.is_course_centre =#isCourseCentre#
+  @}
 
 getExcelValues
 ===