考证辅导，功能完结

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

@@ -1,9 +1,11 @@
 package com.ibeetl.jlw.entity;
 
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictEnum;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
+import com.ibeetl.jlw.enums.QuestionBussinessTypeEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -37,7 +39,8 @@ public class GeneralQuestionSetting extends BaseEntity{
 	
     //业务类型
 
-    private Long bussinessType ;
+    @DictEnum
+    private QuestionBussinessTypeEnum bussinessType ;
 	
     //班级ID集合（逗号隔开）
 
@@ -76,6 +79,7 @@ public class GeneralQuestionSetting extends BaseEntity{
     private Date generalQuestionEndTime ;
 	
     //类型 枚举（ResourcesQuestionSnapshotFromTypeEnum）
+    @DictEnum
 
     private ResourcesQuestionSnapshotFromTypeEnum generalQuestionSettingType ;
 	
@@ -88,6 +92,7 @@ public class GeneralQuestionSetting extends BaseEntity{
     private String generalQuestionSettingFile ;
 	
     //发布状态。 1发布，2未发布
+
     @Dict(type="global_push_status")
 
     private GlobalPushStatusEnum generalQuestionSettingPushStatus ;

web/src/main/java/com/ibeetl/jlw/enums/QuestionBussinessTypeEnum.java

@@ -0,0 +1,22 @@
+package com.ibeetl.jlw.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.beetl.sql.annotation.entity.EnumMapping;
+
+/**
+ * 题目配置业务类型
+ */
+
+@Getter
+@AllArgsConstructor
+@EnumMapping("name")
+public enum QuestionBussinessTypeEnum {
+
+    FROM_SYSTEM("系统方"),
+    // 开课（暂时没用到）
+    FROM_OPEN_COURSE("开课方");
+
+    private String text;
+
+}

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

@@ -98,6 +98,8 @@ public class GeneralQuestionSettingController{
 
     /**
      * 教师端-根据类型添加作业（支持章节练习、考试、作业等）
+     * 考证辅导
+     *
      * @param generalQuestionSettingQuery
      * @param result
      * @param coreUser

web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java

@@ -8,6 +8,7 @@ import com.ibeetl.jlw.entity.GeneralQuestionSetting;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
 import com.ibeetl.jlw.entity.dto.QuestionSettingDTO;
 import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
+import com.ibeetl.jlw.enums.QuestionBussinessTypeEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -20,6 +21,7 @@ import java.util.List;
 import static cn.hutool.core.date.DateUtil.offset;
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.jlw.enums.GlobalPushStatusEnum.UN_PUSH;
+import static com.ibeetl.jlw.enums.QuestionBussinessTypeEnum.FROM_SYSTEM;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
 
 /**
@@ -38,7 +40,7 @@ public class GeneralQuestionSettingQuery extends PageParam {
     @Query(name = "业务ID", display = false)
     private Long bussinessId;
     @Query(name = "业务类型", display = false)
-    private Long bussinessType;
+    private QuestionBussinessTypeEnum bussinessType;
     @Query(name = "班级ID集合（逗号隔开）", display = false)
     private String generalQuestionSettingSchoolClassIds;
     @Query(name = "作答次数", display = false)
@@ -129,6 +131,7 @@ public class GeneralQuestionSettingQuery extends PageParam {
      */
     public static void setDefault(GeneralQuestionSettingQuery setting) {
         setting.setGeneralQuestionSettingStatus(1);
+        setting.setBussinessType(FROM_SYSTEM);
         setting.setGeneralQuestionSettingAddTime(new Date());
         setting.setGeneralQuestionSettingOptionNoOrder(1);
         setting.setGeneralQuestionSettingQuestionNoOrder(1);
@@ -150,6 +153,7 @@ public class GeneralQuestionSettingQuery extends PageParam {
         setting.setGeneralQuestionSettingEndShowTrueFalse(1);
         setting.setGeneralQuestionSettingEndShowQa(1);
         setting.setGeneralQuestionSettingDoCount(1000);
+        setting.setBussinessType(FROM_SYSTEM);
         setting.setGeneralQuestionSettingType(CHAPTER_EXERCISE);
         setting.setGeneralQuestionSettingSchoolClassIds("ALL");
         setting.setGeneralQuestionSettingPushStatus(UN_PUSH);