用户表新增入职时间、X射线操作员开始时间、专业、籍贯等字段

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

@@ -218,6 +218,36 @@ public class SysUser extends BaseEntity {
     private Date securityCheckStartDate;
 
     /**
+     * 入职时间
+     */
+    @Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date entryDate;
+
+    /**
+     * X射线操作员开始时间
+     */
+    @Excel(name = "X射线操作员开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xrayOperatorStarttime;
+
+    /**
+     * 专业
+     */
+    @Excel(name = "专业")
+    private String professional;
+
+    /**
+     * 籍贯
+     */
+    @Excel(name = "籍贯")
+    private String nativePlace;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /**
      * 安检工作岗位
      */
     private String securityInspectionPosition;
@@ -833,6 +863,46 @@ public class SysUser extends BaseEntity {
         this.securityCheckStartDate = securityCheckStartDate;
     }
 
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    public void setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public Date getXrayOperatorStarttime() {
+        return xrayOperatorStarttime;
+    }
+
+    public void setXrayOperatorStarttime(Date xrayOperatorStarttime) {
+        this.xrayOperatorStarttime = xrayOperatorStarttime;
+    }
+
+    public String getProfessional() {
+        return professional;
+    }
+
+    public void setProfessional(String professional) {
+        this.professional = professional;
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
     public String getSecurityInspectionPosition() {
         return securityInspectionPosition;
     }
@@ -923,6 +993,11 @@ public class SysUser extends BaseEntity {
                 .append("politicalReviewSituation", getPoliticalReviewSituation())
                 .append("startWorkingDate", getStartWorkingDate())
                 .append("securityCheckStartDate", getSecurityCheckStartDate())
+                .append("entryDate", getEntryDate())
+                .append("xrayOperatorStarttime", getXrayOperatorStarttime())
+                .append("professional", getProfessional())
+                .append("nativePlace", getNativePlace())
+                .append("nation", getNation())
                 .append("securityInspectionPosition", getSecurityInspectionPosition())
                 .append("workRewardsNumber", getWorkRewardsNumber())
                 .append("workPenaltiesNumber", getWorkPenaltiesNumber())

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

@@ -63,6 +63,11 @@
         <result property="politicalReviewSituation" column="political_review_situation"/>
         <result property="startWorkingDate" column="start_working_date"/>
         <result property="securityCheckStartDate" column="security_check_start_date"/>
+        <result property="entryDate" column="entry_date"/>
+        <result property="xrayOperatorStarttime" column="xray_operator_starttime"/>
+        <result property="professional" column="professional"/>
+        <result property="nativePlace" column="native_place"/>
+        <result property="nation" column="nation"/>
         <result property="securityInspectionPosition" column="security_inspection_position"/>
         <result property="workRewardsNumber" column="work_rewards_number"/>
         <result property="workPenaltiesNumber" column="work_penalties_number"/>
@@ -144,6 +149,11 @@
                u.political_review_situation,
                u.start_working_date,
                u.security_check_start_date,
+               u.entry_date,
+               u.xray_operator_starttime,
+               u.professional,
+               u.native_place,
+               u.nation,
                u.security_inspection_position,
                u.work_rewards_number,
                u.work_penalties_number,
@@ -185,7 +195,9 @@
         u.subordinate_evaluation_personality_trait, u.subordinate_evaluation_capability_performance,
         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.security_check_start_date,u.entry_date,u.xray_operator_starttime,
+        u.professional,u.native_place,u.nation,
+        u.security_inspection_position,u.work_rewards_number,u.work_penalties_number,
         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'
@@ -530,6 +542,21 @@
         <if test="securityCheckStartDate != null">
             security_check_start_date,
         </if>
+        <if test="entryDate != null">
+            entry_date,
+        </if>
+        <if test="xrayOperatorStarttime != null">
+            xray_operator_starttime,
+        </if>
+        <if test="professional != null and professional != ''">
+            professional,
+        </if>
+        <if test="nativePlace != null and nativePlace != ''">
+            native_place,
+        </if>
+        <if test="nation != null and nation != ''">
+            nation,
+        </if>
         <if test="securityInspectionPosition != null and securityInspectionPosition != ''">
             security_inspection_position,
         </if>
@@ -643,6 +670,21 @@
         <if test="securityCheckStartDate != null">
             #{securityCheckStartDate},
         </if>
+        <if test="entryDate != null">
+            #{entryDate},
+        </if>
+        <if test="xrayOperatorStarttime != null">
+            #{xrayOperatorStarttime},
+        </if>
+        <if test="professional != null and professional != ''">
+            #{professional},
+        </if>
+        <if test="nativePlace != null and nativePlace != ''">
+            #{nativePlace},
+        </if>
+        <if test="nation != null and nation != ''">
+            #{nation},
+        </if>
         <if test="securityInspectionPosition != null and securityInspectionPosition != ''">
             #{securityInspectionPosition},
         </if>
@@ -760,6 +802,21 @@
             <if test="securityCheckStartDate != null ">
                 security_check_start_date = #{securityCheckStartDate},
             </if>
+            <if test="entryDate != null">
+                entry_date = #{entryDate},
+            </if>
+            <if test="xrayOperatorStarttime != null">
+                xray_operator_starttime = #{xrayOperatorStarttime},
+            </if>
+            <if test="professional != null and professional != ''">
+                professional = #{professional},
+            </if>
+            <if test="nativePlace != null and nativePlace != ''">
+                native_place = #{nativePlace},
+            </if>
+            <if test="nation != null and nation != ''">
+                nation = #{nation},
+            </if>
             <if test="securityInspectionPosition != null and securityInspectionPosition!='' ">
                 security_inspection_position = #{securityInspectionPosition},
             </if>