From d1f2fbcf67f542ae42e589a502a0a836dba34843 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 30 Nov 2022 22:27:42 +0800
Subject: [PATCH] bug
---
.../ibeetl/jlw/entity/GeneralQuestionLog.java | 8 ++------
.../entity/GeneralResourcesQuestionSnapshot.java | 16 ++--------------
.../service/GeneralQuestionSettingService.java | 4 +++-
.../TeacherOpenCourseQuestionSettingService.java | 4 +++-
.../web/query/GeneralQuestionSettingQuery.java | 2 +-
.../GeneralResourcesQuestionSnapshotQuery.java | 1 +
6 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java
index cb3882c3..238b3a30 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionLog.java
@@ -5,8 +5,8 @@ import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.jlw.enums.GeneralResourcesQuestionLogTypeEnum;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
-import lombok.*;
-import lombok.experimental.Accessors;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull;
@@ -18,10 +18,6 @@ import java.util.Date;
* gen by Spring Boot2 Admin 2022-11-24
*/
@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
@EqualsAndHashCode(callSuper=false)
public class GeneralQuestionLog extends BaseEntity{
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/GeneralResourcesQuestionSnapshot.java b/web/src/main/java/com/ibeetl/jlw/entity/GeneralResourcesQuestionSnapshot.java
index 7900f0d7..96f84213 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/GeneralResourcesQuestionSnapshot.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/GeneralResourcesQuestionSnapshot.java
@@ -4,8 +4,8 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.jlw.enums.BusinessCourseInfoEnum;
-import lombok.*;
-import lombok.experimental.Accessors;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull;
@@ -16,10 +16,6 @@ import java.math.BigDecimal;
* gen by Spring Boot2 Admin 2022-11-24
*/
@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
@EqualsAndHashCode(callSuper=false)
public class GeneralResourcesQuestionSnapshot extends BaseEntity{
@@ -101,12 +97,4 @@ public class GeneralResourcesQuestionSnapshot extends BaseEntity{
public void hideAnswer() {
setQuestionAnswer(null);
}
-
- public Long getGeneralResourcesQuestionSnapshotId() {
- return generalResourcesQuestionSnapshotId;
- }
-
- public void setGeneralResourcesQuestionSnapshotId(Long generalResourcesQuestionSnapshotId) {
- this.generalResourcesQuestionSnapshotId = generalResourcesQuestionSnapshotId;
- }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
index aa4f4f78..edc52531 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
@@ -479,10 +479,12 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
if (!EnumUtil.contains(fromTypeEnum, CHAPTER_EXERCISE)) {
// 作答次数
Integer generalQuestionSettingSettingDoCount = hwSetting.getGeneralQuestionSettingDoCount();
- Assert.isTrue(generalQuestionSettingSettingDoCount > 1, "作答次数设置有误，请联系管理员！");
+ Assert.isTrue(generalQuestionSettingSettingDoCount > 0, "作答次数设置有误，请联系管理员！");
// 数据库查询该学生已经做过的次数
GeneralQuestionLog generalQuestionLog = new GeneralQuestionLog();
generalQuestionLog.setStudentId(studentId);
+ generalQuestionLog.setQuestionLogAddType(FINALLY_SUBMIT);
+ generalQuestionLog.setGeneralQuestionSettingId(generalQuestionSettingId);
long doCount = generalQuestionLogDao.templateCount(generalQuestionLog);
// 断言判断最大作答次数
Assert.isTrue(doCount < generalQuestionSettingSettingDoCount, "已超过最大作答次数！");
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 3ff7b198..3df75328 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -693,10 +693,12 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
if (!EnumUtil.contains(fromTypeEnum, CHAPTER_EXERCISE)) {
// 作答次数
Integer teacherOpenCourseQuestionSettingSettingDoCount = hwSetting.getTeacherOpenCourseQuestionSettingDoCount();
- Assert.isTrue(teacherOpenCourseQuestionSettingSettingDoCount > 1, "作答次数设置有误，请联系管理员！");
+ Assert.isTrue(teacherOpenCourseQuestionSettingSettingDoCount > 0, "作答次数设置有误，请联系管理员！");
// 数据库查询该学生已经做过的次数
TeacherOpenCourseQuestionLog teacherOpenCourseQuestionLog = new TeacherOpenCourseQuestionLog();
teacherOpenCourseQuestionLog.setStudentId(studentId);
+ teacherOpenCourseQuestionLog.setQuestionLogAddType(FINALLY_SUBMIT);
+ teacherOpenCourseQuestionLog.setTeacherOpenCourseQuestionSettingId(teacherOpenCourseQuestionSettingId);
long doCount = teacherOpenCourseQuestionLogDao.templateCount(teacherOpenCourseQuestionLog);
// 断言判断最大作答次数
Assert.isTrue(doCount < teacherOpenCourseQuestionSettingSettingDoCount, "已超过最大作答次数！");
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
index d814b7ac..fdd37ec2 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
@@ -91,7 +91,7 @@ public class GeneralQuestionSettingQuery extends PageParam {
private String resourcesQuestionIdPlural;
private String generalQuestionSettingIdPlural;
- private String bussinessIdPlural;
+ private String businessIdPlural;
private String generalQuestionSettingStatusPlural;
private String orgIdPlural;
private String userIdPlural;
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralResourcesQuestionSnapshotQuery.java
index 8832e150..657cd942 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralResourcesQuestionSnapshotQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralResourcesQuestionSnapshotQuery.java
@@ -71,6 +71,7 @@ public class GeneralResourcesQuestionSnapshotQuery extends PageParam {
// 是否乱序
private boolean rand;
+ private boolean studentId;
public GeneralResourcesQuestionSnapshot pojo(){
GeneralResourcesQuestionSnapshot pojo = new GeneralResourcesQuestionSnapshot();