修改发布状态

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

@@ -7,6 +7,7 @@ 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.entity.dto.TeacherOpenCourseQuestionSettingDTO;
+import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -91,9 +92,9 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
     private String teacherOpenCourseQuestionSettingFile ;
 	
     //发布状态。 1发布，2未发布
-    @Dict(type="global_push_status")
+//    @Dict(type="global_push_status")
-
+    @DictEnum
-    private Integer teacherOpenCourseQuestionSettingPushStatus ;
+    private GlobalPushStatusEnum teacherOpenCourseQuestionSettingPushStatus ;
 	
     //状态 （1正常 2删除）
     @Dict(type="global_status")

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

@@ -0,0 +1,25 @@
+package com.ibeetl.jlw.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.beetl.sql.annotation.entity.EnumMapping;
+
+/**
+ * 发布   PUSH
+ * 未发布 UN_PUSH
+ */
+
+@Getter
+@AllArgsConstructor
+@EnumMapping("name")
+public enum GlobalPushStatusEnum {
+    // 发布
+    PUSH(1, "发布"),
+    // 未发布
+    UN_PUSH(2, "未发布");
+
+    private Integer code;
+
+    private String text;
+
+}

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

@@ -15,6 +15,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionSettingDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.dto.TeacherOpenCourseQuestionSettingDTO;
 import com.ibeetl.jlw.enums.CopyFromEnum;
+import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeCourseInfoQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesQuestionQuery;
@@ -574,4 +575,14 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             }
         }
     }
+
+    public void editPushStatus(@NotEmpty(message = "题目配置ID不能为空！") String ids,
+                               @NotNull(message = "发布状态不能为空！") GlobalPushStatusEnum pushStatus) {
+        for (String settingId : ids.split(",")) {
+            TeacherOpenCourseQuestionSetting model = new TeacherOpenCourseQuestionSetting();
+            model.setTeacherOpenCourseQuestionSettingId(Long.valueOf(settingId));
+            model.setTeacherOpenCourseQuestionSettingPushStatus(pushStatus);
+            updateTemplate(model);
+        }
+    }
 }

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

@@ -8,6 +8,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionSetting;
+import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
 import com.ibeetl.jlw.service.TeacherOpenCourseQuestionSettingService;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -202,12 +203,46 @@ public class TeacherOpenCourseQuestionSettingController{
     }
 
 
+    /**
+     * 逻辑删除
+     * @param ids
+     * @return
+     */
+    @PostMapping(MODEL + "/logicDelete.json")
+    @Function("teacherOpenCourseQuestionSetting.delete")
+    @ResponseBody
+    public JsonResult logicDelete(String ids) {
+        teacherOpenCourseQuestionSettingService.logicDeleteTeacherOpenCourseQuestionSetting(ids);
+        return JsonResult.success();
+    }
+
+    /**
+     * 真删除
+     * @param ids
+     * @return
+     */
     @PostMapping(MODEL + "/delete.json")
     @Function("teacherOpenCourseQuestionSetting.delete")
     @ResponseBody
     public JsonResult delete(String ids) {
-        teacherOpenCourseQuestionSettingService.logicDeleteTeacherOpenCourseQuestionSetting(ids);
+        teacherOpenCourseQuestionSettingService.deleteWithQuestionSnapByIds(ids);
         return JsonResult.success();
     }
 
+    /**
+     * 发布状态
+     * @param ids
+     * @param pushStatus
+     * @return
+     */
+    @PostMapping(MODEL + "/editPushStatus.json")
+    @Function("teacherOpenCourseQuestionSetting.edit")
+    @ResponseBody
+    public JsonResult editPushStatus(String ids, GlobalPushStatusEnum pushStatus) {
+        teacherOpenCourseQuestionSettingService.editPushStatus(ids, pushStatus);
+        return JsonResult.success();
+    }
+
+
+
 }