Merge remote-tracking branch 'origin/feature/dev' into feature/dev

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/AssessmentTeamEnum.java

@@ -0,0 +1,49 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 考核组枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum AssessmentTeamEnum {
+
+    SUPERVISOR("SUPERVISOR", "主管"),
+    TEAM_LEADER("TEAM_LEADER", "班组长"),
+    SECURITY_INSPECTOR_AND_X_RAY_PASSENGER_INSPECTION_STAFF("SECURITY_INSPECTOR_AND_X_RAY_PASSENGER_INSPECTION_STAFF", "安检员兼X光机操作员（旅检、员工）"),
+    SECURITY_INSPECTOR_PASSENGER_INSPECTION_STAFF("SECURITY_INSPECTOR_PASSENGER_INSPECTION_STAFF", "安检员（旅检、员工）"),
+    LUGGAGE_INSPECTION("LUGGAGE_INSPECTION", "行检"),
+    SECURITY_INSPECTOR_AND_X_RAY_CROSSING("SECURITY_INSPECTOR_AND_X_RAY_CROSSING", "安检员兼X光机操作员（道口）"),
+    SECURITY_INSPECTOR_CROSSING("SECURITY_INSPECTOR_CROSSING", "安检员（道口）"),
+    SECURITY_INSPECTOR_AND_X_RAY_FREIGHT("SECURITY_INSPECTOR_AND_X_RAY_FREIGHT", "安检员兼X光机操作员（货运）"),
+    SECURITY_INSPECTOR_FREIGHT("SECURITY_INSPECTOR_FREIGHT", "安检员（货运）"),
+    DORMITORY_MANAGEMENT("DORMITORY_MANAGEMENT", "宿舍管理"),
+    GENERAL_ADMINISTRATION("GENERAL_ADMINISTRATION", "综管"),
+    QUALITY_CONTROL("QUALITY_CONTROL", "品控"),
+    TRAINING("TRAINING", "培训"),
+    EQUIPMENT("EQUIPMENT", "设备");
+
+    private final String code;
+    private final String desc;
+
+    public static AssessmentTeamEnum getByCode(String code) {
+        for (AssessmentTeamEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static AssessmentTeamEnum getByDesc(String desc) {
+        for (AssessmentTeamEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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-common/src/main/java/com/sundot/airport/common/enums/EmploymentTypeEnum.java

@@ -0,0 +1,38 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用工形式枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum EmploymentTypeEnum {
+
+    DISPATCHED_WORKER("DISPATCHED_WORKER", "派遣工"),
+    TEAM_LEADER("REGULAR_EMPLOYEE", "正式工"),
+    INTERN("INTERN", "实习生（不参与考核）");
+
+    private final String code;
+    private final String desc;
+
+    public static EmploymentTypeEnum getByCode(String code) {
+        for (EmploymentTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static EmploymentTypeEnum getByDesc(String desc) {
+        for (EmploymentTypeEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,66 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 岗位枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum PostEnum {
+
+    SECRETARY("SECRETARY", "书记"),
+    GENERAL_MANAGER("GENERAL_MANAGER", "总经理"),
+    DEPUTY_GENERAL_MANAGER("DEPUTY_GENERAL_MANAGER", "副总经理"),
+    GENERAL_MANAGER_ASSISTANT("GENERAL_MANAGER_ASSISTANT", "总经理助理"),
+    MANAGER("MANAGER", "经理"),
+    TRAINING_MANAGEMENT_SENIOR_SUPERVISOR("TRAINING_MANAGEMENT_SENIOR_SUPERVISOR", "培训管理资深主管"),
+    SECURITY_CHECK_ASSISTANT_MANAGER("SECURITY_CHECK_ASSISTANT_MANAGER", "安检助理经理"),
+    QUALITY_CONTROL_SENIOR_SUPERVISOR("QUALITY_CONTROL_SENIOR_SUPERVISOR", "品质控制资深主管"),
+    QUALITY_CONTROL_ASSISTANT_MANAGER("QUALITY_CONTROL_ASSISTANT_MANAGER", "品质控制助理经理"),
+    PARTY_AND_MASSES_SENIOR_SUPERVISOR("PARTY_AND_MASSES_SENIOR_SUPERVISOR", "党群资深主管"),
+    SECURITY_CHECK_SUPERVISOR("SECURITY_CHECK_SUPERVISOR", "安检主管"),
+    QUALITY_CONTROL_ASSISTANT("QUALITY_CONTROL_ASSISTANT", "品质控制助理"),
+    COMPREHENSIVE_SERVICE_SUPERVISOR("COMPREHENSIVE_SERVICE_SUPERVISOR", "综合服务主管"),
+    HR_BP_SENIOR("HR_BP_SENIOR", "人资BP资深"),
+    SUPERVISOR("SUPERVISOR", "主管"),
+    HR_BP_ASSISTANT_MANAGER("HR_BP_ASSISTANT_MANAGER", "人资BP助理经理"),
+    EQUIPMENT_MAINTENANCE_SUPERVISOR("EQUIPMENT_MAINTENANCE_SUPERVISOR", "设备维修主管"),
+    EQUIPMENT_MAINTENANCE_TECHNICIAN("EQUIPMENT_MAINTENANCE_TECHNICIAN", "设备维修员"),
+    EQUIPMENT_MAINTENANCE_SENIOR_SUPERVISOR("EQUIPMENT_MAINTENANCE_SENIOR_SUPERVISOR", "设备维修资深主管"),
+    SECURITY_CHECK_OFFICER("SECURITY_CHECK_OFFICER", "安检员"),
+    PROFESSIONAL_MANAGER("PROFESSIONAL_MANAGER", "专业经理"),
+    SECURITY_CHECK_OFFICER_AND_X_RAY_MACHINE_OPERATOR("SECURITY_CHECK_OFFICER_AND_X_RAY_MACHINE_OPERATOR", "安检员兼X光机操作员"),
+    SECURITY_CHECK_SENIOR_SUPERVISOR("SECURITY_CHECK_SENIOR_SUPERVISOR", "安检资深主管"),
+    DEPUTY_MANAGER("DEPUTY_MANAGER", "副经理"),
+    TRAINING_MANAGEMENT_SUPERVISOR("TRAINING_MANAGEMENT_SUPERVISOR", "培训管理主管"),
+    TRAINING_MANAGEMENT_LEVEL_1_SPECIALIST("TRAINING_MANAGEMENT_LEVEL_1_SPECIALIST", "培训管理一级专员"),
+    OPERATION_DISPATCHER("OPERATION_DISPATCHER", "运行调度员"),
+    QUALITY_CONTROL_LEVEL_2_SPECIALIST("QUALITY_CONTROL_LEVEL_2_SPECIALIST", "品质控制二级专员"),
+    TRAINING_BP_SENIOR_SUPERVISOR("TRAINING_BP_SENIOR_SUPERVISOR", "培训BP资深主管"),
+    SERVICE_MANAGEMENT_LEVEL_1_SPECIALIST("SERVICE_MANAGEMENT_LEVEL_1_SPECIALIST", "服务管理一级专员"),
+    BASIC_SECURITY_CHECK_OFFICER("BASIC_SECURITY_CHECK_OFFICER", "基础安检员");
+
+    private final String code;
+    private final String desc;
+
+    public static PostEnum getByCode(String code) {
+        for (PostEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static PostEnum getByDesc(String desc) {
+        for (PostEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 系统是否枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum SysYesNoEnum {
+
+    Y("Y", "是"),
+    N("N", "否");
+
+    private final String code;
+    private final String desc;
+
+    public static SysYesNoEnum getByCode(String code) {
+        for (SysYesNoEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static SysYesNoEnum getByDesc(String desc) {
+        for (SysYesNoEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,76 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 工作区域枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum WorkAreaEnum {
+
+    DEPARTMENT_LEADER("DEPARTMENT_LEADER", "部门领导"),
+    MANAGEMENT_CADRE("MANAGEMENT_CADRE", "管理干部"),
+    BUSINESS_TRAINING("BUSINESS_TRAINING", "业务培训"),
+    ASSISTANT_MANAGER("ASSISTANT_MANAGER", "助理经理"),
+    QUALITY_CONTROL("QUALITY_CONTROL", "质量控制"),
+    PARTY_BUILDING("PARTY_BUILDING", "党建"),
+    TRAVEL_INSPECTION("TRAVEL_INSPECTION", "旅检"),
+    EQUIPMENT_MAINTENANCE("EQUIPMENT_MAINTENANCE", "设备维修"),
+    BAGGAGE_INSPECTION("BAGGAGE_INSPECTION", "行检"),
+    EMPLOYEE("EMPLOYEE", "员工"),
+    ACCESS_GATE("ACCESS_GATE", "道口"),
+    SUPERVISOR("SUPERVISOR", "主管"),
+    DEPUTY_MANAGER_T2("DEPUTY_MANAGER_T2", "副经理（T2）"),
+    INTERNAL_STAFF("INTERNAL_STAFF", "内勤"),
+    FREIGHT("FREIGHT", "货运"),
+    SENIOR_SUPERVISOR("SENIOR_SUPERVISOR", "资深主管"),
+    PARTURIENT_WOMAN("PARTURIENT_WOMAN", "产妇"),
+    BASIC("BASIC", "基础"),
+    VIP("VIP", "贵宾"),
+    PART_TIME_QUALITY_CONTROL("PART_TIME_QUALITY_CONTROL", "兼职品控"),
+    OPERATION_DISPATCH("OPERATION_DISPATCH", "运调"),
+    SUPERVISOR_BAGGAGE_INSPECTION_VIP_EMPLOYEE("SUPERVISOR_BAGGAGE_INSPECTION_VIP_EMPLOYEE", "主管（行检、贵宾、员工）"),
+    DEPUTY_MANAGER("DEPUTY_MANAGER", "副经理"),
+    SUPERVISOR_TRAVEL_INSPECTION("SUPERVISOR_TRAVEL_INSPECTION", "主管（旅检）"),
+    MANAGER("MANAGER", "经理"),
+    PREGNANT_WOMAN("PREGNANT_WOMAN", "孕妇"),
+    FIRST_FLOOR_EMPLOYEE("FIRST_FLOOR_EMPLOYEE", "一楼员工"),
+    BRIGADE_QUALITY_CONTROL("BRIGADE_QUALITY_CONTROL", "大队品控"),
+    SUPERVISOR_BAGGAGE_INSPECTION_EMPLOYEE("SUPERVISOR_BAGGAGE_INSPECTION_EMPLOYEE", "主管（行检、员工）"),
+    VIP_PREGNANT_WOMAN("VIP_PREGNANT_WOMAN", "贵宾（孕妇）"),
+    EMPLOYEE_PREGNANT_WOMAN("EMPLOYEE_PREGNANT_WOMAN", "员工（孕妇）"),
+    ABNORMAL_BEHAVIOR_SHOPPING_CART_INSPECTION("ABNORMAL_BEHAVIOR_SHOPPING_CART_INSPECTION", "异常行为（手推车检查）"),
+    ABNORMAL("ABNORMAL", "异常"),
+    QUALITY_INSPECTION("QUALITY_INSPECTION", "品控"),
+    SUPERVISOR_INTERNATIONAL("SUPERVISOR_INTERNATIONAL", "主管（国际）"),
+    VIP_CHANNEL("VIP_CHANNEL", "贵宾通道"),
+    EMPLOYEE_CHANNEL("EMPLOYEE_CHANNEL", "员工通道"),
+    SECONDMENT("SECONDMENT", "借调"),
+    BASIC_POSITION("BASIC_POSITION", "基础岗"),
+    OTHER_POSITIONS("OTHER_POSITIONS", "其他岗位");
+
+
+    private final String code;
+    private final String desc;
+
+    public static WorkAreaEnum getByCode(String code) {
+        for (WorkAreaEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static WorkAreaEnum getByDesc(String desc) {
+        for (WorkAreaEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -25,8 +25,13 @@ import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.enums.AssessmentTeamEnum;
 import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.common.enums.EmploymentTypeEnum;
+import com.sundot.airport.common.enums.PostEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.SysYesNoEnum;
+import com.sundot.airport.common.enums.WorkAreaEnum;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationItemDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
@@ -504,6 +509,21 @@ public class SysUserServiceImpl implements ISysUserService {
                     String password = configService.selectConfigByKey("sys.user.initPassword");
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
+                    if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
+                        user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getEmploymentTypeDesc())) {
+                        user.setEmploymentType(EmploymentTypeEnum.getByDesc(user.getEmploymentTypeDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getTakeAssessmentDesc())) {
+                        user.setTakeAssessment(SysYesNoEnum.getByDesc(user.getTakeAssessmentDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getPostDesc())) {
+                        user.setPost(PostEnum.getByDesc(user.getPostDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getWorkAreaDesc())) {
+                        user.setWorkArea(WorkAreaEnum.getByDesc(user.getWorkAreaDesc()).getCode());
+                    }
                     userMapper.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
@@ -514,6 +534,21 @@ public class SysUserServiceImpl implements ISysUserService {
                     deptService.checkDeptDataScope(user.getDeptId());
                     user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
+                    if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
+                        user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getEmploymentTypeDesc())) {
+                        user.setEmploymentType(EmploymentTypeEnum.getByDesc(user.getEmploymentTypeDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getTakeAssessmentDesc())) {
+                        user.setTakeAssessment(SysYesNoEnum.getByDesc(user.getTakeAssessmentDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getPostDesc())) {
+                        user.setPost(PostEnum.getByDesc(user.getPostDesc()).getCode());
+                    }
+                    if (StringUtils.isNotEmpty(user.getWorkAreaDesc())) {
+                        user.setWorkArea(WorkAreaEnum.getByDesc(user.getWorkAreaDesc()).getCode());
+                    }
                     userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");

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

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

@@ -66,6 +66,15 @@
         <result property="securityInspectionPosition" column="security_inspection_position"/>
         <result property="workRewardsNumber" column="work_rewards_number"/>
         <result property="workPenaltiesNumber" column="work_penalties_number"/>
+        <result property="assessmentTeam" column="assessment_team"/>
+        <result property="xrayMachineOperatorStartTime" column="xray_machine_operator_start_time"/>
+        <result property="employmentType" column="employment_type"/>
+        <result property="takeAssessment" column="take_assessment"/>
+        <result property="exemptTakeAssessmentStartTime" column="exempt_take_assessment_start_time"/>
+        <result property="exemptTakeAssessmentEndTime" column="exempt_take_assessment_end_time"/>
+        <result property="exemptTakeAssessmentRemark" column="exempt_take_assessment_remark"/>
+        <result property="post" column="post"/>
+        <result property="workArea" column="work_area"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -147,6 +156,15 @@
                u.security_inspection_position,
                u.work_rewards_number,
                u.work_penalties_number,
+               u.assessment_team,
+               u.xray_machine_operator_start_time,
+               u.employment_type,
+               u.take_assessment,
+               u.exempt_take_assessment_start_time,
+               u.exempt_take_assessment_end_time,
+               u.exempt_take_assessment_remark,
+               u.post,
+               u.work_area,
                d.dept_id,
                d.parent_id,
                d.ancestors,
@@ -186,6 +204,9 @@
         u.subordinate_evaluation_interpersonal_interaction,u.subordinate_evaluation_growth_potential,
         u.schooling,u.political_review_situation,u.start_working_date,
         u.security_check_start_date,u.security_inspection_position,u.work_rewards_number,u.work_penalties_number,
+        u.assessment_team, u.xray_machine_operator_start_time, u.employment_type, u.take_assessment,
+        u.exempt_take_assessment_start_time, u.exempt_take_assessment_end_time, u.exempt_take_assessment_remark,
+        u.post, u.work_area,
         d.dept_name, d.leader from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
@@ -337,6 +358,24 @@
         <if test="workPenaltiesNumber != null">
             AND u.work_penalties_number= #{workPenaltiesNumber}
         </if>
+        <if test="assessmentTeam != null and assessmentTeam != ''">
+            AND u.assessment_team= #{assessmentTeam}
+        </if>
+        <if test="employmentType != null and employmentType != ''">
+            AND u.employment_type= #{employmentType}
+        </if>
+        <if test="takeAssessment != null and takeAssessment != ''">
+            AND u.take_assessment= #{takeAssessment}
+        </if>
+        <if test="exemptTakeAssessmentRemark != null and exemptTakeAssessmentRemark != ''">
+            AND u.exempt_take_assessment_remark like concat('%', #{exemptTakeAssessmentRemark}, '%')
+        </if>
+        <if test="post != null and post != ''">
+            AND u.post= #{post}
+        </if>
+        <if test="workArea != null and workArea != ''">
+            AND u.work_area= #{workArea}
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
@@ -769,6 +808,33 @@
             <if test="workPenaltiesNumber != null ">
                 work_penalties_number = #{workPenaltiesNumber},
             </if>
+            <if test="assessmentTeam != null ">
+                assessment_team = #{assessmentTeam},
+            </if>
+            <if test="xrayMachineOperatorStartTime != null ">
+                xray_machine_operator_start_time = #{xrayMachineOperatorStartTime},
+            </if>
+            <if test="employmentType != null ">
+                employment_type = #{employmentType},
+            </if>
+            <if test="takeAssessment != null ">
+                take_assessment = #{takeAssessment},
+            </if>
+            <if test="exemptTakeAssessmentStartTime != null ">
+                exempt_take_assessment_start_time = #{exemptTakeAssessmentStartTime},
+            </if>
+            <if test="exemptTakeAssessmentEndTime != null ">
+                exempt_take_assessment_end_time = #{exemptTakeAssessmentEndTime},
+            </if>
+            <if test="exemptTakeAssessmentRemark != null ">
+                exempt_take_assessment_remark = #{exemptTakeAssessmentRemark},
+            </if>
+            <if test="post != null ">
+                post = #{post},
+            </if>
+            <if test="workArea != null ">
+                work_area = #{workArea},
+            </if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
@@ -833,6 +899,15 @@
                         u.emergency_contact_name,
                         u.emergency_contact_phone,
                         u.emergency_contact_relationship,
+                        u.assessment_team,
+                        u.xray_machine_operator_start_time,
+                        u.employment_type,
+                        u.take_assessment,
+                        u.exempt_take_assessment_start_time,
+                        u.exempt_take_assessment_end_time,
+                        u.exempt_take_assessment_remark,
+                        u.post,
+                        u.work_area,
                         d.dept_id,
                         d.parent_id,
                         d.ancestors,
@@ -877,6 +952,15 @@
                u.emergency_contact_name,
                u.emergency_contact_phone,
                u.emergency_contact_relationship,
+               u.assessment_team,
+               u.xray_machine_operator_start_time,
+               u.employment_type,
+               u.take_assessment,
+               u.exempt_take_assessment_start_time,
+               u.exempt_take_assessment_end_time,
+               u.exempt_take_assessment_remark,
+               u.post,
+               u.work_area,
                d.dept_id,
                d.parent_id,
                d.ancestors,
@@ -965,6 +1049,15 @@
         su.user_name,
         su.nick_name,
         su.dept_id,
+        su.assessment_team,
+        su.xray_machine_operator_start_time,
+        su.employment_type,
+        su.take_assessment,
+        su.exempt_take_assessment_start_time,
+        su.exempt_take_assessment_end_time,
+        su.exempt_take_assessment_remark,
+        su.post,
+        su.work_area,
         d.dept_id,
         d.parent_id,
         d.ancestors,
@@ -1041,7 +1134,8 @@
           and sr.role_key in ('banzuzhang', 'SecurityCheck')
     </select>
 
-    <select id="homePageUserInfoByBrigadeId" resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
+    <select id="homePageUserInfoByBrigadeId"
+            resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
         select su.user_id      userId,
                su.user_name    userName,
                su.nick_name    nickName,