新增默认db

sop-business/src/main/java/com/qmth/sop/business/entity/SysUser.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.entity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;
+import com.qmth.sop.common.enums.UserSourceEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -52,6 +53,17 @@ public class SysUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "来源，SYSTEM：系统自带，ARCHIVES：档案")
+    private UserSourceEnum source;
+
+    public UserSourceEnum getSource() {
+        return source;
+    }
+
+    public void setSource(UserSourceEnum source) {
+        this.source = source;
+    }
+
     public String getLoginName() {
         return loginName;
     }

sop-business/src/main/java/com/qmth/sop/business/entity/TFCustomFlowEntity.java

@@ -25,6 +25,13 @@ public class TFCustomFlowEntity extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long tFCustomFlowId;
 
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+    @ApiModelProperty(value = "实体id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long objId;
+
     @ApiModelProperty(value = "流程id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long flowId;
@@ -54,6 +61,22 @@ public class TFCustomFlowEntity extends BaseEntity implements Serializable {
         this.insertInfo(userId);
     }
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getObjId() {
+        return objId;
+    }
+
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
+
     public Long gettFCustomFlowId() {
         return tFCustomFlowId;
     }

sop-common/src/main/java/com/qmth/sop/common/enums/RoleTypeEnum.java

@@ -9,7 +9,7 @@ public enum RoleTypeEnum {
 
     ADMIN("系统管理员"),
 
-    ORG_ADMIN("机构管理员");
+    PMO("主任");
 
     RoleTypeEnum(String desc) {
         this.desc = desc;

sop-common/src/main/java/com/qmth/sop/common/enums/TFCustomTypeEnum.java

@@ -1,7 +1,5 @@
 package com.qmth.sop.common.enums;
 
-import java.util.Objects;
-
 /**
  * @Description: 自定义流程类型enum
  * @Param:
@@ -11,29 +9,22 @@ import java.util.Objects;
  */
 public enum TFCustomTypeEnum {
 
-    OFFICE_SOP_FLOW("教务处SOP", null, "officeSopFlow", "testform1.zip"),
+    OFFICE_SOP_FLOW("教务处SOP", "officeSopFlow", "testform1.zip"),
 
-    CLOUD_MARK_SOP_FLOW("云阅卷SOP", null, "cloudMarkSopFlow", null);
+    CLOUD_MARK_SOP_FLOW("云阅卷SOP", "cloudMarkSopFlow", null);
 
     private String title;
 
-    private String table;
-
     private String code;
 
     private String fileName;
 
-    private TFCustomTypeEnum(String title, String table, String code, String fileName) {
+    private TFCustomTypeEnum(String title, String code, String fileName) {
         this.title = title;
-        this.table = table;
         this.code = code;
         this.fileName = fileName;
     }
 
-    public String getTable() {
-        return table;
-    }
-
     public String getTitle() {
         return title;
     }
@@ -45,19 +36,4 @@ public enum TFCustomTypeEnum {
     public String getFileName() {
         return fileName;
     }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param table
-     * @return
-     */
-    public static TFCustomTypeEnum convertToEnum(String table) {
-        for (TFCustomTypeEnum e : TFCustomTypeEnum.values()) {
-            if (Objects.equals(table, e.getTable())) {
-                return e;
-            }
-        }
-        return null;
-    }
 }

sop-common/src/main/java/com/qmth/sop/common/enums/UserSourceEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.sop.common.enums;
+
+import java.util.Objects;
+
+/**
+ * @Description: 用户来源类型
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/4/26
+ */
+public enum UserSourceEnum {
+
+    ARCHIVES("人员档案"),
+
+    SYSTEM("系统自带");
+
+    UserSourceEnum(String title) {
+        this.title = title;
+    }
+
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param value
+     * @return
+     */
+    public static String convertToName(String value) {
+        for (UserSourceEnum e : UserSourceEnum.values()) {
+            if (Objects.equals(value.trim(), e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}