未提交判断

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

@@ -19,13 +19,11 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.GeneralQuestionLogDao;
 import com.ibeetl.jlw.dao.GeneralQuestionSettingDao;
 import com.ibeetl.jlw.dao.GeneralResourcesQuestionSnapshotDao;
+import com.ibeetl.jlw.dao.QuestionLogSummaryDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.dto.QuestionSettingDTO;
 import com.ibeetl.jlw.enums.*;
-import com.ibeetl.jlw.web.query.GeneralQuestionLogQuery;
-import com.ibeetl.jlw.web.query.GeneralQuestionSettingQuery;
-import com.ibeetl.jlw.web.query.GeneralResourcesQuestionSnapshotQuery;
-import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
+import com.ibeetl.jlw.web.query.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -68,6 +66,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
     @Autowired private GeneralQuestionSettingDao generalQuestionSettingDao;
     @Autowired private GeneralResourcesQuestionSnapshotDao generalResourcesQuestionSnapshotDao;
     @Autowired private GeneralQuestionLogDao generalQuestionLogDao;
+    @Autowired private QuestionLogSummaryDao questionLogSummaryDao;
     @Autowired private GeneralQuestionLogService generalQuestionLogService;
     @Autowired @Lazy
     private GeneralResourcesQuestionSnapshotService generalResourcesQuestionSnapshotService;
@@ -639,6 +638,17 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
     public void validateFinallySubmitThrow(Long questionSettingId, Long studentId, String nothingThrowMessage, String notSubmitThrowMessage) {
         boolean isZeroCount = false;
         if (ObjectUtil.isAllNotEmpty(questionSettingId, studentId)) {
+            QuestionLogSummaryQuery questionLogSummaryQuery = new QuestionLogSummaryQuery();
+            questionLogSummaryQuery.setQuestionSettingId(questionSettingId);
+            questionLogSummaryQuery.setQuestionLogSummaryStatus(1);
+            questionLogSummaryQuery.setPersonId(studentId);
+            List<QuestionLogSummary> logSummaryList = questionLogSummaryDao.getValuesByQueryNotWithPermission(questionLogSummaryQuery);
+
+            if (StrUtil.isNotBlank(notSubmitThrowMessage)) {
+                // 异常的消息，交给调用方来定义
+                Assert.notEmpty(logSummaryList, notSubmitThrowMessage);
+            }
+
             // 查询未提交题目数量
             long submitCount = generalQuestionLogDao.createLambdaQuery()
                     .andEq(GeneralQuestionLog::getGeneralQuestionSettingId, questionSettingId)

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

@@ -16,10 +16,7 @@ import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
-import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao;
-import com.ibeetl.jlw.dao.StudentDao;
-import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao;
-import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionSettingDao;
+import com.ibeetl.jlw.dao.*;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.dto.QuestionSettingDTO;
 import com.ibeetl.jlw.entity.vo.QuestionSettingScoreInfoVO;
@@ -65,6 +62,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
     @Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
     @Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
     @Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
+    @Autowired private QuestionLogSummaryDao questionLogSummaryDao;
     @Autowired private StudentDao studentDao;
     @Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
     @Autowired private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
@@ -778,6 +776,17 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
     public void validateFinallySubmitThrow(Long questionSettingId, Long studentId, String nothingThrowMessage, String notSubmitThrowMessage) {
         boolean isZeroCount = false;
         if (ObjectUtil.isAllNotEmpty(questionSettingId, studentId)) {
+            QuestionLogSummaryQuery questionLogSummaryQuery = new QuestionLogSummaryQuery();
+            questionLogSummaryQuery.setQuestionSettingId(questionSettingId);
+            questionLogSummaryQuery.setQuestionLogSummaryStatus(1);
+            questionLogSummaryQuery.setPersonId(studentId);
+            List<QuestionLogSummary> logSummaryList = questionLogSummaryDao.getValuesByQueryNotWithPermission(questionLogSummaryQuery);
+
+            if (StrUtil.isNotBlank(notSubmitThrowMessage)) {
+                // 异常的消息，交给调用方来定义
+                Assert.notEmpty(logSummaryList, notSubmitThrowMessage);
+            }
+
             // 查询未提交题目数量
             long submitCount = teacherOpenCourseQuestionLogDao.createLambdaQuery()
                     .andEq(TeacherOpenCourseQuestionLog::getTeacherOpenCourseQuestionSettingId, questionSettingId)