Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -2,6 +2,7 @@ package com.ibeetl.jlw.dao;
 
 import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn;
 import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnList;
+import com.ibeetl.jlw.web.query.GetHandsOnListParam;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnQuery;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.mapper.BaseMapper;
@@ -33,4 +34,5 @@ public interface TeacherOpenCourseHandsOnDao extends BaseMapper<TeacherOpenCours
 
     List<Map<String, Object>> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery);
 
+    List<TeacherOpenCourseHandsOnList> getHandsOnListNotPage(GetHandsOnListParam getHandsOnListParam);
 }

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

@@ -81,4 +81,6 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper<TeacherO
                 .count();
         return toIntExact(count);
     }
+
+    List<TeacherOpenCourseQuestionSetting> queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition);
 }

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

@@ -58,7 +58,8 @@ public class GeneralQuestionLogScoreInfo1 extends BaseEntity {
             "where ta.question_setting_id = #generalQuestionSettingId# " +
             "and ta.question_log_summary_status = 1 " +
             "and ta.person_id = #studentId# " +
-            ")) "
+            ")) " +
+            "AND t.student_id = #studentId#"
     )
     private List<TeacherOpenCourseQuestionLog> questionLogList;
 }

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

@@ -1,5 +1,7 @@
 package com.ibeetl.jlw.entity;
 
+import com.ibeetl.admin.core.entity.BaseEntity;
+
 /**
  * 类功能说明
  *
@@ -7,7 +9,7 @@ package com.ibeetl.jlw.entity;
  * @Author 许良彤
  * @Date 2022/10/29 20:47
  */
-public class TeacherOpenCourseHandsOnList {
+public class TeacherOpenCourseHandsOnList extends BaseEntity {
 
     /**
      * 项目名称

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

@@ -8,10 +8,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.util.enums.DelFlagEnum;
 import com.ibeetl.jlw.dao.*;
 import com.ibeetl.jlw.entity.*;
-import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
+import com.ibeetl.jlw.enums.*;
-import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
-import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
-import com.ibeetl.jlw.enums.SignInTypeEnum;
 import com.ibeetl.jlw.web.query.*;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.query.LambdaQuery;
@@ -28,48 +25,79 @@ import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.HOMEWOR
 
 /**
  * 统计分析service
+ *
  * @Version 0.0.1
  * @Author 许良彤
  * @Date 2022/10/7 12:25
- *
  */
 @Service
 public class StatisticalAnalysisService {
 
-    @Autowired private StatisticalAnalysisDao statisticalAnalysisDao;
+
-    @Autowired private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService;
+    @Autowired
-    @Autowired private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService;
+    private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService;
-    @Autowired private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService;
+    @Autowired
-    @Autowired private StudentService studentService;
+    private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService;
-    @Autowired private TeacherService teacherService;
+    @Autowired
-    @Autowired private CourseInfoService courseInfoService;
+    private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService;
-    @Autowired private ResourcesApplicationService resourcesApplicationService;
+    @Autowired
-    @Autowired private UniversitiesCollegesDao universitiesCollegesDao;
+    private StudentService studentService;
-    @Autowired private SysLogDao sysLogDao;
+    @Autowired
-    @Autowired private UniversitiesCollegesService universitiesCollegesService;
+    private TeacherService teacherService;
-    @Autowired private CoreUserDao coreUserDao;
+
-    @Autowired private ResourcesTrainingDao resourcesTrainingService;
+    @Autowired
-    @Autowired private ResourcesInfoService resourcesInfoService;
+    private ResourcesApplicationService resourcesApplicationService;
-    @Autowired private ResourcesQuestionService resourcesQuestionService;
+    @Autowired
-    @Autowired private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService;
+    private UniversitiesCollegesDao universitiesCollegesDao;
-    @Autowired private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
+    @Autowired
-    @Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
+    private SysLogDao sysLogDao;
-    @Autowired private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
+    @Autowired
-    @Autowired private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService;
+    private UniversitiesCollegesService universitiesCollegesService;
-    @Autowired private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService;
+    @Autowired
-    @Autowired private HandsOnAchievementService handsOnAchievementService;
+    private CoreUserDao coreUserDao;
-    @Autowired private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService;
+    @Autowired
-    @Autowired private TeacherOpenCourseDao teacherOpenCourseService;
+    private ResourcesTrainingDao resourcesTrainingService;
-    @Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
+    @Autowired
-    @Autowired private HandsOnDao handsOnService;
+    private ResourcesInfoService resourcesInfoService;
-    @Autowired private ResourcesCompetitionDao resourcesCompetitionService;
+    @Autowired
-    @Autowired private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao;
+    private ResourcesQuestionService resourcesQuestionService;
-    @Autowired private QuestionLogSummaryDao questionLogSummaryDao;
+    @Autowired
-    @Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
+    private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService;
-    @Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
+    @Autowired
-    @Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
+    private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
-    @Autowired private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao;
+    @Autowired
-    @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
+    private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
+    @Autowired
+    private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
+    @Autowired
+    private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService;
+    @Autowired
+    private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService;
+    @Autowired
+    private HandsOnAchievementService handsOnAchievementService;
+    @Autowired
+    private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService;
+    @Autowired
+    private TeacherOpenCourseDao teacherOpenCourseService;
+    @Autowired
+    private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
+    @Autowired
+    private HandsOnDao handsOnService;
+    @Autowired
+    private ResourcesCompetitionDao resourcesCompetitionService;
+    @Autowired
+    private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao;
+
+    @Autowired
+    private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao;
+    @Autowired
+    private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
+
+    @Autowired
+    private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
+
+    @Autowired
+    private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
 
 
     private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)";
@@ -77,6 +105,7 @@ public class StatisticalAnalysisService {
 
     /**
      * 统计分析
+     *
      * @param
      */
     public Map<String, Object> detail(Long teacherOpenCourseId, Date stime, Date etime) {
@@ -232,6 +261,7 @@ public class StatisticalAnalysisService {
 
     /**
      * 首页
+     *
      * @param
      * @return
      */
@@ -261,24 +291,37 @@ public class StatisticalAnalysisService {
         List<TeacherOpenCourseMergeStudent> studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(studentQuery);
         data.put("studentNum", studentList.size());
         //课件
+        TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
+        teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        teacherOpenCourseMergeResourcesInfoQuery.setResourcesInfoStatus(GlobalUpStatusEnum.UP);
+        List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList = teacherOpenCourseMergeResourcesInfoService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery);
+        data.put("coursewareNum", resourcesInfoList.size());
+
         TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
         courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         courseInfoQuery.setCourseInfoStatus(1);
         List<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery);
-        data.put("coursewareNum", courseInfos.size());
         //视频
         List<TeacherOpenCourseMergeCourseInfo> videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList());
         data.put("videoNum", videoCount.size());
+
         //题目
         //习题总数
+
+        TeacherOpenCourseMergeResourcesQuestionQuery teacherOpenCourseMergeResourcesQuestionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
+        teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        teacherOpenCourseMergeResourcesQuestionQuery.setQuestionStatus(1);
+        List<TeacherOpenCourseMergeResourcesQuestion> questionList = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesQuestionQuery);
+        data.put("subjectNum", questionList.size());
+
+
         TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
-
         List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
-        List<TeacherOpenCourseQuestionSettingPure> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList());
+        //List<TeacherOpenCourseQuestionSettingPure> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList());
-        data.put("subjectNum", collect1.size());
+
         //案例
         TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery();
         teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId);

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

@@ -208,7 +208,16 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
 
     public PageQuery<TeacherOpenCourseHandsOnList> getHandsOnList(GetHandsOnListParam param) {
         PageQuery<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery());
-        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList();
+        handsOnListHandler(teacherOpenCourseHandsOns.getList(),param);
+        return teacherOpenCourseHandsOns;
+    }
+    public List<TeacherOpenCourseHandsOnList> getHandsOnListNotPage(GetHandsOnListParam param) {
+        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnListNotPage(param);
+        handsOnListHandler(teacherOpenCourseHandsOns,param);
+        return teacherOpenCourseHandsOns;
+    }
+
+    private void handsOnListHandler(List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists,GetHandsOnListParam param){
         List<Long> handIds = teacherOpenCourseHandsOnLists.stream().map(TeacherOpenCourseHandsOnList::getHandsOnId).collect(Collectors.toList());
         List<HandsOnAchievement> achievementList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(handIds)) {
@@ -227,10 +236,10 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             teacherOpenCourseHandsOnList.setStepAvgScore(stepAvgScore);
             teacherOpenCourseHandsOnList.setReportAvgScore(reportAvgScore);
         }
-        teacherOpenCourseHandsOns.setList(teacherOpenCourseHandsOnLists);
-        return teacherOpenCourseHandsOns;
     }
 
+
+
     public List<Map<String, Object>> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) {
         return teacherOpenCourseHandsOnDao.getExcelValues(teacherOpenCourseHandsOnQuery);
     }

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

@@ -720,25 +720,6 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         return target;
     }
 
-    /**
-     * 修改章节点的父类ID字段
-     *
-     * @param courseInfoList       系统课程列表
-     * @param somecourseInfoIdPair 一些修改前修改后的ID对（指定一些修改的ID对）
-     */
-    public void updateSpecifyIdTargetList(List<CourseInfo> courseInfoList,
-                                          @NotEmpty(message = "ID对不能为空！") Map<Long, Long> somecourseInfoIdPair) {
-        for (CourseInfo courseInfo : courseInfoList) {
-            somecourseInfoIdPair.forEach((oldId, newId) -> {
-                if (courseInfo.getCourseInfoId().equals(oldId)) {
-                    courseInfo.setCourseInfoId(newId);
-                }
-                if (courseInfo.getCourseInfoParentId().equals(oldId)) {
-                    courseInfo.setCourseInfoParentId(newId);
-                }
-            });
-        }
-    }
 
     /**
      * 修改章节点的父类ID字段
@@ -749,14 +730,13 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
     public void updateSpecifyMergeCourseInfoIdTargetList(List<TeacherOpenCourseMergeCourseInfo> courseInfoList,
                                                          @NotEmpty(message = "ID对不能为空！") Map<Long, Long> somecourseInfoIdPair) {
         for (TeacherOpenCourseMergeCourseInfo courseInfo : courseInfoList) {
-            somecourseInfoIdPair.forEach((oldId, newId) -> {
+            if (somecourseInfoIdPair.containsKey(courseInfo.getTeacherOpenCourseMergeCourseInfoId())) {
-                if (courseInfo.getTeacherOpenCourseMergeCourseInfoId().equals(oldId)) {
+                courseInfo.setTeacherOpenCourseMergeCourseInfoId(somecourseInfoIdPair.get(courseInfo.getTeacherOpenCourseMergeCourseInfoId()));
-                    courseInfo.setTeacherOpenCourseMergeCourseInfoId(newId);
             }
-                if (courseInfo.getCourseInfoParentId().equals(oldId)) {
+            if (somecourseInfoIdPair.containsKey(courseInfo.getCourseInfoParentId())) {
-                    courseInfo.setCourseInfoParentId(newId);
+                courseInfo.setCourseInfoParentId(somecourseInfoIdPair.get(courseInfo.getCourseInfoParentId()));
             }
-            });
+
         }
     }
 
@@ -1110,7 +1090,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         for (TeacherOpenCourseMergeCourseInfo courseInfo : courseInfoList) {
             // 先处理掉一些不合规的数据。防止死循环，过滤掉父类ID是他自己的情况
             if (courseInfo.getCourseInfoParentId() == null
-                    || courseInfo.getCourseInfoParentId().equals(courseInfo.getTeacherOpenCourseMergeCourseInfoId())) {
+                    || courseInfo.getCourseInfoParentId().equals(courseInfo.getTeacherOpenCourseMergeCourseInfoId())
+                    || courseInfo.getTeacherOpenCourseMergeCourseInfoId().equals(filterTeacherOpenCourseMergeCourseInfoId)) {
                 continue;
             }
             // 处理关系

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

@@ -1051,4 +1051,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             questionSetting.setQuestionSettingOptions(questionSettingDTOList);
         }
     }
+
+    public List<TeacherOpenCourseQuestionSetting> queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition) {
+        return teacherOpenCourseQuestionSettingDao.queryByConditionQueryNotPage(condition);
+    }
 }

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

@@ -372,7 +372,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         // 获取登录用户，教师身份不支持IP签到，教师只能手动签到
         // 获取学生信息
         Student student = getStudent();
-        Assert.notNull(student, "IP签到方式，只允许学生进行操作！");
+        Assert.notNull(student, "验证码签到方式，只允许学生进行操作！");
         // 获取学生信息
         Assert.isTrue(schoolClassIdJudgment(student.getClassId(), signinSetting), "该学生所在的班级不符合签到要求！");
 
@@ -582,8 +582,12 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         BeanUtil.copyProperties(signinSetting, entity);
         DateTime now = DateUtil.date();
 
+        //获取现在的时间 精确到分
+
         // 默认的一些属性填充。添加主表
-        entity.setTeacherOpenCourseStudentSigninSettingSessionTime(now);
+        DateTime parse = DateUtil.parse(DateUtil.format(now, "yyyy-MM-dd HH:mm"), "yyyy-MM-dd HH:mm");
+        entity.setTeacherOpenCourseStudentSigninSettingSessionTime(parse);
+
         entity.setTeacherOpenCourseStudentSigninSettingStartTime(now);
         entity.setTeacherOpenCourseStudentSigninSettingEndTime(now);
         entity.setTeacherOpenCourseStudentSigninSettingAddTime(now);

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

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,9 +47,12 @@ import static com.ibeetl.admin.core.util.BeanUtil.copyAllPropertiesSupportExtMap
 @Slf4j
 public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService<TeacherOpenCourseStudentSigninSetting> implements DeleteResourcesBy {
 
-    @Autowired private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
+    @Autowired
-    @Autowired private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao;
+    private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
-    @Autowired private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator;
+    @Autowired
+    private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao;
+    @Autowired
+    private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator;
 
     public PageQuery<TeacherOpenCourseStudentSigninSetting> queryByCondition(PageQuery query) {
         PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query);
@@ -59,6 +63,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
 
     /**
      * 根据签到ID，设置汇总数据
+     *
      * @param list
      */
     private void setSummaryInfo(List<TeacherOpenCourseStudentSigninSetting> list) {
@@ -115,7 +120,8 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
         } catch (Exception e) {
             try {
                 teacherOpenCourseStudentSigninSettingList.add(JSONObject.parseObject(teacherOpenCourseStudentSigninSettingQuery.getTeacherOpenCourseStudentSigninSettingJsonStr(), TeacherOpenCourseStudentSigninSetting.class));
-            } catch (Exception e1) {}
+            } catch (Exception e1) {
+            }
         }
         ToolUtils.deleteNullList(teacherOpenCourseStudentSigninSettingList);
         if (null != teacherOpenCourseStudentSigninSettingList && teacherOpenCourseStudentSigninSettingList.size() > 0) {
@@ -136,6 +142,17 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
         teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingAddTime(new Date());
         // 默认是未开始的状态
         teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.READY);
+        //获取现在时间 只保留到分钟
+        Date now = new Date();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String nowTime = dateFormat.format(now);
+        try {
+            now = dateFormat.parse(nowTime);
+        }catch (Exception e){
+            throw new PlatformException("时间转换异常", e);
+        }
+
+        teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingSessionTime(now);
         teacherOpenCourseStudentSigninSettingDao.insert(teacherOpenCourseStudentSigninSetting);
         teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingId());
         JsonResult jsonResult = new JsonResult();
@@ -204,6 +221,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
 
     /**
      * 设置签到配置的状态 开始，结束
+     *
      * @param id
      * @param status
      */
@@ -229,14 +247,16 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
                                 "teacherOpenCourseStudentSigninSettingEndTime," +
                                 "teacherOpenCourseStudentSigninSettingStartStatus");
                 updateGivenByIds(settingQuery);
-            } break;
+            }
+            break;
 
             case 2: {
                 // 结束时间，赋值
                 model.setTeacherOpenCourseStudentSigninSettingEndTime(new Date());
                 model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.END);
                 updateTemplate(model);
-            }  break;
+            }
+            break;
         }
 
 

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

@@ -45,7 +45,6 @@ public class StatisticalAnalysisController {
 
     /**
      * 首页数据
-     * @param map
      * @return
      */
     @RequestMapping("/indexDetail.do")

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

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
@@ -7,6 +8,8 @@ import com.alibaba.fastjson.JSON;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.util.BeanCopyUtil;
+import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.TimeTool;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn;
@@ -33,9 +36,14 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
+import static com.ibeetl.admin.core.util.ExcelUtil.write;
+
 /**
  * 教师开课-课程实操 教师开课-课程实操 接口
  * 切记不要对非线程安全的静态变量进行写操作
@@ -315,6 +323,36 @@ public class TeacherOpenCourseHandsOnController{
         }
     }
 
+    /**
+     * 导出实操列表
+     * @param coreUser
+     * @return
+     */
+    @GetMapping(MODEL + "/exportHandsOnList.do")
+    public void exportHandsOnList(GetHandsOnListParam param, HttpServletResponse response, @SCoreUser CoreUser coreUser) throws IOException {
+        if (null == coreUser) {
+            throw new PlatformException("请登录后再操作");
+        } else {
+
+            /** 构建表头 */
+            Map<String, String> header = new LinkedHashMap<>(11);
+            header.put("handsOnName", "项目名称");
+            header.put("videoAvgScore", "观看视频平均得分");
+            header.put("pptAvgScore", "观看PPT平均得分");
+            header.put("theoryAvgScore", "理论测评平均得分");
+            header.put("stepAvgScore", "实训操作步骤平均得分");
+            header.put("reportAvgScore", "报告撰写平均得分");
+
+            List<TeacherOpenCourseHandsOnList> list = teacherOpenCourseHandsOnService.getHandsOnListNotPage(param);
+
+            List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(list);
+
+
+            String filename = StrUtil.format("实操列表 {}.xlsx", System.currentTimeMillis());
+            write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps));
+
+        }
+    }
 
     //
     /**

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

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
@@ -27,10 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 import static cn.jlw.util.CacheUserUtil.getStudent;
 import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
@@ -86,22 +84,30 @@ public class TeacherOpenCourseQuestionSettingController {
             if (condition.getTeacherOpenCourseQuestionSettingType() == null) {
                 throw new PlatformException("参数错误");
             }
+
             if (coreUser.isStudent()) {
                 condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
                 condition.setTeacherOpenCourseQuestionSettingStatus(1);
             }
 
-            condition.setPage(1);
-            condition.setLimit(Long.MAX_VALUE);
-            PageQuery page = condition.getPageQuery();
-            teacherOpenCourseQuestionSettingService.queryByConditionQuery(page);
 
-            String baseName = "";
 
-            for (Object o : page.getList()) {
+            List<TeacherOpenCourseQuestionSetting> list = teacherOpenCourseQuestionSettingService.queryByConditionQueryNotPage(condition);
-                TeacherOpenCourseQuestionSetting setting = (TeacherOpenCourseQuestionSetting) o;
+            teacherOpenCourseQuestionSettingService.fullQuestionSettingOptions(list);
+            if (!condition.getNotSelectOther()) {
+                // 设置分数和完成时间
+                teacherOpenCourseQuestionSettingService.setMyQuestionLogScoreInfo(list, getStudent());
+            }
+            String baseName = "";
+            for (TeacherOpenCourseQuestionSetting setting :list) {
                 GlobalPushStatusEnum teacherOpenCourseQuestionSettingPushStatus = setting.getTeacherOpenCourseQuestionSettingPushStatus();
                 setting.set("teacherOpenCourseQuestionSettingPushStatusText",teacherOpenCourseQuestionSettingPushStatus.getText());
+
+                String teacherOpenCourseQuestionStartAndEndTime =
+                        ( setting.getTeacherOpenCourseQuestionStartTime()!=null?DateUtil.format(setting.getTeacherOpenCourseQuestionStartTime(),"yyyy-MM-dd HH:mm:ss"):"" )
+                                + " ~ " +
+                                ( setting.getTeacherOpenCourseQuestionEndTime()!=null?DateUtil.format(setting.getTeacherOpenCourseQuestionEndTime(),"yyyy-MM-dd HH:mm:ss"):"" );
+                setting.set("teacherOpenCourseQuestionStartAndEndTime",teacherOpenCourseQuestionStartAndEndTime);
             }
 
             /** 构建表头 */
@@ -112,9 +118,7 @@ public class TeacherOpenCourseQuestionSettingController {
                 case EXAM:
                     header.put("teacherOpenCourseQuestionSettingName", "考试名称");
                     header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级");
-                    header.put("teacherOpenCourseQuestionStartTime", "考试开始时间");
+                    header.put("teacherOpenCourseQuestionStartAndEndTime", "考试时间");
-                    header.put("teacherOpenCourseQuestionEndTime", "考试结束时间");
-
                     header.put("avgSuccessCount", "平均答对数量");
                     header.put("avgErrorCount", "平均答错数量");
                     header.put("avgSuccessRate", "平均正确率");
@@ -126,8 +130,7 @@ public class TeacherOpenCourseQuestionSettingController {
                 case HOMEWORK_QUESTION:
                     header.put("teacherOpenCourseQuestionSettingName", "题库作业名称");
                     header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级");
-                    header.put("teacherOpenCourseQuestionStartTime", "作业开始时间");
+                    header.put("teacherOpenCourseQuestionStartAndEndTime", "作业时间");
-                    header.put("teacherOpenCourseQuestionEndTime", "作业结束时间");
                     header.put("avgPassRate", "及格率");
                     header.put("avgScore", "平均得分");
                     header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态");
@@ -137,11 +140,10 @@ public class TeacherOpenCourseQuestionSettingController {
                 case HOMEWORK_FILE:
                     header.put("teacherOpenCourseQuestionSettingName", "题库作业名称");
                     header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "作业班级");
-                    header.put("messageAddTime", "作业附件");
+                    //header.put("messageAddTime", "作业附件");
                     header.put("avgScore", "平均得分");
                     header.put("avgPassRate", "及格率");
-                    header.put("teacherOpenCourseQuestionStartTime", "作业开始时间");
+                    header.put("teacherOpenCourseQuestionStartAndEndTime", "作业时间");
-                    header.put("teacherOpenCourseQuestionEndTime", "作业结束时间");
                     header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态");
                     baseName = "附件作业-导出";
                     break;
@@ -150,7 +152,9 @@ public class TeacherOpenCourseQuestionSettingController {
                     throw new PlatformException("参数错误");
             }
 
-            List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(page.getList());
+            List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(list);
+
+
 
             String filename = StrUtil.format("{} {}.xlsx", baseName, System.currentTimeMillis());
             write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps));

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

@@ -343,6 +343,15 @@ getHandsOnList
   from teacher_open_course_hands_on t
   where t.teacher_open_course_id =#teacherOpenCourseId#
 
+getHandsOnListNotPage
+===
+* 查询参数
+
+  select 
+  t.*
+  from teacher_open_course_hands_on t
+  where t.teacher_open_course_id =#teacherOpenCourseId#
+
 
 getExcelValues
 ===

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

@@ -680,3 +680,92 @@ getQuestionSettingScoreInfo
   and t.teacher_open_course_question_setting_id = #questionSettingId#
   and t.student_id = #studentId#
 
+queryByConditionQueryNotPage
+===
+* 根据不为空的条件进行查询
+    select
+    t.*
+    from teacher_open_course_question_setting t
+    where 1=1  
+    @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
+    and #function("teacherOpenCourseQuestionSetting.query")#
+    @if(!isEmpty(teacherOpenCourseQuestionSettingId)){
+    and t.teacher_open_course_question_setting_id =#teacherOpenCourseQuestionSettingId#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
+    and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
+    @}
+    @if(!isEmpty(teacherOpenCourseId)){
+    and t.teacher_open_course_id =#teacherOpenCourseId#
+    @}
+    @if(!isEmpty(teacherOpenCourseIdPlural)){
+    and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingSchoolClassIds)){
+    and t.teacher_open_course_question_setting_school_class_ids =#teacherOpenCourseQuestionSettingSchoolClassIds#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingDoCount)){
+    and t.teacher_open_course_question_setting_do_count =#teacherOpenCourseQuestionSettingDoCount#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingQuestionNoOrder)){
+    and t.teacher_open_course_question_setting_question_no_order =#teacherOpenCourseQuestionSettingQuestionNoOrder#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingOptionNoOrder)){
+    and t.teacher_open_course_question_setting_option_no_order =#teacherOpenCourseQuestionSettingOptionNoOrder#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingEndShowQa)){
+    and t.teacher_open_course_question_setting_end_show_qa =#teacherOpenCourseQuestionSettingEndShowQa#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingEndShowTrueFalse)){
+    and t.teacher_open_course_question_setting_end_show_true_false =#teacherOpenCourseQuestionSettingEndShowTrueFalse#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingName)){
+    and t.teacher_open_course_question_setting_name =#teacherOpenCourseQuestionSettingName#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionStartTime)){
+    and t.teacher_open_course_question_start_time =#teacherOpenCourseQuestionStartTime#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionEndTime)){
+    and t.teacher_open_course_question_end_time =#teacherOpenCourseQuestionEndTime#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingType)){
+    and t.teacher_open_course_question_setting_type =#teacherOpenCourseQuestionSettingType#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingFile)){
+    and t.teacher_open_course_question_setting_file =#teacherOpenCourseQuestionSettingFile#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingPushStatus)){
+    and t.teacher_open_course_question_setting_push_status =#teacherOpenCourseQuestionSettingPushStatus#
+    @}
+    @if(isEmpty(teacherOpenCourseQuestionSettingStatus) && isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
+    and t.teacher_open_course_question_setting_status != 2
+    @}else{
+    @if(!isEmpty(teacherOpenCourseQuestionSettingStatus)){
+    and t.teacher_open_course_question_setting_status =#teacherOpenCourseQuestionSettingStatus#
+    @}else if(!isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
+    and find_in_set(t.teacher_open_course_question_setting_status,#teacherOpenCourseQuestionSettingStatusPlural#)
+    @}
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingAddTime)){
+    and t.teacher_open_course_question_setting_add_time =#teacherOpenCourseQuestionSettingAddTime#
+    @}
+    @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
+    and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
+    @}
+    @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
+    and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+    @}
+    @if(!isEmpty(orgId)){
+    and t.org_id =#orgId#
+    @}
+    @if(!isEmpty(orgIdPlural)){
+    and find_in_set(t.org_id,#orgIdPlural#)
+    @}
+    @if(!isEmpty(userId)){
+    and t.user_id =#userId#
+    @}
+    @if(!isEmpty(userIdPlural)){
+    and find_in_set(t.user_id,#userIdPlural#)
+    @}
+    ORDER BY
+    CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc