Sfoglia il codice sorgente

部门新增职能部门字段

wangxx 1 mese fa
parent
commit
6a3330aafd

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

@@ -94,6 +94,11 @@ public class SysDept extends BaseEntity {
94
      */
94
      */
95
     private String brigadeNature;
95
     private String brigadeNature;
96
 
96
 
97
+    /**
98
+     * 职能部门(0否 1是)
99
+     */
100
+    private String isFunctionalDept;
101
+
97
     public Long getDeptId() {
102
     public Long getDeptId() {
98
         return deptId;
103
         return deptId;
99
     }
104
     }
@@ -220,6 +225,14 @@ public class SysDept extends BaseEntity {
220
         this.brigadeNature = brigadeNature;
225
         this.brigadeNature = brigadeNature;
221
     }
226
     }
222
 
227
 
228
+    public String getIsFunctionalDept() {
229
+        return isFunctionalDept;
230
+    }
231
+
232
+    public void setIsFunctionalDept(String isFunctionalDept) {
233
+        this.isFunctionalDept = isFunctionalDept;
234
+    }
235
+
223
     @Override
236
     @Override
224
     public String toString() {
237
     public String toString() {
225
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
238
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -240,6 +253,7 @@ public class SysDept extends BaseEntity {
240
                 .append("deptType", getDeptType())
253
                 .append("deptType", getDeptType())
241
                 .append("deptTypeDesc", getDeptTypeDesc())
254
                 .append("deptTypeDesc", getDeptTypeDesc())
242
                 .append("brigadeNature", getBrigadeNature())
255
                 .append("brigadeNature", getBrigadeNature())
256
+                .append("isFunctionalDept", getIsFunctionalDept())
243
                 .toString();
257
                 .toString();
244
     }
258
     }
245
 }
259
 }

+ 11 - 1
airport-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -23,6 +23,7 @@
23
         <result property="deptType" column="dept_type"/>
23
         <result property="deptType" column="dept_type"/>
24
         <result property="deptTypeDesc" column="dept_type_desc"/>
24
         <result property="deptTypeDesc" column="dept_type_desc"/>
25
         <result property="brigadeNature" column="brigade_nature"/>
25
         <result property="brigadeNature" column="brigade_nature"/>
26
+        <result property="isFunctionalDept" column="is_functional_dept"/>
26
     </resultMap>
27
     </resultMap>
27
 
28
 
28
     <sql id="selectDeptVo">
29
     <sql id="selectDeptVo">
@@ -40,7 +41,8 @@
40
                d.create_time,
41
                d.create_time,
41
                d.dept_type,
42
                d.dept_type,
42
                d.dept_type_desc,
43
                d.dept_type_desc,
43
-               d.brigade_nature
44
+               d.brigade_nature,
45
+               d.is_functional_dept
44
         from sys_dept d
46
         from sys_dept d
45
     </sql>
47
     </sql>
46
 
48
 
@@ -68,6 +70,9 @@
68
         <if test="brigadeNature != null and brigadeNature != ''">
70
         <if test="brigadeNature != null and brigadeNature != ''">
69
             AND brigade_nature = #{brigadeNature}
71
             AND brigade_nature = #{brigadeNature}
70
         </if>
72
         </if>
73
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">
74
+            AND is_functional_dept = #{isFunctionalDept}
75
+        </if>
71
         <!-- 数据范围过滤 -->
76
         <!-- 数据范围过滤 -->
72
         ${params.dataScope}
77
         ${params.dataScope}
73
         order by d.parent_id, d.order_num
78
         order by d.parent_id, d.order_num
@@ -98,6 +103,7 @@
98
                d.dept_type,
103
                d.dept_type,
99
                d.dept_type_desc,
104
                d.dept_type_desc,
100
                d.brigade_nature,
105
                d.brigade_nature,
106
+               d.is_functional_dept,
101
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
107
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
102
         from sys_dept d
108
         from sys_dept d
103
         where d.dept_id = #{deptId}
109
         where d.dept_id = #{deptId}
@@ -163,6 +169,7 @@
163
         <if test="deptType != null and deptType != ''">dept_type,</if>
169
         <if test="deptType != null and deptType != ''">dept_type,</if>
164
         <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc,</if>
170
         <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc,</if>
165
         <if test="brigadeNature != null and brigadeNature != ''">brigade_nature,</if>
171
         <if test="brigadeNature != null and brigadeNature != ''">brigade_nature,</if>
172
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">is_functional_dept,</if>
166
         create_time
173
         create_time
167
         )values(
174
         )values(
168
         <if test="deptId != null and deptId != 0">#{deptId},</if>
175
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -178,6 +185,7 @@
178
         <if test="deptType != null and deptType != ''">#{deptType},</if>
185
         <if test="deptType != null and deptType != ''">#{deptType},</if>
179
         <if test="deptTypeDesc != null and deptTypeDesc != ''">#{deptTypeDesc},</if>
186
         <if test="deptTypeDesc != null and deptTypeDesc != ''">#{deptTypeDesc},</if>
180
         <if test="brigadeNature != null and brigadeNature != ''">#{brigadeNature},</if>
187
         <if test="brigadeNature != null and brigadeNature != ''">#{brigadeNature},</if>
188
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">#{isFunctionalDept},</if>
181
         sysdate()
189
         sysdate()
182
         )
190
         )
183
     </insert>
191
     </insert>
@@ -197,6 +205,7 @@
197
             <if test="deptType != null and deptType != ''">dept_type = #{deptType},</if>
205
             <if test="deptType != null and deptType != ''">dept_type = #{deptType},</if>
198
             <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc = #{deptTypeDesc},</if>
206
             <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc = #{deptTypeDesc},</if>
199
             <if test="brigadeNature != null and brigadeNature != ''">brigade_nature = #{brigadeNature},</if>
207
             <if test="brigadeNature != null and brigadeNature != ''">brigade_nature = #{brigadeNature},</if>
208
+            <if test="isFunctionalDept != null and isFunctionalDept != ''">is_functional_dept = #{isFunctionalDept},</if>
200
             update_time = sysdate()
209
             update_time = sysdate()
201
         </set>
210
         </set>
202
         where dept_id = #{deptId}
211
         where dept_id = #{deptId}
@@ -264,6 +273,7 @@
264
         d.dept_type,
273
         d.dept_type,
265
         d.dept_type_desc,
274
         d.dept_type_desc,
266
         d.brigade_nature,
275
         d.brigade_nature,
276
+        d.is_functional_dept,
267
         (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
277
         (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
268
         from sys_dept d
278
         from sys_dept d
269
         where d.dept_id in
279
         where d.dept_id in