Просмотр исходного кода

开发

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
24bb79814b

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_change_dun"/>
+    <table schema="aft" tableName="personnel_dossier"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

+ 14 - 12
src/main/java/com/goafanti/common/dao/PersonnelDossierMapper.java

@@ -10,72 +10,74 @@ import org.apache.ibatis.annotations.Param;
 public interface PersonnelDossierMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	long countByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int deleteByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int insert(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int insertSelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	List<PersonnelDossier> selectByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	PersonnelDossier selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") PersonnelDossier record,
 			@Param("example") PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByExample(@Param("record") PersonnelDossier record, @Param("example") PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByPrimaryKey(PersonnelDossier record);
 
-	int checkDoorId(Integer doorId);
+	int checkDoorId(@Param("doorId")Integer doorId, @Param("id")Integer id);
 
 	OutPersonnelBo selectBypdId(Integer id);
+
+	int checkEmployeeId(@Param("employeeId")Integer employeeId, @Param("id")Integer id);
 }

+ 40 - 48
src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
@@ -44,14 +44,13 @@
     <result column="star" jdbcType="INTEGER" property="star" />
     <result column="allowance" jdbcType="DECIMAL" property="allowance" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="welfare_annex_url" jdbcType="VARCHAR" property="welfareAnnexUrl" />
-    <result column="welfare_annex_name" jdbcType="VARCHAR" property="welfareAnnexName" />
+    <result column="employee_id" jdbcType="INTEGER" property="employeeId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -85,7 +84,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -119,20 +118,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     id, aid, door_id, name, birthday, sex, mobile, fixed_tel, nation, residence_province, 
     residence_city, residence_area, residence_address, native_place_province, native_place_city, 
     now_province, now_city, now_area, now_address, id_card, certification_authority, 
     marriage, political_outlook, son, girl, status, system, job_nature, job_nature_remarks, 
-    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time, welfare_annex_url, 
-    welfare_annex_name
+    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time, employee_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelDossierExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select
     <if test="distinct">
@@ -151,7 +149,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -162,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     delete from personnel_dossier
     where id = #{id,jdbcType=INTEGER}
@@ -171,7 +169,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     delete from personnel_dossier
     <if test="_parameter != null">
@@ -182,7 +180,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     insert into personnel_dossier (id, aid, door_id, 
       name, birthday, sex, 
@@ -196,8 +194,7 @@
       system, job_nature, job_nature_remarks, 
       entry_time, promotion_time, company, 
       lvl, jobs, star, allowance, 
-      create_time, welfare_annex_url, welfare_annex_name
-      )
+      create_time, employee_id)
     values (#{id,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{doorId,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{birthday,jdbcType=TIMESTAMP}, #{sex,jdbcType=INTEGER}, 
       #{mobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{nation,jdbcType=VARCHAR}, 
@@ -210,14 +207,13 @@
       #{system,jdbcType=INTEGER}, #{jobNature,jdbcType=INTEGER}, #{jobNatureRemarks,jdbcType=VARCHAR}, 
       #{entryTime,jdbcType=TIMESTAMP}, #{promotionTime,jdbcType=TIMESTAMP}, #{company,jdbcType=VARCHAR}, 
       #{lvl,jdbcType=INTEGER}, #{jobs,jdbcType=INTEGER}, #{star,jdbcType=INTEGER}, #{allowance,jdbcType=DECIMAL}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{welfareAnnexUrl,jdbcType=VARCHAR}, #{welfareAnnexName,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{employeeId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelDossier">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     insert into personnel_dossier
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -332,11 +328,8 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="welfareAnnexUrl != null">
-        welfare_annex_url,
-      </if>
-      <if test="welfareAnnexName != null">
-        welfare_annex_name,
+      <if test="employeeId != null">
+        employee_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -451,11 +444,8 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="welfareAnnexUrl != null">
-        #{welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="welfareAnnexName != null">
-        #{welfareAnnexName,jdbcType=VARCHAR},
+      <if test="employeeId != null">
+        #{employeeId,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -463,7 +453,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select count(*) from personnel_dossier
     <if test="_parameter != null">
@@ -474,7 +464,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -589,11 +579,8 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.welfareAnnexUrl != null">
-        welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.welfareAnnexName != null">
-        welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR},
+      <if test="record.employeeId != null">
+        employee_id = #{record.employeeId,jdbcType=INTEGER},
       </if>
     </set>
     <if test="_parameter != null">
@@ -604,7 +591,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     set id = #{record.id,jdbcType=INTEGER},
@@ -644,8 +631,7 @@
       star = #{record.star,jdbcType=INTEGER},
       allowance = #{record.allowance,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
-      welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR}
+      employee_id = #{record.employeeId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -654,7 +640,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -766,11 +752,8 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="welfareAnnexUrl != null">
-        welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="welfareAnnexName != null">
-        welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR},
+      <if test="employeeId != null">
+        employee_id = #{employeeId,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -779,7 +762,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     set aid = #{aid,jdbcType=VARCHAR},
@@ -818,13 +801,22 @@
       star = #{star,jdbcType=INTEGER},
       allowance = #{allowance,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
-      welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR}
+      employee_id = #{employeeId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <select id="checkDoorId" resultType="java.lang.Integer">
   select count(*) from personnel_dossier where door_id= #{doorId,jdbcType=INTEGER}
+  <if test="id != null">
+  and id != #{id}
+  </if> 
+  </select>
+  
+  <select id="checkEmployeeId" resultType="java.lang.Integer">
+  select count(*) from personnel_dossier where employee_id= #{employeeId,jdbcType=INTEGER} 
+<if test="id != null">
+  and id != #{id}
+  </if>  
   </select>
   
   <select id="selectPersonnelByList" resultType="com.goafanti.personnel.bo.OutPersonnelListBo">
@@ -975,7 +967,7 @@
 	select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.nation,a.marriage,a.job_nature jobNature,
 	a.job_nature_remarks jobNatureRemarks, b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,a.jobs,
-	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
+	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,a.employee_id employeeId,
 	d.school,d.major,d.title,m.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
 	date_format(m.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,m.welfare_remarks welfareRemarks,
 	a.certification_authority certificationAuthority, a.residence_province residenceProvince,m.welfare_annex_name welfareAnnexName,

+ 124 - 147
src/main/java/com/goafanti/common/model/PersonnelDossier.java

@@ -7,204 +7,199 @@ public class PersonnelDossier {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer doorId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date birthday;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String nation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String residenceAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nativePlaceProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nativePlaceCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String nowAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String idCard;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String certificationAuthority;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer marriage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer politicalOutlook;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer son;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer girl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer system;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer jobNature;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String jobNatureRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date entryTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date promotionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String company;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer jobs;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer star;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private BigDecimal allowance;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	private String welfareAnnexUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	private String welfareAnnexName;
+	private Integer employeeId;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.id
 	 * @return  the value of personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -213,7 +208,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.id
 	 * @param id  the value for personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -222,7 +217,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.aid
 	 * @return  the value of personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -231,7 +226,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.aid
 	 * @param aid  the value for personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -240,7 +235,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.door_id
 	 * @return  the value of personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getDoorId() {
 		return doorId;
@@ -249,7 +244,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.door_id
 	 * @param doorId  the value for personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setDoorId(Integer doorId) {
 		this.doorId = doorId;
@@ -258,7 +253,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.name
 	 * @return  the value of personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getName() {
 		return name;
@@ -267,7 +262,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.name
 	 * @param name  the value for personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -276,7 +271,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.birthday
 	 * @return  the value of personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getBirthday() {
 		return birthday;
@@ -285,7 +280,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.birthday
 	 * @param birthday  the value for personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setBirthday(Date birthday) {
 		this.birthday = birthday;
@@ -294,7 +289,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.sex
 	 * @return  the value of personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSex() {
 		return sex;
@@ -303,7 +298,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.sex
 	 * @param sex  the value for personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSex(Integer sex) {
 		this.sex = sex;
@@ -312,7 +307,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.mobile
 	 * @return  the value of personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getMobile() {
 		return mobile;
@@ -321,7 +316,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.mobile
 	 * @param mobile  the value for personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -330,7 +325,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.fixed_tel
 	 * @return  the value of personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -339,7 +334,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.fixed_tel
 	 * @param fixedTel  the value for personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -348,7 +343,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.nation
 	 * @return  the value of personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getNation() {
 		return nation;
@@ -357,7 +352,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.nation
 	 * @param nation  the value for personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNation(String nation) {
 		this.nation = nation;
@@ -366,7 +361,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_province
 	 * @return  the value of personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceProvince() {
 		return residenceProvince;
@@ -375,7 +370,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_province
 	 * @param residenceProvince  the value for personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceProvince(Integer residenceProvince) {
 		this.residenceProvince = residenceProvince;
@@ -384,7 +379,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_city
 	 * @return  the value of personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceCity() {
 		return residenceCity;
@@ -393,7 +388,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_city
 	 * @param residenceCity  the value for personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceCity(Integer residenceCity) {
 		this.residenceCity = residenceCity;
@@ -402,7 +397,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_area
 	 * @return  the value of personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceArea() {
 		return residenceArea;
@@ -411,7 +406,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_area
 	 * @param residenceArea  the value for personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceArea(Integer residenceArea) {
 		this.residenceArea = residenceArea;
@@ -420,7 +415,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_address
 	 * @return  the value of personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getResidenceAddress() {
 		return residenceAddress;
@@ -429,7 +424,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_address
 	 * @param residenceAddress  the value for personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceAddress(String residenceAddress) {
 		this.residenceAddress = residenceAddress;
@@ -438,7 +433,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.native_place_province
 	 * @return  the value of personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNativePlaceProvince() {
 		return nativePlaceProvince;
@@ -447,7 +442,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.native_place_province
 	 * @param nativePlaceProvince  the value for personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNativePlaceProvince(Integer nativePlaceProvince) {
 		this.nativePlaceProvince = nativePlaceProvince;
@@ -456,7 +451,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.native_place_city
 	 * @return  the value of personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNativePlaceCity() {
 		return nativePlaceCity;
@@ -465,7 +460,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.native_place_city
 	 * @param nativePlaceCity  the value for personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNativePlaceCity(Integer nativePlaceCity) {
 		this.nativePlaceCity = nativePlaceCity;
@@ -474,7 +469,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_province
 	 * @return  the value of personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowProvince() {
 		return nowProvince;
@@ -483,7 +478,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_province
 	 * @param nowProvince  the value for personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowProvince(Integer nowProvince) {
 		this.nowProvince = nowProvince;
@@ -492,7 +487,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_city
 	 * @return  the value of personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowCity() {
 		return nowCity;
@@ -501,7 +496,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_city
 	 * @param nowCity  the value for personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowCity(Integer nowCity) {
 		this.nowCity = nowCity;
@@ -510,7 +505,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_area
 	 * @return  the value of personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowArea() {
 		return nowArea;
@@ -519,7 +514,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_area
 	 * @param nowArea  the value for personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowArea(Integer nowArea) {
 		this.nowArea = nowArea;
@@ -528,7 +523,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_address
 	 * @return  the value of personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getNowAddress() {
 		return nowAddress;
@@ -537,7 +532,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_address
 	 * @param nowAddress  the value for personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowAddress(String nowAddress) {
 		this.nowAddress = nowAddress;
@@ -546,7 +541,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.id_card
 	 * @return  the value of personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getIdCard() {
 		return idCard;
@@ -555,7 +550,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.id_card
 	 * @param idCard  the value for personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setIdCard(String idCard) {
 		this.idCard = idCard;
@@ -564,7 +559,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.certification_authority
 	 * @return  the value of personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getCertificationAuthority() {
 		return certificationAuthority;
@@ -573,7 +568,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.certification_authority
 	 * @param certificationAuthority  the value for personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCertificationAuthority(String certificationAuthority) {
 		this.certificationAuthority = certificationAuthority;
@@ -582,7 +577,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.marriage
 	 * @return  the value of personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getMarriage() {
 		return marriage;
@@ -591,7 +586,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.marriage
 	 * @param marriage  the value for personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setMarriage(Integer marriage) {
 		this.marriage = marriage;
@@ -600,7 +595,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.political_outlook
 	 * @return  the value of personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getPoliticalOutlook() {
 		return politicalOutlook;
@@ -609,7 +604,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.political_outlook
 	 * @param politicalOutlook  the value for personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setPoliticalOutlook(Integer politicalOutlook) {
 		this.politicalOutlook = politicalOutlook;
@@ -618,7 +613,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.son
 	 * @return  the value of personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSon() {
 		return son;
@@ -627,7 +622,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.son
 	 * @param son  the value for personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSon(Integer son) {
 		this.son = son;
@@ -636,7 +631,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.girl
 	 * @return  the value of personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getGirl() {
 		return girl;
@@ -645,7 +640,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.girl
 	 * @param girl  the value for personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setGirl(Integer girl) {
 		this.girl = girl;
@@ -654,7 +649,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.status
 	 * @return  the value of personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -663,7 +658,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.status
 	 * @param status  the value for personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -672,7 +667,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.system
 	 * @return  the value of personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSystem() {
 		return system;
@@ -681,7 +676,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.system
 	 * @param system  the value for personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSystem(Integer system) {
 		this.system = system;
@@ -690,7 +685,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.job_nature
 	 * @return  the value of personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getJobNature() {
 		return jobNature;
@@ -699,7 +694,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.job_nature
 	 * @param jobNature  the value for personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobNature(Integer jobNature) {
 		this.jobNature = jobNature;
@@ -708,7 +703,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.job_nature_remarks
 	 * @return  the value of personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getJobNatureRemarks() {
 		return jobNatureRemarks;
@@ -717,7 +712,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.job_nature_remarks
 	 * @param jobNatureRemarks  the value for personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobNatureRemarks(String jobNatureRemarks) {
 		this.jobNatureRemarks = jobNatureRemarks;
@@ -726,7 +721,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.entry_time
 	 * @return  the value of personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getEntryTime() {
 		return entryTime;
@@ -735,7 +730,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.entry_time
 	 * @param entryTime  the value for personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setEntryTime(Date entryTime) {
 		this.entryTime = entryTime;
@@ -744,7 +739,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.promotion_time
 	 * @return  the value of personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getPromotionTime() {
 		return promotionTime;
@@ -753,7 +748,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.promotion_time
 	 * @param promotionTime  the value for personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setPromotionTime(Date promotionTime) {
 		this.promotionTime = promotionTime;
@@ -762,7 +757,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.company
 	 * @return  the value of personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getCompany() {
 		return company;
@@ -771,7 +766,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.company
 	 * @param company  the value for personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCompany(String company) {
 		this.company = company;
@@ -780,7 +775,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.lvl
 	 * @return  the value of personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -789,7 +784,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.lvl
 	 * @param lvl  the value for personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -798,7 +793,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.jobs
 	 * @return  the value of personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getJobs() {
 		return jobs;
@@ -807,7 +802,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.jobs
 	 * @param jobs  the value for personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobs(Integer jobs) {
 		this.jobs = jobs;
@@ -816,7 +811,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.star
 	 * @return  the value of personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getStar() {
 		return star;
@@ -825,7 +820,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.star
 	 * @param star  the value for personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setStar(Integer star) {
 		this.star = star;
@@ -834,7 +829,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.allowance
 	 * @return  the value of personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public BigDecimal getAllowance() {
 		return allowance;
@@ -843,7 +838,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.allowance
 	 * @param allowance  the value for personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setAllowance(BigDecimal allowance) {
 		this.allowance = allowance;
@@ -852,7 +847,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.create_time
 	 * @return  the value of personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -861,45 +856,27 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.create_time
 	 * @param createTime  the value for personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.welfare_annex_url
-	 * @return  the value of personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	public String getWelfareAnnexUrl() {
-		return welfareAnnexUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.welfare_annex_url
-	 * @param welfareAnnexUrl  the value for personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	public void setWelfareAnnexUrl(String welfareAnnexUrl) {
-		this.welfareAnnexUrl = welfareAnnexUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.welfare_annex_name
-	 * @return  the value of personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.employee_id
+	 * @return  the value of personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	public String getWelfareAnnexName() {
-		return welfareAnnexName;
+	public Integer getEmployeeId() {
+		return employeeId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.welfare_annex_name
-	 * @param welfareAnnexName  the value for personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.employee_id
+	 * @param employeeId  the value for personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	public void setWelfareAnnexName(String welfareAnnexName) {
-		this.welfareAnnexName = welfareAnnexName;
+	public void setEmployeeId(Integer employeeId) {
+		this.employeeId = employeeId;
 	}
 }

+ 40 - 120
src/main/java/com/goafanti/common/model/PersonnelDossierExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class PersonnelDossierExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public PersonnelDossierExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2494,150 +2494,70 @@ public class PersonnelDossierExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIsNull() {
-			addCriterion("welfare_annex_url is null");
+		public Criteria andEmployeeIdIsNull() {
+			addCriterion("employee_id is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIsNotNull() {
-			addCriterion("welfare_annex_url is not null");
+		public Criteria andEmployeeIdIsNotNull() {
+			addCriterion("employee_id is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlEqualTo(String value) {
-			addCriterion("welfare_annex_url =", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdEqualTo(Integer value) {
+			addCriterion("employee_id =", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotEqualTo(String value) {
-			addCriterion("welfare_annex_url <>", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdNotEqualTo(Integer value) {
+			addCriterion("employee_id <>", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlGreaterThan(String value) {
-			addCriterion("welfare_annex_url >", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdGreaterThan(Integer value) {
+			addCriterion("employee_id >", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlGreaterThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_url >=", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("employee_id >=", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLessThan(String value) {
-			addCriterion("welfare_annex_url <", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdLessThan(Integer value) {
+			addCriterion("employee_id <", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLessThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_url <=", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdLessThanOrEqualTo(Integer value) {
+			addCriterion("employee_id <=", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLike(String value) {
-			addCriterion("welfare_annex_url like", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdIn(List<Integer> values) {
+			addCriterion("employee_id in", values, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotLike(String value) {
-			addCriterion("welfare_annex_url not like", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdNotIn(List<Integer> values) {
+			addCriterion("employee_id not in", values, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIn(List<String> values) {
-			addCriterion("welfare_annex_url in", values, "welfareAnnexUrl");
+		public Criteria andEmployeeIdBetween(Integer value1, Integer value2) {
+			addCriterion("employee_id between", value1, value2, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotIn(List<String> values) {
-			addCriterion("welfare_annex_url not in", values, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexUrlBetween(String value1, String value2) {
-			addCriterion("welfare_annex_url between", value1, value2, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexUrlNotBetween(String value1, String value2) {
-			addCriterion("welfare_annex_url not between", value1, value2, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIsNull() {
-			addCriterion("welfare_annex_name is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIsNotNull() {
-			addCriterion("welfare_annex_name is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameEqualTo(String value) {
-			addCriterion("welfare_annex_name =", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotEqualTo(String value) {
-			addCriterion("welfare_annex_name <>", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameGreaterThan(String value) {
-			addCriterion("welfare_annex_name >", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameGreaterThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_name >=", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLessThan(String value) {
-			addCriterion("welfare_annex_name <", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLessThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_name <=", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLike(String value) {
-			addCriterion("welfare_annex_name like", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotLike(String value) {
-			addCriterion("welfare_annex_name not like", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIn(List<String> values) {
-			addCriterion("welfare_annex_name in", values, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotIn(List<String> values) {
-			addCriterion("welfare_annex_name not in", values, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameBetween(String value1, String value2) {
-			addCriterion("welfare_annex_name between", value1, value2, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotBetween(String value1, String value2) {
-			addCriterion("welfare_annex_name not between", value1, value2, "welfareAnnexName");
+		public Criteria andEmployeeIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("employee_id not between", value1, value2, "employeeId");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 7 - 0
src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java

@@ -61,6 +61,7 @@ public class OutPersonnelListBo {
 	private String insuranceEndTimes;
 	private String fundStartTimes;
 	private String fundEndTimes;
+	private Integer employeeId;
 	
 	
 	public String getInsuranceStartTimes() {
@@ -535,6 +536,12 @@ public class OutPersonnelListBo {
 	public void setJobNatureRemarks(String jobNatureRemarks) {
 		this.jobNatureRemarks = jobNatureRemarks;
 	}
+	public Integer getEmployeeId() {
+		return employeeId;
+	}
+	public void setEmployeeId(Integer employeeId) {
+		this.employeeId = employeeId;
+	}
 	
 	
 }

+ 61 - 5
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -1,6 +1,5 @@
 package com.goafanti.personnel.controller;
 
-import java.text.ParseException;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -47,11 +46,24 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
 			return res;
 		}
-		int x=personnelService.checkDoorId(i.getDoorId());
-		if (x>0) {
+		if (i.getDoorId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		if (i.getEmployeeId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		int x=personnelService.checkDoorId(i.getDoorId(),i.getId());
+		if(x>0) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
 			return res;
 		}
+		int y=personnelService.checkEmployeeId(i.getEmployeeId(),i.getId());
+		if (y>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
 		if ( !StringUtils.isBlank(i.getBirthdays())) {
 				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
 			
@@ -63,13 +75,13 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 门禁检测
 	 */
 	@RequestMapping(value ="/checkDoorId", method =RequestMethod.GET)
-	public Result checkDoorId(Integer doorId) {
+	public Result checkDoorId(Integer doorId,Integer id) {
 		Result res = new Result();
 		if (null==doorId) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
 			return res;
 		}
-		int i=personnelService.checkDoorId(doorId);
+		int i=personnelService.checkDoorId(doorId,id);
 		if (i>0) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
 			return res;
@@ -78,11 +90,55 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	}
 	
 	/**
+	 * 员工编号检测
+	 */
+	@RequestMapping(value ="/checkEmployeeId", method =RequestMethod.GET)
+	public Result checkEmployeeId(Integer employeeId,Integer id) {
+		Result res = new Result();
+		if (null==employeeId) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		int i=personnelService.checkEmployeeId(employeeId,id);
+		if (i>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		return res.data(i);
+	}
+	
+	/**
 	 * 修改人事档案
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result updatePersonnel(InputPersonnelBo i){
 		Result res = new Result();
+		if (StringUtils.isBlank(i.getName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
+			return res;
+		}
+		if (i.getDoorId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		if (i.getEmployeeId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		int x=personnelService.checkDoorId(i.getDoorId(),i.getId());
+		if(x>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		int y=personnelService.checkEmployeeId(i.getEmployeeId(),i.getId());
+		if (y>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		if ( !StringUtils.isBlank(i.getBirthdays())) {
+				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
+			
+		}
 		if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
 		if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
 		if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));

+ 3 - 1
src/main/java/com/goafanti/personnel/service/PersonnelService.java

@@ -32,7 +32,7 @@ public interface PersonnelService {
 
 	int updatePromotion(InputPersonnelPromotionBo i);
 
-	int checkDoorId(Integer doorId);
+	int checkDoorId(Integer doorId, Integer id);
 
 	int updateContract(InputPersonnelContractBo i);
 
@@ -53,5 +53,7 @@ public interface PersonnelService {
 
 	int updateWelfare(IntpersonnelWelfareBo i);
 
+	int checkEmployeeId(Integer employeeId, Integer id);
+
 
 }

+ 9 - 2
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -169,8 +169,13 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	}
 
 	@Override
-	public int checkDoorId(Integer doorId) {
-		int i=personnelDossierMapper.checkDoorId(doorId);
+	public int checkDoorId(Integer doorId,Integer id) {
+		int i=personnelDossierMapper.checkDoorId(doorId,id);
+		return i;
+	}
+	@Override
+	public int checkEmployeeId(Integer employeeId,Integer id) {
+		int i=personnelDossierMapper.checkEmployeeId(employeeId,id);
 		return i;
 	}
 
@@ -460,4 +465,6 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}
 		return 1;
 	}
+
+
 }