部门表-大队性质

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysDept.java

@@ -89,6 +89,11 @@ public class SysDept extends BaseEntity {
      */
     private String deptTypeDesc;
 
+    /**
+     * 大队性质
+     */
+    private String brigadeNature;
+
     public Long getDeptId() {
         return deptId;
     }
@@ -207,6 +212,14 @@ public class SysDept extends BaseEntity {
         this.deptTypeDesc = deptTypeDesc;
     }
 
+    public String getBrigadeNature() {
+        return brigadeNature;
+    }
+
+    public void setBrigadeNature(String brigadeNature) {
+        this.brigadeNature = brigadeNature;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -226,6 +239,7 @@ public class SysDept extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("deptType", getDeptType())
                 .append("deptTypeDesc", getDeptTypeDesc())
+                .append("brigadeNature", getBrigadeNature())
                 .toString();
     }
 }

airport-common/src/main/java/com/sundot/airport/common/enums/BrigadeNatureEnum.java

@@ -0,0 +1,32 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 大队性质枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum BrigadeNatureEnum {
+
+    SECURITY_CHECK("SECURITY_CHECK", "安检"),
+    GENERAL_ADMINISTRATION("GENERAL_ADMINISTRATION", "综管"),
+    QUALITY_CONTROL("QUALITY_CONTROL", "品控"),
+    TRAINING("TRAINING", "培训"),
+    EQUIPMENT("EQUIPMENT", "设备"),
+    COMPREHENSIVE("COMPREHENSIVE", "综合");
+
+    private final String code;
+    private final String desc;
+
+    public static BrigadeNatureEnum getByCode(String code) {
+        for (BrigadeNatureEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -22,6 +22,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="deptType" column="dept_type"/>
         <result property="deptTypeDesc" column="dept_type_desc"/>
+        <result property="brigadeNature" column="brigade_nature"/>
     </resultMap>
 
     <sql id="selectDeptVo">
@@ -38,7 +39,8 @@
                d.create_by,
                d.create_time,
                d.dept_type,
-               d.dept_type_desc
+               d.dept_type_desc,
+               d.brigade_nature
         from sys_dept d
     </sql>
 
@@ -63,6 +65,9 @@
         <if test="deptTypeDesc != null and deptTypeDesc != ''">
             AND dept_type_desc = #{deptTypeDesc}
         </if>
+        <if test="brigadeNature != null and brigadeNature != ''">
+            AND brigade_nature = #{brigadeNature}
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by d.parent_id, d.order_num
@@ -92,6 +97,7 @@
                d.status,
                d.dept_type,
                d.dept_type_desc,
+               d.brigade_nature,
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id = #{deptId}
@@ -156,6 +162,7 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="deptType != null and deptType != ''">dept_type,</if>
         <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc,</if>
+        <if test="brigadeNature != null and brigadeNature != ''">brigade_nature,</if>
         create_time
         )values(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -170,6 +177,7 @@
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="deptType != null and deptType != ''">#{deptType},</if>
         <if test="deptTypeDesc != null and deptTypeDesc != ''">#{deptTypeDesc},</if>
+        <if test="brigadeNature != null and brigadeNature != ''">#{brigadeNature},</if>
         sysdate()
         )
     </insert>
@@ -188,6 +196,7 @@
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="deptType != null and deptType != ''">dept_type = #{deptType},</if>
             <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc = #{deptTypeDesc},</if>
+            <if test="brigadeNature != null and brigadeNature != ''">brigade_nature = #{brigadeNature},</if>
             update_time = sysdate()
         </set>
         where dept_id = #{deptId}
@@ -254,6 +263,7 @@
         d.status,
         d.dept_type,
         d.dept_type_desc,
+        d.brigade_nature,
         (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id in