bug

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{
 

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;
-    }
 }

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, "已超过最大作答次数！");

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, "已超过最大作答次数！");

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;

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();