日志管理类型加入枚举类查询

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/EnumType.java

@@ -28,7 +28,8 @@ public enum EnumType {
     CARD_TYPE("题卡类型"),
     SYSTEM_CODE_ENUM("系统编码类型"),
     PUSH_TYPE_ENUM("同步云阅卷类型"),
-    TB_TASK_STATUS("同步云阅卷日志表状态类型");
+    TB_TASK_STATUS("同步云阅卷日志表状态类型"),
+    CUSTOMIZED_OPERATION_TYPE_ENUM("自定义日志记录枚举类");
 
     EnumType(String desc) {
         this.desc = desc;

distributed-print/src/main/java/com/qmth/distributed/print/api/EnumsController.java

@@ -4,6 +4,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.*;
+import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -107,6 +108,9 @@ public class EnumsController {
         } else if (type.equals(EnumType.TB_TASK_STATUS.name())){
             // 同步云阅卷日志表状态类型
             list = TaskStatusEnum.listTypes();
+        } else if (type.equals(EnumType.CUSTOMIZED_OPERATION_TYPE_ENUM.name())){
+            // 同步云阅卷日志表状态类型
+            list = CustomizedOperationTypeEnum.listTypes();
         }
         return ResultUtil.ok(list);
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/OrgTypeEnum.java

@@ -19,7 +19,9 @@ public enum OrgTypeEnum {
 
 //    TEACHING_ROOM("教研室"),
 
-    PRINTING_HOUSE("印刷厂"),;
+    PRINTING_HOUSE("印刷厂"),
+
+    EXECUTIVE("行政机构");
 
     private String title;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/log/CustomizedOperationTypeEnum.java

@@ -1,5 +1,10 @@
 package com.qmth.teachcloud.common.enums.log;
 
+import com.qmth.teachcloud.common.enums.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 系统自定义日志操作类型
  * @Author: CaoZixuan
@@ -32,4 +37,17 @@ public enum CustomizedOperationTypeEnum {
     public OperationTypeEnum getOperationType() {
         return operationType;
     }
+
+    public static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (CustomizedOperationTypeEnum value : CustomizedOperationTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
 }