编辑发布状态

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

@@ -11,7 +11,7 @@ import org.beetl.sql.annotation.entity.EnumMapping;
 
 @Getter
 @AllArgsConstructor
-@EnumMapping("name")
+@EnumMapping("code")
 public enum GlobalPushStatusEnum {
     // 发布
     PUSH(1, "发布"),

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

@@ -36,6 +36,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.hutool.core.text.CharSequenceUtil.join;
+import static com.ibeetl.jlw.enums.GlobalPushStatusEnum.UN_PUSH;
 import static java.util.stream.Collectors.joining;
 
 /**
@@ -261,7 +262,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             settingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
         }
         if (null == settingQuery.getTeacherOpenCourseQuestionSettingPushStatus()) {
-            settingQuery.setTeacherOpenCourseQuestionSettingPushStatus(1);
+            settingQuery.setTeacherOpenCourseQuestionSettingPushStatus(UN_PUSH);
         }
 
         // 编辑操作
@@ -326,7 +327,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             settingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
         }
         if (null == settingQuery.getTeacherOpenCourseQuestionSettingPushStatus()) {
-            settingQuery.setTeacherOpenCourseQuestionSettingPushStatus(1);
+            settingQuery.setTeacherOpenCourseQuestionSettingPushStatus(UN_PUSH);
         }
 
         // 添加到作业主表中

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

@@ -7,6 +7,7 @@ import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
 import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionSetting;
 import com.ibeetl.jlw.entity.dto.TeacherOpenCourseQuestionSettingDTO;
+import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,6 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 import static cn.hutool.core.date.DateUtil.offset;
+import static com.ibeetl.jlw.enums.GlobalPushStatusEnum.PUSH;
 
 /**
  *题目配置查询
@@ -61,7 +63,7 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam {
     @Query(name = "附件，老师上传附件（单文件）", display = false)
     private String teacherOpenCourseQuestionSettingFile;
     @Query(name = "发布状态。 1发布，2未发布", display = true,type=Query.TYPE_DICT,dict="global_push_status")
-    private Integer teacherOpenCourseQuestionSettingPushStatus;
+    private GlobalPushStatusEnum teacherOpenCourseQuestionSettingPushStatus;
     @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")
     private Integer teacherOpenCourseQuestionSettingStatus;
     @Query(name = "创建时间", display = false)
@@ -147,7 +149,7 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam {
         setting.setTeacherOpenCourseQuestionSettingDoCount(1000);
         setting.setTeacherOpenCourseQuestionSettingType(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE);
         setting.setTeacherOpenCourseQuestionSettingSchoolClassIds("ALL");
-        setting.setTeacherOpenCourseQuestionSettingPushStatus(1);
+        setting.setTeacherOpenCourseQuestionSettingPushStatus(PUSH);
         setting.setTeacherOpenCourseQuestionStartTime(new Date());
         // 结束时间设置为20年后
         setting.setTeacherOpenCourseQuestionEndTime(offset(new Date(), DateField.YEAR, 20));

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingControllerTest.java

@@ -29,6 +29,7 @@ import java.util.List;
 
 import static cn.hutool.json.JSONUtil.toJsonStr;
 import static com.ibeetl.admin.test.util.test.RandomUtils.*;
+import static com.ibeetl.jlw.enums.GlobalPushStatusEnum.UN_PUSH;
 import static java.util.stream.Collectors.joining;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.util.CollectionUtils.firstElement;
@@ -167,7 +168,7 @@ class TeacherOpenCourseQuestionSettingControllerTest extends BaseTest {
                     e.setTeacherOpenCourseId(RandomUtil.randomEle(openCourseList).getTeacherOpenCourseId());
                     e.setTeacherOpenCourseQuestionSettingType(typeEnum);
                     e.setTeacherOpenCourseQuestionSettingStatus(1);
-                    e.setTeacherOpenCourseQuestionSettingPushStatus(1);
+                    e.setTeacherOpenCourseQuestionSettingPushStatus(UN_PUSH);
 
                     // 自增ID，丢给ID生成器
                     e.setTeacherOpenCourseQuestionSettingId(null);