diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java index c7da828e..04aa1a9d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java @@ -27,6 +27,7 @@ import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; import com.ibeetl.jlw.web.query.GeneralQuestionLogQuery; import com.ibeetl.jlw.web.query.GeneralQuestionSettingQuery; +import com.ibeetl.jlw.web.query.QuestionLogSummaryQuery; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; @@ -885,8 +886,20 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo questionLogSummary.setFinishTime(DateUtil.secondToTime(finishTime.intValue())); questionLogSummary.setFinishSecondTime(finishTime); } - questionLogSummaryService.logicDeleteByQuestionSettingIds(questionSettingId.toString()); - questionLogSummaryService.insert(questionLogSummary); + + QuestionLogSummaryQuery summaryQuery = new QuestionLogSummaryQuery(); + summaryQuery.setQuestionLogSummaryStatus(1); + summaryQuery.setPersonId(student.getStudentId()); + summaryQuery.setQuestionSettingId(questionSettingId); + summaryQuery.setQuestionLogSummaryFromType(fromType); + QuestionLogSummary logSummary = questionLogSummaryService.getInfo(summaryQuery); + + if (logSummary != null) { + questionLogSummary.setQuestionLogSummaryId(logSummary.getQuestionLogSummaryId()); + } + + // 更新或插入统计数据 + questionLogSummaryService.upsertByTemplate(questionLogSummary); } /** diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java index a21400d2..ff79f44e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java @@ -26,6 +26,7 @@ import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseQuestionLogAnswerLockVO; import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; +import com.ibeetl.jlw.web.query.QuestionLogSummaryQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery; import lombok.extern.slf4j.Slf4j; @@ -738,8 +739,18 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher questionLogSummary.setFinishSecondTime(finishTime); } - questionLogSummaryService.logicDeleteByQuestionSettingIds(questionSettingId.toString()); - questionLogSummaryService.insert(questionLogSummary); + QuestionLogSummaryQuery summaryQuery = new QuestionLogSummaryQuery(); + summaryQuery.setQuestionLogSummaryStatus(1); + summaryQuery.setPersonId(student.getStudentId()); + summaryQuery.setQuestionSettingId(questionSettingId); + QuestionLogSummary logSummary = questionLogSummaryService.getInfo(summaryQuery); + + if (logSummary != null) { + questionLogSummary.setQuestionLogSummaryId(logSummary.getQuestionLogSummaryId()); + } + + // 更新或插入统计数据 + questionLogSummaryService.upsertByTemplate(questionLogSummary); } /**