Sfoglia il codice sorgente

人事福利开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 anni fa
parent
commit
bfd53d8497
20 ha cambiato i file con 3766 aggiunte e 1586 eliminazioni
  1. 1 1
      GeneratorConfig.xml
  2. 11 11
      src/main/java/com/goafanti/common/dao/PersonnelDossierMapper.java
  3. 75 0
      src/main/java/com/goafanti/common/dao/PersonnelMidMapper.java
  4. 61 77
      src/main/java/com/goafanti/common/dao/PersonnelWelfareMapper.java
  5. 68 44
      src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml
  6. 479 0
      src/main/java/com/goafanti/common/mapper/PersonnelMidMapper.xml
  7. 71 99
      src/main/java/com/goafanti/common/mapper/PersonnelWelfareMapper.xml
  8. 157 111
      src/main/java/com/goafanti/common/model/PersonnelDossier.java
  9. 156 16
      src/main/java/com/goafanti/common/model/PersonnelDossierExample.java
  10. 368 0
      src/main/java/com/goafanti/common/model/PersonnelMid.java
  11. 1332 0
      src/main/java/com/goafanti/common/model/PersonnelMidExample.java
  12. 161 295
      src/main/java/com/goafanti/common/model/PersonnelWelfare.java
  13. 672 853
      src/main/java/com/goafanti/common/model/PersonnelWelfareExample.java
  14. 58 0
      src/main/java/com/goafanti/personnel/bo/IntpersonnelWelfareBo.java
  15. 21 0
      src/main/java/com/goafanti/personnel/bo/PersonnelWelfareBo.java
  16. 5 6
      src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java
  17. 0 58
      src/main/java/com/goafanti/personnel/controller/IntpersonnelWelfareBo.java
  18. 1 1
      src/main/java/com/goafanti/personnel/service/PersonnelService.java
  19. 67 12
      src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java
  20. 2 2
      src/main/resources/props/config_local.properties

+ 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="personnel_dossier"/>
+    <table schema="aft" tableName="personnel_mid"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

@@ -10,68 +10,68 @@ 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	long countByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int deleteByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int insert(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int insertSelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	PersonnelDossier selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	int updateByPrimaryKey(PersonnelDossier record);
 

+ 75 - 0
src/main/java/com/goafanti/common/dao/PersonnelMidMapper.java

@@ -0,0 +1,75 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PersonnelMid;
+import com.goafanti.common.model.PersonnelMidExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PersonnelMidMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	long countByExample(PersonnelMidExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int deleteByExample(PersonnelMidExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int insert(PersonnelMid record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int insertSelective(PersonnelMid record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	List<PersonnelMid> selectByExample(PersonnelMidExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	PersonnelMid selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") PersonnelMid record, @Param("example") PersonnelMidExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int updateByExample(@Param("record") PersonnelMid record, @Param("example") PersonnelMidExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int updateByPrimaryKeySelective(PersonnelMid record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	int updateByPrimaryKey(PersonnelMid record);
+}

+ 61 - 77
src/main/java/com/goafanti/common/dao/PersonnelWelfareMapper.java

@@ -2,95 +2,79 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PersonnelWelfare;
 import com.goafanti.common.model.PersonnelWelfareExample;
+import com.goafanti.personnel.bo.PersonnelWelfareBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface PersonnelWelfareMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    long countByExample(PersonnelWelfareExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int deleteByExample(PersonnelWelfareExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	long countByExample(PersonnelWelfareExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int deleteByExample(PersonnelWelfareExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int insert(PersonnelWelfare record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int insert(PersonnelWelfare record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int insertSelective(PersonnelWelfare record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int insertSelective(PersonnelWelfare record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	List<PersonnelWelfare> selectByExample(PersonnelWelfareExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    List<PersonnelWelfare> selectByExample(PersonnelWelfareExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	PersonnelWelfare selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    PersonnelWelfare selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") PersonnelWelfare record,
+			@Param("example") PersonnelWelfareExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int updateByExampleSelective(@Param("record") PersonnelWelfare record, @Param("example") PersonnelWelfareExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int updateByExample(@Param("record") PersonnelWelfare record, @Param("example") PersonnelWelfareExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int updateByExample(@Param("record") PersonnelWelfare record, @Param("example") PersonnelWelfareExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int updateByPrimaryKeySelective(PersonnelWelfare record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int updateByPrimaryKeySelective(PersonnelWelfare record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	int updateByPrimaryKey(PersonnelWelfare record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_welfare
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    int updateByPrimaryKey(PersonnelWelfare record);
+	List<PersonnelWelfareBo> selectBypdId(Integer id);
 }

+ 68 - 44
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 Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
@@ -44,12 +44,14 @@
     <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" />
   </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 Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -83,7 +85,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -117,19 +119,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 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
+    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time, welfare_annex_url, 
+    welfare_annex_name
   </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 Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     select
     <if test="distinct">
@@ -148,7 +151,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -159,7 +162,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     delete from personnel_dossier
     where id = #{id,jdbcType=INTEGER}
@@ -168,7 +171,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     delete from personnel_dossier
     <if test="_parameter != null">
@@ -179,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     insert into personnel_dossier (id, aid, door_id, 
       name, birthday, sex, 
@@ -193,7 +196,8 @@
       system, job_nature, job_nature_remarks, 
       entry_time, promotion_time, company, 
       lvl, jobs, star, allowance, 
-      create_time)
+      create_time, welfare_annex_url, welfare_annex_name
+      )
     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}, 
@@ -206,13 +210,14 @@
       #{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})
+      #{createTime,jdbcType=TIMESTAMP}, #{welfareAnnexUrl,jdbcType=VARCHAR}, #{welfareAnnexName,jdbcType=VARCHAR}
+      )
   </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 Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     insert into personnel_dossier
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -327,6 +332,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="welfareAnnexUrl != null">
+        welfare_annex_url,
+      </if>
+      <if test="welfareAnnexName != null">
+        welfare_annex_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -440,13 +451,19 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="welfareAnnexUrl != null">
+        #{welfareAnnexUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="welfareAnnexName != null">
+        #{welfareAnnexName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelDossierExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     select count(*) from personnel_dossier
     <if test="_parameter != null">
@@ -457,7 +474,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -572,6 +589,12 @@
       <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>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -581,7 +604,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     update personnel_dossier
     set id = #{record.id,jdbcType=INTEGER},
@@ -620,7 +643,9 @@
       jobs = #{record.jobs,jdbcType=INTEGER},
       star = #{record.star,jdbcType=INTEGER},
       allowance = #{record.allowance,jdbcType=DECIMAL},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
+      welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -629,7 +654,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -741,6 +766,12 @@
       <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>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -748,7 +779,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 17:10:30 CST 2020.
+      This element was generated on Thu Apr 30 08:54:23 CST 2020.
     -->
     update personnel_dossier
     set aid = #{aid,jdbcType=VARCHAR},
@@ -786,7 +817,9 @@
       jobs = #{jobs,jdbcType=INTEGER},
       star = #{star,jdbcType=INTEGER},
       allowance = #{allowance,jdbcType=DECIMAL},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
+      welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -799,26 +832,18 @@
 	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.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
-	d.school,d.major,d.title,e.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
-	date_format(e.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,
-	date_format(f.start_time, '%Y-%m-%d') contractStart,date_format(f.end_time,'%Y-%m-%d')contractEnd,
+	d.school,d.major,d.title,pm.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
+	date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,
+	date_format(pm.contract_start_time, '%Y-%m-%d') contractStart,date_format(pm.contract_end_time,'%Y-%m-%d')contractEnd,
 	a.certification_authority certificationAuthority, a.residence_province residenceProvince,
 	a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
 	a.native_place_province nativePlaceProvince, a.native_place_city nativePlaceCity,a.now_province nowProvince,
-	a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,date_format(g.effect_time,'%Y-%m-%d') quitTime,
-	pc.emergency_contact emergencyContact,pc.emergency_mobile emergencyMobile,
-	date_format(pw.insurance_start_time,'%Y-%m-%d') insuranceStartTimes,date_format(pw.insurance_end_time,'%Y-%m-%d') insuranceEndTimes,
-	date_format(pw.fund_start_time,'%Y-%m-%d') fundStartTimes,date_format(pw.fund_end_time,'%Y-%m-%d') fundEndTimes
-	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl 
-	left join department dep on a.company = dep.id
-	left join personnel_entry d on a.id=d.id left join (select id,pd_id,max(create_time)promotion_time,
-	 	promotion_remarks from personnel_promotion group by pd_id) e on a.id=e.pd_id
-	left join  (select id,pd_id,start_time,end_time,max(create_time) from personnel_contract group by pd_id)f 
-		on a.id=f.pd_id
-	left join (select id,pd_id,emergency_contact,emergency_mobile,max(create_time) from personnel_contact group by pd_id)pc
-		on a.id=pc.pd_id
-	left join (select id,pd_id,effect_time,max(create_time) from personnel_quit group by pd_id)g on a.id=g.pd_id
-	left join personnel_welfare pw on a.id=pw.id
+	a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,date_format(pm.quit_time,'%Y-%m-%d') quitTime,
+	pm.emergency_contact emergencyContact,pm.emergency_mobile emergencyMobile,
+	date_format(pm.insurance_start_time,'%Y-%m-%d') insuranceStartTimes,date_format(pm.insurance_end_time,'%Y-%m-%d') insuranceEndTimes,
+	date_format(pm.fund_start_time,'%Y-%m-%d') fundStartTimes,date_format(pm.fund_end_time,'%Y-%m-%d') fundEndTimes
+	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl left join department dep on a.company = dep.id
+	left join personnel_entry d on a.id=d.id  	left join personnel_mid pm on a.id=pm.id
 	<if test="aid !=null">
 		left join admin ad on dep.id=ad.department_id
 	</if>
@@ -869,10 +894,10 @@
 	and TIMESTAMPDIFF(year,a.entry_time,now()) between 10 and 99
 	</if>
 	<if test="i.quitStart !=null and i.quitEnd !=null">
-	and g.effect_time	between #{i.quitStart} and #{i.quitEnd}
+	and pm.quit_time	between #{i.quitStart} and #{i.quitEnd}
 	</if>
 	<if test="i.contractStart !=null and i.contractEnd !=null">
-	and f.end_time between #{i.contractStart} and #{i.contractEnd}
+	and pm.contract_end_time between #{i.contractStart} and #{i.contractEnd}
 	</if>
 	<if test="i.education !=null">
 	and d.education= #{i.education}
@@ -885,9 +910,8 @@
   
    <select id="selectPersonnelByCount" resultType="java.lang.Integer">
 	  select count(*)
-	from personnel_dossier a left join personnel_entry d on a.id=d.id left join  (select id,pd_id,start_time,
-		end_time,max(create_time) from personnel_contract group by pd_id)f on a.id=f.pd_id
-	left join (select id,pd_id,effect_time,max(create_time) from personnel_quit group by pd_id)g on a.id=g.pd_id
+	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl left join department dep on a.company = dep.id
+	left join personnel_entry d on a.id=d.id  	left join personnel_mid pm on a.id=pm.id
 	<if test="aid !=null">
 		left join admin ad on dep.id=ad.department_id
 	</if>
@@ -938,10 +962,10 @@
 	and TIMESTAMPDIFF(year,a.entry_time,now()) between 10 and 99
 	</if>
 	<if test="i.quitStart !=null and i.quitEnd !=null">
-	and g.effect_time	between #{i.quitStart} and #{i.quitEnd}
+	and pm.quit_time	between #{i.quitStart} and #{i.quitEnd}
 	</if>
 	<if test="i.contractStart !=null and i.contractEnd !=null">
-	and f.end_time between #{i.contractStart} and #{i.contractEnd}
+	and f.contract_end_time between #{i.contractStart} and #{i.contractEnd}
 	</if>
 	<if test="i.education !=null">
 	and d.education= #{i.education}

+ 479 - 0
src/main/java/com/goafanti/common/mapper/PersonnelMidMapper.xml

@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.PersonnelMidMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PersonnelMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="welfare_annex_url" jdbcType="VARCHAR" property="welfareAnnexUrl" />
+    <result column="welfare_annex_name" jdbcType="VARCHAR" property="welfareAnnexName" />
+    <result column="insurance_start_time" jdbcType="TIMESTAMP" property="insuranceStartTime" />
+    <result column="insurance_end_time" jdbcType="TIMESTAMP" property="insuranceEndTime" />
+    <result column="fund_start_time" jdbcType="TIMESTAMP" property="fundStartTime" />
+    <result column="fund_end_time" jdbcType="TIMESTAMP" property="fundEndTime" />
+    <result column="employer_start_time" jdbcType="TIMESTAMP" property="employerStartTime" />
+    <result column="employer_end_time" jdbcType="TIMESTAMP" property="employerEndTime" />
+    <result column="contract_start_time" jdbcType="TIMESTAMP" property="contractStartTime" />
+    <result column="contract_end_time" jdbcType="TIMESTAMP" property="contractEndTime" />
+    <result column="promotion_time" jdbcType="TIMESTAMP" property="promotionTime" />
+    <result column="promotion_remarks" jdbcType="VARCHAR" property="promotionRemarks" />
+    <result column="emergency_contact" jdbcType="VARCHAR" property="emergencyContact" />
+    <result column="emergency_mobile" jdbcType="VARCHAR" property="emergencyMobile" />
+    <result column="quit_time" jdbcType="TIMESTAMP" property="quitTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </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 10:47:31 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_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 10:47:31 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    id, welfare_annex_url, welfare_annex_name, insurance_start_time, insurance_end_time, 
+    fund_start_time, fund_end_time, employer_start_time, employer_end_time, contract_start_time, 
+    contract_end_time, promotion_time, promotion_remarks, emergency_contact, emergency_mobile, 
+    quit_time, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelMidExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_mid
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_mid
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    delete from personnel_mid
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelMidExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    delete from personnel_mid
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PersonnelMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    insert into personnel_mid (id, welfare_annex_url, welfare_annex_name, 
+      insurance_start_time, insurance_end_time, 
+      fund_start_time, fund_end_time, employer_start_time, 
+      employer_end_time, contract_start_time, 
+      contract_end_time, promotion_time, promotion_remarks, 
+      emergency_contact, emergency_mobile, quit_time, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{welfareAnnexUrl,jdbcType=VARCHAR}, #{welfareAnnexName,jdbcType=VARCHAR}, 
+      #{insuranceStartTime,jdbcType=TIMESTAMP}, #{insuranceEndTime,jdbcType=TIMESTAMP}, 
+      #{fundStartTime,jdbcType=TIMESTAMP}, #{fundEndTime,jdbcType=TIMESTAMP}, #{employerStartTime,jdbcType=TIMESTAMP}, 
+      #{employerEndTime,jdbcType=TIMESTAMP}, #{contractStartTime,jdbcType=TIMESTAMP}, 
+      #{contractEndTime,jdbcType=TIMESTAMP}, #{promotionTime,jdbcType=TIMESTAMP}, #{promotionRemarks,jdbcType=VARCHAR}, 
+      #{emergencyContact,jdbcType=VARCHAR}, #{emergencyMobile,jdbcType=VARCHAR}, #{quitTime,jdbcType=TIMESTAMP}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    insert into personnel_mid
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="welfareAnnexUrl != null">
+        welfare_annex_url,
+      </if>
+      <if test="welfareAnnexName != null">
+        welfare_annex_name,
+      </if>
+      <if test="insuranceStartTime != null">
+        insurance_start_time,
+      </if>
+      <if test="insuranceEndTime != null">
+        insurance_end_time,
+      </if>
+      <if test="fundStartTime != null">
+        fund_start_time,
+      </if>
+      <if test="fundEndTime != null">
+        fund_end_time,
+      </if>
+      <if test="employerStartTime != null">
+        employer_start_time,
+      </if>
+      <if test="employerEndTime != null">
+        employer_end_time,
+      </if>
+      <if test="contractStartTime != null">
+        contract_start_time,
+      </if>
+      <if test="contractEndTime != null">
+        contract_end_time,
+      </if>
+      <if test="promotionTime != null">
+        promotion_time,
+      </if>
+      <if test="promotionRemarks != null">
+        promotion_remarks,
+      </if>
+      <if test="emergencyContact != null">
+        emergency_contact,
+      </if>
+      <if test="emergencyMobile != null">
+        emergency_mobile,
+      </if>
+      <if test="quitTime != null">
+        quit_time,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="welfareAnnexUrl != null">
+        #{welfareAnnexUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="welfareAnnexName != null">
+        #{welfareAnnexName,jdbcType=VARCHAR},
+      </if>
+      <if test="insuranceStartTime != null">
+        #{insuranceStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insuranceEndTime != null">
+        #{insuranceEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fundStartTime != null">
+        #{fundStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fundEndTime != null">
+        #{fundEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="employerStartTime != null">
+        #{employerStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="employerEndTime != null">
+        #{employerEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractStartTime != null">
+        #{contractStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractEndTime != null">
+        #{contractEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="promotionTime != null">
+        #{promotionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="promotionRemarks != null">
+        #{promotionRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="emergencyContact != null">
+        #{emergencyContact,jdbcType=VARCHAR},
+      </if>
+      <if test="emergencyMobile != null">
+        #{emergencyMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="quitTime != null">
+        #{quitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelMidExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    select count(*) from personnel_mid
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    update personnel_mid
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </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>
+      <if test="record.insuranceStartTime != null">
+        insurance_start_time = #{record.insuranceStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.insuranceEndTime != null">
+        insurance_end_time = #{record.insuranceEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.fundStartTime != null">
+        fund_start_time = #{record.fundStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.fundEndTime != null">
+        fund_end_time = #{record.fundEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.employerStartTime != null">
+        employer_start_time = #{record.employerStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.employerEndTime != null">
+        employer_end_time = #{record.employerEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.contractStartTime != null">
+        contract_start_time = #{record.contractStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.contractEndTime != null">
+        contract_end_time = #{record.contractEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.promotionTime != null">
+        promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.promotionRemarks != null">
+        promotion_remarks = #{record.promotionRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.emergencyContact != null">
+        emergency_contact = #{record.emergencyContact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.emergencyMobile != null">
+        emergency_mobile = #{record.emergencyMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quitTime != null">
+        quit_time = #{record.quitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    update personnel_mid
+    set id = #{record.id,jdbcType=INTEGER},
+      welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
+      welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR},
+      insurance_start_time = #{record.insuranceStartTime,jdbcType=TIMESTAMP},
+      insurance_end_time = #{record.insuranceEndTime,jdbcType=TIMESTAMP},
+      fund_start_time = #{record.fundStartTime,jdbcType=TIMESTAMP},
+      fund_end_time = #{record.fundEndTime,jdbcType=TIMESTAMP},
+      employer_start_time = #{record.employerStartTime,jdbcType=TIMESTAMP},
+      employer_end_time = #{record.employerEndTime,jdbcType=TIMESTAMP},
+      contract_start_time = #{record.contractStartTime,jdbcType=TIMESTAMP},
+      contract_end_time = #{record.contractEndTime,jdbcType=TIMESTAMP},
+      promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
+      promotion_remarks = #{record.promotionRemarks,jdbcType=VARCHAR},
+      emergency_contact = #{record.emergencyContact,jdbcType=VARCHAR},
+      emergency_mobile = #{record.emergencyMobile,jdbcType=VARCHAR},
+      quit_time = #{record.quitTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PersonnelMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    update personnel_mid
+    <set>
+      <if test="welfareAnnexUrl != null">
+        welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="welfareAnnexName != null">
+        welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR},
+      </if>
+      <if test="insuranceStartTime != null">
+        insurance_start_time = #{insuranceStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insuranceEndTime != null">
+        insurance_end_time = #{insuranceEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fundStartTime != null">
+        fund_start_time = #{fundStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fundEndTime != null">
+        fund_end_time = #{fundEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="employerStartTime != null">
+        employer_start_time = #{employerStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="employerEndTime != null">
+        employer_end_time = #{employerEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractStartTime != null">
+        contract_start_time = #{contractStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractEndTime != null">
+        contract_end_time = #{contractEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="promotionTime != null">
+        promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="promotionRemarks != null">
+        promotion_remarks = #{promotionRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="emergencyContact != null">
+        emergency_contact = #{emergencyContact,jdbcType=VARCHAR},
+      </if>
+      <if test="emergencyMobile != null">
+        emergency_mobile = #{emergencyMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="quitTime != null">
+        quit_time = #{quitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PersonnelMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+    -->
+    update personnel_mid
+    set welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
+      welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR},
+      insurance_start_time = #{insuranceStartTime,jdbcType=TIMESTAMP},
+      insurance_end_time = #{insuranceEndTime,jdbcType=TIMESTAMP},
+      fund_start_time = #{fundStartTime,jdbcType=TIMESTAMP},
+      fund_end_time = #{fundEndTime,jdbcType=TIMESTAMP},
+      employer_start_time = #{employerStartTime,jdbcType=TIMESTAMP},
+      employer_end_time = #{employerEndTime,jdbcType=TIMESTAMP},
+      contract_start_time = #{contractStartTime,jdbcType=TIMESTAMP},
+      contract_end_time = #{contractEndTime,jdbcType=TIMESTAMP},
+      promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
+      promotion_remarks = #{promotionRemarks,jdbcType=VARCHAR},
+      emergency_contact = #{emergencyContact,jdbcType=VARCHAR},
+      emergency_mobile = #{emergencyMobile,jdbcType=VARCHAR},
+      quit_time = #{quitTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 71 - 99
src/main/java/com/goafanti/common/mapper/PersonnelWelfareMapper.xml

@@ -5,23 +5,21 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="insurance_start_time" jdbcType="TIMESTAMP" property="insuranceStartTime" />
-    <result column="insurance_end_time" jdbcType="TIMESTAMP" property="insuranceEndTime" />
-    <result column="fund_start_time" jdbcType="TIMESTAMP" property="fundStartTime" />
-    <result column="fund_end_time" jdbcType="TIMESTAMP" property="fundEndTime" />
+    <result column="pd_id" jdbcType="INTEGER" property="pdId" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="welfare_remarks" jdbcType="VARCHAR" property="welfareRemarks" />
-    <result column="annex_url" jdbcType="VARCHAR" property="annexUrl" />
-    <result column="annex_name" jdbcType="VARCHAR" property="annexName" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </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 Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +53,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,16 +87,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
-    id, insurance_start_time, insurance_end_time, fund_start_time, fund_end_time, welfare_remarks, 
-    annex_url, annex_name, create_time
+    id, pd_id, type, start_time, end_time, welfare_remarks, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelWelfareExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     select
     <if test="distinct">
@@ -117,7 +114,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -128,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     delete from personnel_welfare
     where id = #{id,jdbcType=INTEGER}
@@ -137,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     delete from personnel_welfare
     <if test="_parameter != null">
@@ -148,49 +145,41 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
-    insert into personnel_welfare (id, insurance_start_time, insurance_end_time, 
-      fund_start_time, fund_end_time, welfare_remarks, 
-      annex_url, annex_name, create_time
-      )
-    values (#{id,jdbcType=INTEGER}, #{insuranceStartTime,jdbcType=TIMESTAMP}, #{insuranceEndTime,jdbcType=TIMESTAMP}, 
-      #{fundStartTime,jdbcType=TIMESTAMP}, #{fundEndTime,jdbcType=TIMESTAMP}, #{welfareRemarks,jdbcType=VARCHAR}, 
-      #{annexUrl,jdbcType=VARCHAR}, #{annexName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+    insert into personnel_welfare (id, pd_id, type, 
+      start_time, end_time, welfare_remarks, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, 
+      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{welfareRemarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelWelfare">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     insert into personnel_welfare
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="insuranceStartTime != null">
-        insurance_start_time,
+      <if test="pdId != null">
+        pd_id,
       </if>
-      <if test="insuranceEndTime != null">
-        insurance_end_time,
+      <if test="type != null">
+        type,
       </if>
-      <if test="fundStartTime != null">
-        fund_start_time,
+      <if test="startTime != null">
+        start_time,
       </if>
-      <if test="fundEndTime != null">
-        fund_end_time,
+      <if test="endTime != null">
+        end_time,
       </if>
       <if test="welfareRemarks != null">
         welfare_remarks,
       </if>
-      <if test="annexUrl != null">
-        annex_url,
-      </if>
-      <if test="annexName != null">
-        annex_name,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -199,27 +188,21 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="insuranceStartTime != null">
-        #{insuranceStartTime,jdbcType=TIMESTAMP},
+      <if test="pdId != null">
+        #{pdId,jdbcType=INTEGER},
       </if>
-      <if test="insuranceEndTime != null">
-        #{insuranceEndTime,jdbcType=TIMESTAMP},
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
       </if>
-      <if test="fundStartTime != null">
-        #{fundStartTime,jdbcType=TIMESTAMP},
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="fundEndTime != null">
-        #{fundEndTime,jdbcType=TIMESTAMP},
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="welfareRemarks != null">
         #{welfareRemarks,jdbcType=VARCHAR},
       </if>
-      <if test="annexUrl != null">
-        #{annexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="annexName != null">
-        #{annexName,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -229,7 +212,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     select count(*) from personnel_welfare
     <if test="_parameter != null">
@@ -240,34 +223,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     update personnel_welfare
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
-      <if test="record.insuranceStartTime != null">
-        insurance_start_time = #{record.insuranceStartTime,jdbcType=TIMESTAMP},
+      <if test="record.pdId != null">
+        pd_id = #{record.pdId,jdbcType=INTEGER},
       </if>
-      <if test="record.insuranceEndTime != null">
-        insurance_end_time = #{record.insuranceEndTime,jdbcType=TIMESTAMP},
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
       </if>
-      <if test="record.fundStartTime != null">
-        fund_start_time = #{record.fundStartTime,jdbcType=TIMESTAMP},
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.fundEndTime != null">
-        fund_end_time = #{record.fundEndTime,jdbcType=TIMESTAMP},
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.welfareRemarks != null">
         welfare_remarks = #{record.welfareRemarks,jdbcType=VARCHAR},
       </if>
-      <if test="record.annexUrl != null">
-        annex_url = #{record.annexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.annexName != null">
-        annex_name = #{record.annexName,jdbcType=VARCHAR},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -280,17 +257,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     update personnel_welfare
     set id = #{record.id,jdbcType=INTEGER},
-      insurance_start_time = #{record.insuranceStartTime,jdbcType=TIMESTAMP},
-      insurance_end_time = #{record.insuranceEndTime,jdbcType=TIMESTAMP},
-      fund_start_time = #{record.fundStartTime,jdbcType=TIMESTAMP},
-      fund_end_time = #{record.fundEndTime,jdbcType=TIMESTAMP},
+      pd_id = #{record.pdId,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
       welfare_remarks = #{record.welfareRemarks,jdbcType=VARCHAR},
-      annex_url = #{record.annexUrl,jdbcType=VARCHAR},
-      annex_name = #{record.annexName,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,31 +275,25 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     update personnel_welfare
     <set>
-      <if test="insuranceStartTime != null">
-        insurance_start_time = #{insuranceStartTime,jdbcType=TIMESTAMP},
+      <if test="pdId != null">
+        pd_id = #{pdId,jdbcType=INTEGER},
       </if>
-      <if test="insuranceEndTime != null">
-        insurance_end_time = #{insuranceEndTime,jdbcType=TIMESTAMP},
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
       </if>
-      <if test="fundStartTime != null">
-        fund_start_time = #{fundStartTime,jdbcType=TIMESTAMP},
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="fundEndTime != null">
-        fund_end_time = #{fundEndTime,jdbcType=TIMESTAMP},
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="welfareRemarks != null">
         welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
       </if>
-      <if test="annexUrl != null">
-        annex_url = #{annexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="annexName != null">
-        annex_name = #{annexName,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -335,17 +304,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 29 16:53:46 CST 2020.
+      This element was generated on Thu Apr 30 08:53:47 CST 2020.
     -->
     update personnel_welfare
-    set insurance_start_time = #{insuranceStartTime,jdbcType=TIMESTAMP},
-      insurance_end_time = #{insuranceEndTime,jdbcType=TIMESTAMP},
-      fund_start_time = #{fundStartTime,jdbcType=TIMESTAMP},
-      fund_end_time = #{fundEndTime,jdbcType=TIMESTAMP},
+    set pd_id = #{pdId,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
       welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
-      annex_url = #{annexUrl,jdbcType=VARCHAR},
-      annex_name = #{annexName,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectBypdId" resultType="com.goafanti.personnel.bo.PersonnelWelfareBo">
+  select id,pd_id pdId,`type`,date_format(start_time,'%Y-%m-%d')startTimes,
+	date_format(end_time,'%Y-%m-%d')endTimes,welfare_remarks,create_time createTime 
+	from personnel_welfare where pd_id= #{id}
+  </select>
 </mapper>

+ 157 - 111
src/main/java/com/goafanti/common/model/PersonnelDossier.java

@@ -7,194 +7,204 @@ public class PersonnelDossier {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.id
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.aid
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer doorId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.name
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.birthday
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Date birthday;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.sex
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.mobile
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.nation
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private String certificationAuthority;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.marriage
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer politicalOutlook;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.son
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer son;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.girl
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer girl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.status
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.system
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Date promotionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.company
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private String company;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.lvl
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.jobs
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer jobs;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.star
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	private Integer star;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.allowance
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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
+	 */
+	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;
 
 	/**
 	 * 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -203,7 +213,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -212,7 +222,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -221,7 +231,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -230,7 +240,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getDoorId() {
 		return doorId;
@@ -239,7 +249,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setDoorId(Integer doorId) {
 		this.doorId = doorId;
@@ -248,7 +258,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getName() {
 		return name;
@@ -257,7 +267,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -266,7 +276,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Date getBirthday() {
 		return birthday;
@@ -275,7 +285,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setBirthday(Date birthday) {
 		this.birthday = birthday;
@@ -284,7 +294,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getSex() {
 		return sex;
@@ -293,7 +303,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setSex(Integer sex) {
 		this.sex = sex;
@@ -302,7 +312,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getMobile() {
 		return mobile;
@@ -311,7 +321,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -320,7 +330,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -329,7 +339,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -338,7 +348,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getNation() {
 		return nation;
@@ -347,7 +357,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNation(String nation) {
 		this.nation = nation;
@@ -356,7 +366,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getResidenceProvince() {
 		return residenceProvince;
@@ -365,7 +375,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setResidenceProvince(Integer residenceProvince) {
 		this.residenceProvince = residenceProvince;
@@ -374,7 +384,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getResidenceCity() {
 		return residenceCity;
@@ -383,7 +393,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setResidenceCity(Integer residenceCity) {
 		this.residenceCity = residenceCity;
@@ -392,7 +402,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getResidenceArea() {
 		return residenceArea;
@@ -401,7 +411,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setResidenceArea(Integer residenceArea) {
 		this.residenceArea = residenceArea;
@@ -410,7 +420,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getResidenceAddress() {
 		return residenceAddress;
@@ -419,7 +429,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setResidenceAddress(String residenceAddress) {
 		this.residenceAddress = residenceAddress;
@@ -428,7 +438,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getNativePlaceProvince() {
 		return nativePlaceProvince;
@@ -437,7 +447,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNativePlaceProvince(Integer nativePlaceProvince) {
 		this.nativePlaceProvince = nativePlaceProvince;
@@ -446,7 +456,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getNativePlaceCity() {
 		return nativePlaceCity;
@@ -455,7 +465,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNativePlaceCity(Integer nativePlaceCity) {
 		this.nativePlaceCity = nativePlaceCity;
@@ -464,7 +474,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getNowProvince() {
 		return nowProvince;
@@ -473,7 +483,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNowProvince(Integer nowProvince) {
 		this.nowProvince = nowProvince;
@@ -482,7 +492,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getNowCity() {
 		return nowCity;
@@ -491,7 +501,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNowCity(Integer nowCity) {
 		this.nowCity = nowCity;
@@ -500,7 +510,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getNowArea() {
 		return nowArea;
@@ -509,7 +519,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNowArea(Integer nowArea) {
 		this.nowArea = nowArea;
@@ -518,7 +528,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getNowAddress() {
 		return nowAddress;
@@ -527,7 +537,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setNowAddress(String nowAddress) {
 		this.nowAddress = nowAddress;
@@ -536,7 +546,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getIdCard() {
 		return idCard;
@@ -545,7 +555,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setIdCard(String idCard) {
 		this.idCard = idCard;
@@ -554,7 +564,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getCertificationAuthority() {
 		return certificationAuthority;
@@ -563,7 +573,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setCertificationAuthority(String certificationAuthority) {
 		this.certificationAuthority = certificationAuthority;
@@ -572,7 +582,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getMarriage() {
 		return marriage;
@@ -581,7 +591,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setMarriage(Integer marriage) {
 		this.marriage = marriage;
@@ -590,7 +600,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getPoliticalOutlook() {
 		return politicalOutlook;
@@ -599,7 +609,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setPoliticalOutlook(Integer politicalOutlook) {
 		this.politicalOutlook = politicalOutlook;
@@ -608,7 +618,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getSon() {
 		return son;
@@ -617,7 +627,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setSon(Integer son) {
 		this.son = son;
@@ -626,7 +636,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getGirl() {
 		return girl;
@@ -635,7 +645,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setGirl(Integer girl) {
 		this.girl = girl;
@@ -644,7 +654,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -653,7 +663,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -662,7 +672,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getSystem() {
 		return system;
@@ -671,7 +681,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setSystem(Integer system) {
 		this.system = system;
@@ -680,7 +690,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getJobNature() {
 		return jobNature;
@@ -689,7 +699,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setJobNature(Integer jobNature) {
 		this.jobNature = jobNature;
@@ -698,7 +708,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getJobNatureRemarks() {
 		return jobNatureRemarks;
@@ -707,7 +717,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setJobNatureRemarks(String jobNatureRemarks) {
 		this.jobNatureRemarks = jobNatureRemarks;
@@ -716,7 +726,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Date getEntryTime() {
 		return entryTime;
@@ -725,7 +735,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setEntryTime(Date entryTime) {
 		this.entryTime = entryTime;
@@ -734,7 +744,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Date getPromotionTime() {
 		return promotionTime;
@@ -743,7 +753,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setPromotionTime(Date promotionTime) {
 		this.promotionTime = promotionTime;
@@ -752,7 +762,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public String getCompany() {
 		return company;
@@ -761,7 +771,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setCompany(String company) {
 		this.company = company;
@@ -770,7 +780,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -779,7 +789,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -788,7 +798,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getJobs() {
 		return jobs;
@@ -797,7 +807,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setJobs(Integer jobs) {
 		this.jobs = jobs;
@@ -806,7 +816,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Integer getStar() {
 		return star;
@@ -815,7 +825,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setStar(Integer star) {
 		this.star = star;
@@ -824,7 +834,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public BigDecimal getAllowance() {
 		return allowance;
@@ -833,7 +843,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public void setAllowance(BigDecimal allowance) {
 		this.allowance = allowance;
@@ -842,7 +852,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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -851,9 +861,45 @@ 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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
+	 */
+	public String getWelfareAnnexName() {
+		return welfareAnnexName;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setWelfareAnnexName(String welfareAnnexName) {
+		this.welfareAnnexName = welfareAnnexName;
+	}
 }

+ 156 - 16
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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 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  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2493,11 +2493,151 @@ public class PersonnelDossierExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andWelfareAnnexUrlIsNull() {
+			addCriterion("welfare_annex_url is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlIsNotNull() {
+			addCriterion("welfare_annex_url is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlEqualTo(String value) {
+			addCriterion("welfare_annex_url =", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlNotEqualTo(String value) {
+			addCriterion("welfare_annex_url <>", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlGreaterThan(String value) {
+			addCriterion("welfare_annex_url >", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlGreaterThanOrEqualTo(String value) {
+			addCriterion("welfare_annex_url >=", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlLessThan(String value) {
+			addCriterion("welfare_annex_url <", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlLessThanOrEqualTo(String value) {
+			addCriterion("welfare_annex_url <=", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlLike(String value) {
+			addCriterion("welfare_annex_url like", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlNotLike(String value) {
+			addCriterion("welfare_annex_url not like", value, "welfareAnnexUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareAnnexUrlIn(List<String> values) {
+			addCriterion("welfare_annex_url in", values, "welfareAnnexUrl");
+			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");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_dossier
-	 * @mbg.generated  Wed Apr 29 17:10:30 CST 2020
+	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 368 - 0
src/main/java/com/goafanti/common/model/PersonnelMid.java

@@ -0,0 +1,368 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PersonnelMid {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.id
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.welfare_annex_url
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private String welfareAnnexUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.welfare_annex_name
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private String welfareAnnexName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.insurance_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date insuranceStartTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.insurance_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date insuranceEndTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.fund_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date fundStartTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.fund_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date fundEndTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.employer_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date employerStartTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.employer_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date employerEndTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.contract_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date contractStartTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.contract_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date contractEndTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.promotion_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date promotionTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.promotion_remarks
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private String promotionRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.emergency_contact
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private String emergencyContact;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.emergency_mobile
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private String emergencyMobile;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.quit_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date quitTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.create_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.id
+	 * @return  the value of personnel_mid.id
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.id
+	 * @param id  the value for personnel_mid.id
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.welfare_annex_url
+	 * @return  the value of personnel_mid.welfare_annex_url
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public String getWelfareAnnexUrl() {
+		return welfareAnnexUrl;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.welfare_annex_url
+	 * @param welfareAnnexUrl  the value for personnel_mid.welfare_annex_url
+	 * @mbg.generated  Thu Apr 30 10:47:31 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_mid.welfare_annex_name
+	 * @return  the value of personnel_mid.welfare_annex_name
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public String getWelfareAnnexName() {
+		return welfareAnnexName;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.welfare_annex_name
+	 * @param welfareAnnexName  the value for personnel_mid.welfare_annex_name
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setWelfareAnnexName(String welfareAnnexName) {
+		this.welfareAnnexName = welfareAnnexName;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.insurance_start_time
+	 * @return  the value of personnel_mid.insurance_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getInsuranceStartTime() {
+		return insuranceStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.insurance_start_time
+	 * @param insuranceStartTime  the value for personnel_mid.insurance_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setInsuranceStartTime(Date insuranceStartTime) {
+		this.insuranceStartTime = insuranceStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.insurance_end_time
+	 * @return  the value of personnel_mid.insurance_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getInsuranceEndTime() {
+		return insuranceEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.insurance_end_time
+	 * @param insuranceEndTime  the value for personnel_mid.insurance_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setInsuranceEndTime(Date insuranceEndTime) {
+		this.insuranceEndTime = insuranceEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.fund_start_time
+	 * @return  the value of personnel_mid.fund_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getFundStartTime() {
+		return fundStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.fund_start_time
+	 * @param fundStartTime  the value for personnel_mid.fund_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setFundStartTime(Date fundStartTime) {
+		this.fundStartTime = fundStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.fund_end_time
+	 * @return  the value of personnel_mid.fund_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getFundEndTime() {
+		return fundEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.fund_end_time
+	 * @param fundEndTime  the value for personnel_mid.fund_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setFundEndTime(Date fundEndTime) {
+		this.fundEndTime = fundEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.employer_start_time
+	 * @return  the value of personnel_mid.employer_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getEmployerStartTime() {
+		return employerStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.employer_start_time
+	 * @param employerStartTime  the value for personnel_mid.employer_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setEmployerStartTime(Date employerStartTime) {
+		this.employerStartTime = employerStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.employer_end_time
+	 * @return  the value of personnel_mid.employer_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getEmployerEndTime() {
+		return employerEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.employer_end_time
+	 * @param employerEndTime  the value for personnel_mid.employer_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setEmployerEndTime(Date employerEndTime) {
+		this.employerEndTime = employerEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.contract_start_time
+	 * @return  the value of personnel_mid.contract_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getContractStartTime() {
+		return contractStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.contract_start_time
+	 * @param contractStartTime  the value for personnel_mid.contract_start_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setContractStartTime(Date contractStartTime) {
+		this.contractStartTime = contractStartTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.contract_end_time
+	 * @return  the value of personnel_mid.contract_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getContractEndTime() {
+		return contractEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.contract_end_time
+	 * @param contractEndTime  the value for personnel_mid.contract_end_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setContractEndTime(Date contractEndTime) {
+		this.contractEndTime = contractEndTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.promotion_time
+	 * @return  the value of personnel_mid.promotion_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getPromotionTime() {
+		return promotionTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.promotion_time
+	 * @param promotionTime  the value for personnel_mid.promotion_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setPromotionTime(Date promotionTime) {
+		this.promotionTime = promotionTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.promotion_remarks
+	 * @return  the value of personnel_mid.promotion_remarks
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public String getPromotionRemarks() {
+		return promotionRemarks;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.promotion_remarks
+	 * @param promotionRemarks  the value for personnel_mid.promotion_remarks
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setPromotionRemarks(String promotionRemarks) {
+		this.promotionRemarks = promotionRemarks;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.emergency_contact
+	 * @return  the value of personnel_mid.emergency_contact
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public String getEmergencyContact() {
+		return emergencyContact;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.emergency_contact
+	 * @param emergencyContact  the value for personnel_mid.emergency_contact
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setEmergencyContact(String emergencyContact) {
+		this.emergencyContact = emergencyContact;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.emergency_mobile
+	 * @return  the value of personnel_mid.emergency_mobile
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public String getEmergencyMobile() {
+		return emergencyMobile;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.emergency_mobile
+	 * @param emergencyMobile  the value for personnel_mid.emergency_mobile
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setEmergencyMobile(String emergencyMobile) {
+		this.emergencyMobile = emergencyMobile;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.quit_time
+	 * @return  the value of personnel_mid.quit_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getQuitTime() {
+		return quitTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.quit_time
+	 * @param quitTime  the value for personnel_mid.quit_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setQuitTime(Date quitTime) {
+		this.quitTime = quitTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.create_time
+	 * @return  the value of personnel_mid.create_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.create_time
+	 * @param createTime  the value for personnel_mid.create_time
+	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public PersonnelMid(Integer id) {
+    	this.id=id;
+	}
+    public PersonnelMid() {
+	}
+}

File diff suppressed because it is too large
+ 1332 - 0
src/main/java/com/goafanti/common/model/PersonnelMidExample.java


+ 161 - 295
src/main/java/com/goafanti/common/model/PersonnelWelfare.java

@@ -3,300 +3,166 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class PersonnelWelfare {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.id
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.insurance_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Date insuranceStartTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.insurance_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Date insuranceEndTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.fund_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Date fundStartTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.fund_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Date fundEndTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.welfare_remarks
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private String welfareRemarks;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.annex_url
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private String annexUrl;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.annex_name
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private String annexName;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_welfare.create_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    private Date createTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.id
-     *
-     * @return the value of personnel_welfare.id
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.id
-     *
-     * @param id the value for personnel_welfare.id
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.insurance_start_time
-     *
-     * @return the value of personnel_welfare.insurance_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Date getInsuranceStartTime() {
-        return insuranceStartTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.insurance_start_time
-     *
-     * @param insuranceStartTime the value for personnel_welfare.insurance_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setInsuranceStartTime(Date insuranceStartTime) {
-        this.insuranceStartTime = insuranceStartTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.insurance_end_time
-     *
-     * @return the value of personnel_welfare.insurance_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Date getInsuranceEndTime() {
-        return insuranceEndTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.insurance_end_time
-     *
-     * @param insuranceEndTime the value for personnel_welfare.insurance_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setInsuranceEndTime(Date insuranceEndTime) {
-        this.insuranceEndTime = insuranceEndTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.fund_start_time
-     *
-     * @return the value of personnel_welfare.fund_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Date getFundStartTime() {
-        return fundStartTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.fund_start_time
-     *
-     * @param fundStartTime the value for personnel_welfare.fund_start_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setFundStartTime(Date fundStartTime) {
-        this.fundStartTime = fundStartTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.fund_end_time
-     *
-     * @return the value of personnel_welfare.fund_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Date getFundEndTime() {
-        return fundEndTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.fund_end_time
-     *
-     * @param fundEndTime the value for personnel_welfare.fund_end_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setFundEndTime(Date fundEndTime) {
-        this.fundEndTime = fundEndTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.welfare_remarks
-     *
-     * @return the value of personnel_welfare.welfare_remarks
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public String getWelfareRemarks() {
-        return welfareRemarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.welfare_remarks
-     *
-     * @param welfareRemarks the value for personnel_welfare.welfare_remarks
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setWelfareRemarks(String welfareRemarks) {
-        this.welfareRemarks = welfareRemarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.annex_url
-     *
-     * @return the value of personnel_welfare.annex_url
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public String getAnnexUrl() {
-        return annexUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.annex_url
-     *
-     * @param annexUrl the value for personnel_welfare.annex_url
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setAnnexUrl(String annexUrl) {
-        this.annexUrl = annexUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.annex_name
-     *
-     * @return the value of personnel_welfare.annex_name
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public String getAnnexName() {
-        return annexName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.annex_name
-     *
-     * @param annexName the value for personnel_welfare.annex_name
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setAnnexName(String annexName) {
-        this.annexName = annexName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_welfare.create_time
-     *
-     * @return the value of personnel_welfare.create_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_welfare.create_time
-     *
-     * @param createTime the value for personnel_welfare.create_time
-     *
-     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.pd_id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Integer pdId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.type
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.start_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Date startTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.end_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Date endTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.welfare_remarks
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private String welfareRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.create_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	private Date createTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.id
+	 * @return  the value of personnel_welfare.id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.id
+	 * @param id  the value for personnel_welfare.id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.pd_id
+	 * @return  the value of personnel_welfare.pd_id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Integer getPdId() {
+		return pdId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.pd_id
+	 * @param pdId  the value for personnel_welfare.pd_id
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setPdId(Integer pdId) {
+		this.pdId = pdId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.type
+	 * @return  the value of personnel_welfare.type
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.type
+	 * @param type  the value for personnel_welfare.type
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.start_time
+	 * @return  the value of personnel_welfare.start_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.start_time
+	 * @param startTime  the value for personnel_welfare.start_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.end_time
+	 * @return  the value of personnel_welfare.end_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.end_time
+	 * @param endTime  the value for personnel_welfare.end_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.welfare_remarks
+	 * @return  the value of personnel_welfare.welfare_remarks
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public String getWelfareRemarks() {
+		return welfareRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.welfare_remarks
+	 * @param welfareRemarks  the value for personnel_welfare.welfare_remarks
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setWelfareRemarks(String welfareRemarks) {
+		this.welfareRemarks = welfareRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.create_time
+	 * @return  the value of personnel_welfare.create_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.create_time
+	 * @param createTime  the value for personnel_welfare.create_time
+	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

File diff suppressed because it is too large
+ 672 - 853
src/main/java/com/goafanti/common/model/PersonnelWelfareExample.java


+ 58 - 0
src/main/java/com/goafanti/personnel/bo/IntpersonnelWelfareBo.java

@@ -0,0 +1,58 @@
+package com.goafanti.personnel.bo;
+
+
+import com.goafanti.common.model.PersonnelWelfare;
+
+public class IntpersonnelWelfareBo extends PersonnelWelfare{
+	  private String StartTimes;
+
+	  private String EndTimes;
+	  
+	  private String annexUrl;
+	  private String annexName; 
+
+		public String getStartTimes() {
+			return StartTimes;
+		}
+
+		public void setStartTimes(String startTimes) {
+			StartTimes = startTimes;
+		}
+
+		public String getEndTimes() {
+			return EndTimes;
+		}
+
+		public void setEndTimes(String endTimes) {
+			EndTimes = endTimes;
+		}
+
+		public String getAnnexUrl() {
+			return annexUrl;
+		}
+
+		public void setAnnexUrl(String annexUrl) {
+			this.annexUrl = annexUrl;
+		}
+
+		public String getAnnexName() {
+			return annexName;
+		}
+
+		public void setAnnexName(String annexName) {
+			this.annexName = annexName;
+		}
+
+	  
+
+
+		
+
+
+	
+
+
+	
+
+
+}

+ 21 - 0
src/main/java/com/goafanti/personnel/bo/PersonnelWelfareBo.java

@@ -1,7 +1,28 @@
 package com.goafanti.personnel.bo;
 
+
 import com.goafanti.common.model.PersonnelWelfare;
 
 public class PersonnelWelfareBo extends PersonnelWelfare{
+	
+	private String startTimes;
+	
+	private String endTimes;
+
+	public String getStartTimes() {
+		return startTimes;
+	}
+
+	public void setStartTimes(String startTimes) {
+		this.startTimes = startTimes;
+	}
+
+	public String getEndTimes() {
+		return endTimes;
+	}
+
+	public void setEndTimes(String endTimes) {
+		this.endTimes = endTimes;
+	}
 
 }

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

@@ -25,6 +25,7 @@ import com.goafanti.personnel.bo.InputPersonnelListBo;
 import com.goafanti.personnel.bo.InputPersonnelLvlBo;
 import com.goafanti.personnel.bo.InputPersonnelPromotionBo;
 import com.goafanti.personnel.bo.InputPersonnelQuitBo;
+import com.goafanti.personnel.bo.IntpersonnelWelfareBo;
 import com.goafanti.personnel.service.PersonnelService;
 
 
@@ -212,20 +213,18 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 人事等级列表
+	 * 人事福利修改
 	 */
 	@RequestMapping(value = "/updateWelfare", method = RequestMethod.POST)
 	public Result updateWelfare(IntpersonnelWelfareBo i){
 		Result res = new Result();
-		if (null==i.getId()) {
+		if (null==i.getPdId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
 		try {
-			if ( !StringUtils.isBlank(i.getInsuranceStartTimes()))i.setInsuranceStartTime(DateUtils.StringToDate(i.getInsuranceStartTimes(), AFTConstants.YYYYMMDD));
-			if ( !StringUtils.isBlank(i.getInsuranceEndTimes()))i.setInsuranceEndTime(DateUtils.StringToDate(i.getInsuranceEndTimes(), AFTConstants.YYYYMMDD));
-			if ( !StringUtils.isBlank(i.getFundStartTimes()))i.setFundStartTime(DateUtils.StringToDate(i.getFundStartTimes(), AFTConstants.YYYYMMDD));
-			if ( !StringUtils.isBlank(i.getFundEndTimes()))i.setFundEndTime(DateUtils.StringToDate(i.getFundEndTimes(), AFTConstants.YYYYMMDD));
+			if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+			if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
 		} catch (ParseException e) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
 			return res;

+ 0 - 58
src/main/java/com/goafanti/personnel/controller/IntpersonnelWelfareBo.java

@@ -1,58 +0,0 @@
-package com.goafanti.personnel.controller;
-
-
-import com.goafanti.common.model.PersonnelWelfare;
-
-public class IntpersonnelWelfareBo extends PersonnelWelfare{
-	  private String insuranceStartTimes;
-
-	    private String insuranceEndTimes;
-
-	    private String fundStartTimes;
-
-	    
-	    private String fundEndTimes;
-
-
-		public String getInsuranceStartTimes() {
-			return insuranceStartTimes;
-		}
-
-
-		public void setInsuranceStartTimes(String insuranceStartTimes) {
-			this.insuranceStartTimes = insuranceStartTimes;
-		}
-
-
-		public String getInsuranceEndTimes() {
-			return insuranceEndTimes;
-		}
-
-
-		public void setInsuranceEndTimes(String insuranceEndTimes) {
-			this.insuranceEndTimes = insuranceEndTimes;
-		}
-
-
-		public String getFundStartTimes() {
-			return fundStartTimes;
-		}
-
-
-		public void setFundStartTimes(String fundStartTimes) {
-			this.fundStartTimes = fundStartTimes;
-		}
-
-
-		public String getFundEndTimes() {
-			return fundEndTimes;
-		}
-
-
-		public void setFundEndTimes(String fundEndTimes) {
-			this.fundEndTimes = fundEndTimes;
-		}
-	    
-
-
-}

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

@@ -15,10 +15,10 @@ import com.goafanti.personnel.bo.InputPersonnelListBo;
 import com.goafanti.personnel.bo.InputPersonnelLvlBo;
 import com.goafanti.personnel.bo.InputPersonnelPromotionBo;
 import com.goafanti.personnel.bo.InputPersonnelQuitBo;
+import com.goafanti.personnel.bo.IntpersonnelWelfareBo;
 import com.goafanti.personnel.bo.OutPersonnelBo;
 import com.goafanti.personnel.bo.OutPersonnelListBo;
 import com.goafanti.personnel.bo.OutPersonnelLvlBo;
-import com.goafanti.personnel.controller.IntpersonnelWelfareBo;
 
 public interface PersonnelService {
 

+ 67 - 12
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -32,6 +32,7 @@ import com.goafanti.common.dao.PersonnelContractMapper;
 import com.goafanti.common.dao.PersonnelDossierMapper;
 import com.goafanti.common.dao.PersonnelEntryMapper;
 import com.goafanti.common.dao.PersonnelLevelMapper;
+import com.goafanti.common.dao.PersonnelMidMapper;
 import com.goafanti.common.dao.PersonnelPromotionMapper;
 import com.goafanti.common.dao.PersonnelQuitMapper;
 import com.goafanti.common.dao.PersonnelWelfareMapper;
@@ -39,6 +40,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.PersonnelContact;
 import com.goafanti.common.model.PersonnelDossier;
 import com.goafanti.common.model.PersonnelEntry;
+import com.goafanti.common.model.PersonnelMid;
 import com.goafanti.common.model.PersonnelWelfare;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -53,10 +55,10 @@ import com.goafanti.personnel.bo.InputPersonnelListBo;
 import com.goafanti.personnel.bo.InputPersonnelLvlBo;
 import com.goafanti.personnel.bo.InputPersonnelPromotionBo;
 import com.goafanti.personnel.bo.InputPersonnelQuitBo;
+import com.goafanti.personnel.bo.IntpersonnelWelfareBo;
 import com.goafanti.personnel.bo.OutPersonnelBo;
 import com.goafanti.personnel.bo.OutPersonnelListBo;
 import com.goafanti.personnel.bo.OutPersonnelLvlBo;
-import com.goafanti.personnel.controller.IntpersonnelWelfareBo;
 import com.goafanti.personnel.service.PersonnelService;
 
 @Service
@@ -80,10 +82,13 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	@Autowired
 	private PersonnelWelfareMapper	personnelWelfareMapper;
 	@Autowired
+	private PersonnelMidMapper	personnelMidMapper;
+	@Autowired
 	private DistrictGlossoryMapper	districtGlossoryMapper;
 	
 	@Override
 	public int addPersonnel(InputPersonnelBo i) {
+		personnelMidMapper.insertSelective(new PersonnelMid(i.getId()));
 		return personnelDossierMapper.insertSelective(i);
 	}
 
@@ -114,7 +119,15 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 			}else {
 				personnelContactMapper.insertSelective(pc);
 			}
+			
 		}
+		PersonnelContact pc =list.get(0);
+		PersonnelMid m=new PersonnelMid();
+		m.setId(i.getId());
+		m.setEmergencyContact(pc.getEmergencyContact());
+		m.setEmergencyMobile(pc.getEmergencyMobile());
+		personnelMidMapper.updateByPrimaryKeySelective(m);
+		
 		return 1;
 	}
 
@@ -136,6 +149,11 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}else {
 			personnelPromotionMapper.updateByPrimaryKeySelective(i);
 		}
+		PersonnelMid p=new PersonnelMid();
+		p.setId(i.getPdId());
+		p.setPromotionRemarks(i.getPromotionRemarks());
+		p.setPromotionTime(i.getPromotionTime());
+		personnelMidMapper.updateByPrimaryKeySelective(p);
 		return 1;
 	}
 
@@ -152,6 +170,11 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		} else {
 			personnelContractMapper.updateByPrimaryKeySelective(i);
 		}
+		PersonnelMid p=new PersonnelMid();
+		p.setId(i.getPdId());
+		p.setContractStartTime(i.getStartTime());
+		p.setContractEndTime(i.getEndTime());
+		personnelMidMapper.updateByPrimaryKeySelective(p);
 		return 1;
 	}
 
@@ -172,9 +195,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		} else {
 			personnelQuitMapper.updateByPrimaryKeySelective(i);
 		}
-		PersonnelDossier pd=new PersonnelDossier();
-		pd.setId(i.getPdId());
-		personnelDossierMapper.updateByPrimaryKeySelective(pd);
+		PersonnelMid p=new PersonnelMid();
+		p.setId(i.getPdId());
+		p.setQuitTime(i.getEffectTime());
+		personnelMidMapper.updateByPrimaryKeySelective(p);
 		return 1;
 	}
 
@@ -193,10 +217,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		//处理省市区的转换
 		for (OutPersonnelListBo ob : (List<OutPersonnelListBo>)p.getList()) {
 			String residenceName=districtTransformation(ob.getResidenceProvince(),ob.getResidenceCity(),ob.getResidenceArea(),
-					ob.getResidenceAddress(), "");
-			String nativePlaceName =districtTransformation(ob.getNativePlaceProvince(),ob.getNativePlaceCity(),null,null, "");
+					ob.getResidenceAddress());
+			String nativePlaceName =districtTransformation(ob.getNativePlaceProvince(),ob.getNativePlaceCity(),null,null);
 			String nowName=districtTransformation(ob.getNowProvince(),ob.getNowCity(),ob.getNowArea(),
-					ob.getNowAddress(), "");
+					ob.getNowAddress());
 			ob.setResidenceName(residenceName);
 			ob.setNativePlaceName(nativePlaceName);
 			ob.setNowName(nowName);
@@ -209,10 +233,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	public OutPersonnelBo selectBypdId(Integer id) {
 		OutPersonnelBo op=	personnelDossierMapper.selectBypdId(id);
 		String residenceName=districtTransformation(op.getResidenceProvince(),op.getResidenceCity(),op.getResidenceArea(),
-				op.getResidenceAddress(), "");
-		String nativePlaceName =districtTransformation(op.getNativePlaceProvince(),op.getNativePlaceCity(),null,null, "");
+				op.getResidenceAddress());
+		String nativePlaceName =districtTransformation(op.getNativePlaceProvince(),op.getNativePlaceCity(),null,null);
 		String nowName=districtTransformation(op.getNowProvince(),op.getNowCity(),op.getNowArea(),
-				op.getNowAddress(), "");
+				op.getNowAddress());
 		op.setResidenceName(residenceName);
 		op.setNativePlaceName(nativePlaceName);
 		op.setNowName(nowName);
@@ -223,6 +247,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		op.setContractList(personnelContractMapper.selectBypdId(id));
 		op.setChooseList(personnelChooseMapper.selectBypdId(id));
 		op.setQuitList(personnelQuitMapper.selectBypdId(id));
+		op.setWelfareList(personnelWelfareMapper.selectBypdId(id));
 		return op;
 	}
 
@@ -292,6 +317,11 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				case "现住址": o = ob.getNowName(); break;
     				case "紧急联系人": o = ob.getEmergencyContact(); break;
     				case "紧急联系人电话": o = ob.getEmergencyMobile(); break;
+    				case "入社保时间": o = ob.getInsuranceStartTimes(); break;
+    				case "停社保时间": o = ob.getInsuranceEndTimes(); break;
+    				case "入公积金时间": o = ob.getFundStartTimes(); break;
+    				case "停公积金时间": o = ob.getFundEndTimes(); break;
+    				case "离职时间": o = ob.getQuitTime(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -312,11 +342,21 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 			 out.close(); 
 		}
 	}
-
-	private String districtTransformation(Integer p,Integer c,Integer a,String address, String residenceName) {
+	
+	/**
+	 * 省市区转换
+	 * @param p 省
+	 * @param c 市
+	 * @param a 区
+	 * @param address 地址
+	 * @param residenceName 
+	 * @return
+	 */
+	private String districtTransformation(Integer p,Integer c,Integer a,String address) {
 		List<ProvinceBo> plist= districtGlossoryMapper.getProvince();
 		List<CityBo>  clist= districtGlossoryMapper.getCity();
 		List<AreaBo>  alist= districtGlossoryMapper.getArea();
+		String residenceName="" ;
 		if (p!=null) {
 			for (ProvinceBo pb : plist) {
 				if (pb.getId().equals(p)) {
@@ -369,6 +409,21 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}else {
 			personnelWelfareMapper.updateByPrimaryKeySelective(i);
 		}
+		PersonnelMid m=new PersonnelMid();
+		m.setId(i.getPdId());
+		if (i.getType()==0) {
+			m.setInsuranceStartTime(i.getStartTime());
+			m.setInsuranceEndTime(i.getEndTime());
+		}else if (i.getType()==1) {
+			m.setFundStartTime(i.getStartTime());
+			m.setFundEndTime(i.getEndTime());
+		}else if (i.getType()==2) {
+			m.setEmployerStartTime(i.getStartTime());
+			m.setEmployerEndTime(i.getEndTime());
+		}
+		m.setWelfareAnnexUrl(i.getAnnexUrl());
+		m.setWelfareAnnexName(i.getAnnexName());
+		personnelMidMapper.updateByPrimaryKeySelective(m);
 		return 1;
 	}
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.40
+#static.host=//sb.jishutao.com/1.1.41
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.40
+static.host=//static.jishutao.com/1.1.41
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload