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

人事新增福利

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
2755c7e2db
23 измененных файлов с 6989 добавлено и 3977 удалено
  1. 1 1
      GeneratorConfig.xml
  2. 55 76
      src/main/java/com/goafanti/common/dao/PersonnelDossierMapper.java
  3. 100 0
      src/main/java/com/goafanti/common/dao/PersonnelLevelMapper.java
  4. 96 0
      src/main/java/com/goafanti/common/dao/PersonnelWelfareMapper.java
  5. 40 37
      src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml
  6. 356 0
      src/main/java/com/goafanti/common/mapper/PersonnelLevelMapper.xml
  7. 351 0
      src/main/java/com/goafanti/common/mapper/PersonnelWelfareMapper.xml
  8. 852 1220
      src/main/java/com/goafanti/common/model/PersonnelDossier.java
  9. 2572 2623
      src/main/java/com/goafanti/common/model/PersonnelDossierExample.java
  10. 303 0
      src/main/java/com/goafanti/common/model/PersonnelLevel.java
  11. 844 0
      src/main/java/com/goafanti/common/model/PersonnelLevelExample.java
  12. 302 0
      src/main/java/com/goafanti/common/model/PersonnelWelfare.java
  13. 873 0
      src/main/java/com/goafanti/common/model/PersonnelWelfareExample.java
  14. 6 5
      src/main/java/com/goafanti/personnel/bo/InputPersonnelBo.java
  15. 7 0
      src/main/java/com/goafanti/personnel/bo/InputPersonnelLvlBo.java
  16. 14 10
      src/main/java/com/goafanti/personnel/bo/OutPersonnelBo.java
  17. 29 0
      src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java
  18. 32 0
      src/main/java/com/goafanti/personnel/bo/OutPersonnelLvlBo.java
  19. 7 0
      src/main/java/com/goafanti/personnel/bo/PersonnelWelfareBo.java
  20. 44 2
      src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java
  21. 58 0
      src/main/java/com/goafanti/personnel/controller/IntpersonnelWelfareBo.java
  22. 10 1
      src/main/java/com/goafanti/personnel/service/PersonnelService.java
  23. 37 2
      src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

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

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

@@ -9,92 +9,71 @@ import org.apache.ibatis.annotations.Param;
 
 public interface PersonnelDossierMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	long countByExample(PersonnelDossierExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int deleteByExample(PersonnelDossierExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int insert(PersonnelDossier record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int insertSelective(PersonnelDossier record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	List<PersonnelDossier> selectByExample(PersonnelDossierExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	PersonnelDossier selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int updateByExampleSelective(@Param("record") PersonnelDossier record,
+			@Param("example") PersonnelDossierExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int updateByExample(@Param("record") PersonnelDossier record, @Param("example") PersonnelDossierExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 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
+	 */
+	int updateByPrimaryKeySelective(PersonnelDossier record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_dossier
-     *
-     * @mbg.generated Thu Apr 23 16:39:48 CST 2020
-     */
-    int updateByPrimaryKey(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
+	 */
+	int updateByPrimaryKey(PersonnelDossier record);
 
 	int checkDoorId(Integer doorId);
 

+ 100 - 0
src/main/java/com/goafanti/common/dao/PersonnelLevelMapper.java

@@ -0,0 +1,100 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PersonnelLevel;
+import com.goafanti.common.model.PersonnelLevelExample;
+import com.goafanti.personnel.bo.OutPersonnelLvlBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PersonnelLevelMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    long countByExample(PersonnelLevelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int deleteByExample(PersonnelLevelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int insert(PersonnelLevel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int insertSelective(PersonnelLevel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    List<PersonnelLevel> selectByExample(PersonnelLevelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    PersonnelLevel selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") PersonnelLevel record, @Param("example") PersonnelLevelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int updateByExample(@Param("record") PersonnelLevel record, @Param("example") PersonnelLevelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int updateByPrimaryKeySelective(PersonnelLevel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    int updateByPrimaryKey(PersonnelLevel record);
+
+	List<OutPersonnelLvlBo> selectAll();
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/PersonnelWelfareMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PersonnelWelfare;
+import com.goafanti.common.model.PersonnelWelfareExample;
+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 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 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 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 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 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 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 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 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 Wed Apr 29 16:53:46 CST 2020
+     */
+    int updateByPrimaryKey(PersonnelWelfare record);
+}

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
@@ -29,7 +29,7 @@
     <result column="id_card" jdbcType="VARCHAR" property="idCard" />
     <result column="certification_authority" jdbcType="VARCHAR" property="certificationAuthority" />
     <result column="marriage" jdbcType="INTEGER" property="marriage" />
-    <result column="political_outlook" jdbcType="VARCHAR" property="politicalOutlook" />
+    <result column="political_outlook" jdbcType="INTEGER" property="politicalOutlook" />
     <result column="son" jdbcType="INTEGER" property="son" />
     <result column="girl" jdbcType="INTEGER" property="girl" />
     <result column="status" jdbcType="INTEGER" property="status" />
@@ -37,7 +37,7 @@
     <result column="job_nature" jdbcType="INTEGER" property="jobNature" />
     <result column="job_nature_remarks" jdbcType="VARCHAR" property="jobNatureRemarks" />
     <result column="entry_time" jdbcType="TIMESTAMP" property="entryTime" />
-    <result column="quit_time" jdbcType="TIMESTAMP" property="quitTime" />
+    <result column="promotion_time" jdbcType="TIMESTAMP" property="promotionTime" />
     <result column="company" jdbcType="VARCHAR" property="company" />
     <result column="lvl" jdbcType="INTEGER" property="lvl" />
     <result column="jobs" jdbcType="INTEGER" property="jobs" />
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -83,7 +83,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -117,19 +117,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 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, quit_time, company, lvl, jobs, star, allowance, create_time
+    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelDossierExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     select
     <if test="distinct">
@@ -148,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -159,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     delete from personnel_dossier
     where id = #{id,jdbcType=INTEGER}
@@ -168,7 +168,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     delete from personnel_dossier
     <if test="_parameter != null">
@@ -179,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     insert into personnel_dossier (id, aid, door_id, 
       name, birthday, sex, 
@@ -191,7 +191,7 @@
       certification_authority, marriage, political_outlook, 
       son, girl, status, 
       system, job_nature, job_nature_remarks, 
-      entry_time, quit_time, company, 
+      entry_time, promotion_time, company, 
       lvl, jobs, star, allowance, 
       create_time)
     values (#{id,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{doorId,jdbcType=INTEGER}, 
@@ -201,10 +201,10 @@
       #{residenceAddress,jdbcType=VARCHAR}, #{nativePlaceProvince,jdbcType=INTEGER}, 
       #{nativePlaceCity,jdbcType=INTEGER}, #{nowProvince,jdbcType=INTEGER}, #{nowCity,jdbcType=INTEGER}, 
       #{nowArea,jdbcType=INTEGER}, #{nowAddress,jdbcType=VARCHAR}, #{idCard,jdbcType=VARCHAR}, 
-      #{certificationAuthority,jdbcType=VARCHAR}, #{marriage,jdbcType=INTEGER}, #{politicalOutlook,jdbcType=VARCHAR}, 
+      #{certificationAuthority,jdbcType=VARCHAR}, #{marriage,jdbcType=INTEGER}, #{politicalOutlook,jdbcType=INTEGER}, 
       #{son,jdbcType=INTEGER}, #{girl,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
       #{system,jdbcType=INTEGER}, #{jobNature,jdbcType=INTEGER}, #{jobNatureRemarks,jdbcType=VARCHAR}, 
-      #{entryTime,jdbcType=TIMESTAMP}, #{quitTime,jdbcType=TIMESTAMP}, #{company,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})
   </insert>
@@ -212,7 +212,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     insert into personnel_dossier
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -306,8 +306,8 @@
       <if test="entryTime != null">
         entry_time,
       </if>
-      <if test="quitTime != null">
-        quit_time,
+      <if test="promotionTime != null">
+        promotion_time,
       </if>
       <if test="company != null">
         company,
@@ -396,7 +396,7 @@
         #{marriage,jdbcType=INTEGER},
       </if>
       <if test="politicalOutlook != null">
-        #{politicalOutlook,jdbcType=VARCHAR},
+        #{politicalOutlook,jdbcType=INTEGER},
       </if>
       <if test="son != null">
         #{son,jdbcType=INTEGER},
@@ -419,8 +419,8 @@
       <if test="entryTime != null">
         #{entryTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="quitTime != null">
-        #{quitTime,jdbcType=TIMESTAMP},
+      <if test="promotionTime != null">
+        #{promotionTime,jdbcType=TIMESTAMP},
       </if>
       <if test="company != null">
         #{company,jdbcType=VARCHAR},
@@ -446,7 +446,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     select count(*) from personnel_dossier
     <if test="_parameter != null">
@@ -457,7 +457,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -528,7 +528,7 @@
         marriage = #{record.marriage,jdbcType=INTEGER},
       </if>
       <if test="record.politicalOutlook != null">
-        political_outlook = #{record.politicalOutlook,jdbcType=VARCHAR},
+        political_outlook = #{record.politicalOutlook,jdbcType=INTEGER},
       </if>
       <if test="record.son != null">
         son = #{record.son,jdbcType=INTEGER},
@@ -551,8 +551,8 @@
       <if test="record.entryTime != null">
         entry_time = #{record.entryTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.quitTime != null">
-        quit_time = #{record.quitTime,jdbcType=TIMESTAMP},
+      <if test="record.promotionTime != null">
+        promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.company != null">
         company = #{record.company,jdbcType=VARCHAR},
@@ -581,7 +581,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     update personnel_dossier
     set id = #{record.id,jdbcType=INTEGER},
@@ -606,7 +606,7 @@
       id_card = #{record.idCard,jdbcType=VARCHAR},
       certification_authority = #{record.certificationAuthority,jdbcType=VARCHAR},
       marriage = #{record.marriage,jdbcType=INTEGER},
-      political_outlook = #{record.politicalOutlook,jdbcType=VARCHAR},
+      political_outlook = #{record.politicalOutlook,jdbcType=INTEGER},
       son = #{record.son,jdbcType=INTEGER},
       girl = #{record.girl,jdbcType=INTEGER},
       status = #{record.status,jdbcType=INTEGER},
@@ -614,7 +614,7 @@
       job_nature = #{record.jobNature,jdbcType=INTEGER},
       job_nature_remarks = #{record.jobNatureRemarks,jdbcType=VARCHAR},
       entry_time = #{record.entryTime,jdbcType=TIMESTAMP},
-      quit_time = #{record.quitTime,jdbcType=TIMESTAMP},
+      promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
       company = #{record.company,jdbcType=VARCHAR},
       lvl = #{record.lvl,jdbcType=INTEGER},
       jobs = #{record.jobs,jdbcType=INTEGER},
@@ -629,7 +629,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -697,7 +697,7 @@
         marriage = #{marriage,jdbcType=INTEGER},
       </if>
       <if test="politicalOutlook != null">
-        political_outlook = #{politicalOutlook,jdbcType=VARCHAR},
+        political_outlook = #{politicalOutlook,jdbcType=INTEGER},
       </if>
       <if test="son != null">
         son = #{son,jdbcType=INTEGER},
@@ -720,8 +720,8 @@
       <if test="entryTime != null">
         entry_time = #{entryTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="quitTime != null">
-        quit_time = #{quitTime,jdbcType=TIMESTAMP},
+      <if test="promotionTime != null">
+        promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
       </if>
       <if test="company != null">
         company = #{company,jdbcType=VARCHAR},
@@ -748,7 +748,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 23 16:39:48 CST 2020.
+      This element was generated on Wed Apr 29 17:10:30 CST 2020.
     -->
     update personnel_dossier
     set aid = #{aid,jdbcType=VARCHAR},
@@ -772,7 +772,7 @@
       id_card = #{idCard,jdbcType=VARCHAR},
       certification_authority = #{certificationAuthority,jdbcType=VARCHAR},
       marriage = #{marriage,jdbcType=INTEGER},
-      political_outlook = #{politicalOutlook,jdbcType=VARCHAR},
+      political_outlook = #{politicalOutlook,jdbcType=INTEGER},
       son = #{son,jdbcType=INTEGER},
       girl = #{girl,jdbcType=INTEGER},
       status = #{status,jdbcType=INTEGER},
@@ -780,7 +780,7 @@
       job_nature = #{jobNature,jdbcType=INTEGER},
       job_nature_remarks = #{jobNatureRemarks,jdbcType=VARCHAR},
       entry_time = #{entryTime,jdbcType=TIMESTAMP},
-      quit_time = #{quitTime,jdbcType=TIMESTAMP},
+      promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
       company = #{company,jdbcType=VARCHAR},
       lvl = #{lvl,jdbcType=INTEGER},
       jobs = #{jobs,jdbcType=INTEGER},
@@ -806,7 +806,9 @@
 	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
+	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,
@@ -816,6 +818,7 @@
 	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
 	<if test="aid !=null">
 		left join admin ad on dep.id=ad.department_id
 	</if>

+ 356 - 0
src/main/java/com/goafanti/common/mapper/PersonnelLevelMapper.xml

@@ -0,0 +1,356 @@
+<?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.PersonnelLevelMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PersonnelLevel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="jobs" jdbcType="INTEGER" property="jobs" />
+    <result column="lvl" jdbcType="INTEGER" property="lvl" />
+    <result column="allowance" jdbcType="DECIMAL" property="allowance" />
+    <result column="alive_rewards" jdbcType="DECIMAL" property="aliveRewards" />
+    <result column="rewards" jdbcType="DECIMAL" property="rewards" />
+    <result column="two_rewards" jdbcType="DECIMAL" property="twoRewards" />
+    <result column="three_rewards" jdbcType="DECIMAL" property="threeRewards" />
+    <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 14:40:21 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 Wed Apr 29 14:40:21 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 Wed Apr 29 14:40:21 CST 2020.
+    -->
+    id, jobs, lvl, allowance, alive_rewards, rewards, two_rewards, three_rewards, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelLevelExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_level
+    <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 Wed Apr 29 14:40:21 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_level
+    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 Wed Apr 29 14:40:21 CST 2020.
+    -->
+    delete from personnel_level
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelLevelExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    delete from personnel_level
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PersonnelLevel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    insert into personnel_level (id, jobs, lvl, 
+      allowance, alive_rewards, rewards, 
+      two_rewards, three_rewards, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{jobs,jdbcType=INTEGER}, #{lvl,jdbcType=INTEGER}, 
+      #{allowance,jdbcType=DECIMAL}, #{aliveRewards,jdbcType=DECIMAL}, #{rewards,jdbcType=DECIMAL}, 
+      #{twoRewards,jdbcType=DECIMAL}, #{threeRewards,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelLevel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    insert into personnel_level
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="jobs != null">
+        jobs,
+      </if>
+      <if test="lvl != null">
+        lvl,
+      </if>
+      <if test="allowance != null">
+        allowance,
+      </if>
+      <if test="aliveRewards != null">
+        alive_rewards,
+      </if>
+      <if test="rewards != null">
+        rewards,
+      </if>
+      <if test="twoRewards != null">
+        two_rewards,
+      </if>
+      <if test="threeRewards != null">
+        three_rewards,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="jobs != null">
+        #{jobs,jdbcType=INTEGER},
+      </if>
+      <if test="lvl != null">
+        #{lvl,jdbcType=INTEGER},
+      </if>
+      <if test="allowance != null">
+        #{allowance,jdbcType=DECIMAL},
+      </if>
+      <if test="aliveRewards != null">
+        #{aliveRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="rewards != null">
+        #{rewards,jdbcType=DECIMAL},
+      </if>
+      <if test="twoRewards != null">
+        #{twoRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="threeRewards != null">
+        #{threeRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelLevelExample" 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 14:40:21 CST 2020.
+    -->
+    select count(*) from personnel_level
+    <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 Wed Apr 29 14:40:21 CST 2020.
+    -->
+    update personnel_level
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.jobs != null">
+        jobs = #{record.jobs,jdbcType=INTEGER},
+      </if>
+      <if test="record.lvl != null">
+        lvl = #{record.lvl,jdbcType=INTEGER},
+      </if>
+      <if test="record.allowance != null">
+        allowance = #{record.allowance,jdbcType=DECIMAL},
+      </if>
+      <if test="record.aliveRewards != null">
+        alive_rewards = #{record.aliveRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="record.rewards != null">
+        rewards = #{record.rewards,jdbcType=DECIMAL},
+      </if>
+      <if test="record.twoRewards != null">
+        two_rewards = #{record.twoRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="record.threeRewards != null">
+        three_rewards = #{record.threeRewards,jdbcType=DECIMAL},
+      </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 Wed Apr 29 14:40:21 CST 2020.
+    -->
+    update personnel_level
+    set id = #{record.id,jdbcType=INTEGER},
+      jobs = #{record.jobs,jdbcType=INTEGER},
+      lvl = #{record.lvl,jdbcType=INTEGER},
+      allowance = #{record.allowance,jdbcType=DECIMAL},
+      alive_rewards = #{record.aliveRewards,jdbcType=DECIMAL},
+      rewards = #{record.rewards,jdbcType=DECIMAL},
+      two_rewards = #{record.twoRewards,jdbcType=DECIMAL},
+      three_rewards = #{record.threeRewards,jdbcType=DECIMAL},
+      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.PersonnelLevel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    update personnel_level
+    <set>
+      <if test="jobs != null">
+        jobs = #{jobs,jdbcType=INTEGER},
+      </if>
+      <if test="lvl != null">
+        lvl = #{lvl,jdbcType=INTEGER},
+      </if>
+      <if test="allowance != null">
+        allowance = #{allowance,jdbcType=DECIMAL},
+      </if>
+      <if test="aliveRewards != null">
+        alive_rewards = #{aliveRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="rewards != null">
+        rewards = #{rewards,jdbcType=DECIMAL},
+      </if>
+      <if test="twoRewards != null">
+        two_rewards = #{twoRewards,jdbcType=DECIMAL},
+      </if>
+      <if test="threeRewards != null">
+        three_rewards = #{threeRewards,jdbcType=DECIMAL},
+      </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.PersonnelLevel">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 29 14:40:21 CST 2020.
+    -->
+    update personnel_level
+    set jobs = #{jobs,jdbcType=INTEGER},
+      lvl = #{lvl,jdbcType=INTEGER},
+      allowance = #{allowance,jdbcType=DECIMAL},
+      alive_rewards = #{aliveRewards,jdbcType=DECIMAL},
+      rewards = #{rewards,jdbcType=DECIMAL},
+      two_rewards = #{twoRewards,jdbcType=DECIMAL},
+      three_rewards = #{threeRewards,jdbcType=DECIMAL},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectAll" resultType="com.goafanti.personnel.bo.OutPersonnelLvlBo">
+  select a.id,a.jobs,b.jobs_name jobsName,a.lvl,b.lvl_name lvlName ,a.allowance,a.alive_rewards aliveRewards,
+	a.rewards ,a.two_rewards twoRewards,a.three_rewards threeRewards,a.create_time
+	from personnel_level a left join admin_level b on a.jobs=b.jobs and a.lvl=b.lvl
+  </select>
+</mapper>

+ 351 - 0
src/main/java/com/goafanti/common/mapper/PersonnelWelfareMapper.xml

@@ -0,0 +1,351 @@
+<?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.PersonnelWelfareMapper">
+  <resultMap id="BaseResultMap" type="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.
+    -->
+    <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="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.
+    -->
+    <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 Wed Apr 29 16:53:46 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 Wed Apr 29 16:53:46 CST 2020.
+    -->
+    id, insurance_start_time, insurance_end_time, fund_start_time, fund_end_time, welfare_remarks, 
+    annex_url, annex_name, 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.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_welfare
+    <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 Wed Apr 29 16:53:46 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_welfare
+    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 Wed Apr 29 16:53:46 CST 2020.
+    -->
+    delete from personnel_welfare
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelWelfareExample">
+    <!--
+      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.
+    -->
+    delete from personnel_welfare
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" 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.
+    -->
+    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>
+  <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.
+    -->
+    insert into personnel_welfare
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </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="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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </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="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>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelWelfareExample" 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 16:53:46 CST 2020.
+    -->
+    select count(*) from personnel_welfare
+    <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 Wed Apr 29 16:53:46 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>
+      <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.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>
+    </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 Wed Apr 29 16:53:46 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},
+      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" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" 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.
+    -->
+    update personnel_welfare
+    <set>
+      <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="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>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" 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.
+    -->
+    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},
+      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>
+</mapper>

Разница между файлами не показана из-за своего большого размера
+ 852 - 1220
src/main/java/com/goafanti/common/model/PersonnelDossier.java


Разница между файлами не показана из-за своего большого размера
+ 2572 - 2623
src/main/java/com/goafanti/common/model/PersonnelDossierExample.java


+ 303 - 0
src/main/java/com/goafanti/common/model/PersonnelLevel.java

@@ -0,0 +1,303 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class PersonnelLevel {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.id
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.jobs
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private Integer jobs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.lvl
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private Integer lvl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.allowance
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private BigDecimal allowance;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.alive_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private BigDecimal aliveRewards;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private BigDecimal rewards;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.two_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private BigDecimal twoRewards;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.three_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private BigDecimal threeRewards;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_level.create_time
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.id
+     *
+     * @return the value of personnel_level.id
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.id
+     *
+     * @param id the value for personnel_level.id
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 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_level.jobs
+     *
+     * @return the value of personnel_level.jobs
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Integer getJobs() {
+        return jobs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.jobs
+     *
+     * @param jobs the value for personnel_level.jobs
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setJobs(Integer jobs) {
+        this.jobs = jobs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.lvl
+     *
+     * @return the value of personnel_level.lvl
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Integer getLvl() {
+        return lvl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.lvl
+     *
+     * @param lvl the value for personnel_level.lvl
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setLvl(Integer lvl) {
+        this.lvl = lvl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.allowance
+     *
+     * @return the value of personnel_level.allowance
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public BigDecimal getAllowance() {
+        return allowance;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.allowance
+     *
+     * @param allowance the value for personnel_level.allowance
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setAllowance(BigDecimal allowance) {
+        this.allowance = allowance;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.alive_rewards
+     *
+     * @return the value of personnel_level.alive_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public BigDecimal getAliveRewards() {
+        return aliveRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.alive_rewards
+     *
+     * @param aliveRewards the value for personnel_level.alive_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setAliveRewards(BigDecimal aliveRewards) {
+        this.aliveRewards = aliveRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.rewards
+     *
+     * @return the value of personnel_level.rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public BigDecimal getRewards() {
+        return rewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.rewards
+     *
+     * @param rewards the value for personnel_level.rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setRewards(BigDecimal rewards) {
+        this.rewards = rewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.two_rewards
+     *
+     * @return the value of personnel_level.two_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public BigDecimal getTwoRewards() {
+        return twoRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.two_rewards
+     *
+     * @param twoRewards the value for personnel_level.two_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setTwoRewards(BigDecimal twoRewards) {
+        this.twoRewards = twoRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.three_rewards
+     *
+     * @return the value of personnel_level.three_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public BigDecimal getThreeRewards() {
+        return threeRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.three_rewards
+     *
+     * @param threeRewards the value for personnel_level.three_rewards
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setThreeRewards(BigDecimal threeRewards) {
+        this.threeRewards = threeRewards;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_level.create_time
+     *
+     * @return the value of personnel_level.create_time
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_level.create_time
+     *
+     * @param createTime the value for personnel_level.create_time
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 844 - 0
src/main/java/com/goafanti/common/model/PersonnelLevelExample.java

@@ -0,0 +1,844 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PersonnelLevelExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public PersonnelLevelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsIsNull() {
+            addCriterion("jobs is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsIsNotNull() {
+            addCriterion("jobs is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsEqualTo(Integer value) {
+            addCriterion("jobs =", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsNotEqualTo(Integer value) {
+            addCriterion("jobs <>", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsGreaterThan(Integer value) {
+            addCriterion("jobs >", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsGreaterThanOrEqualTo(Integer value) {
+            addCriterion("jobs >=", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsLessThan(Integer value) {
+            addCriterion("jobs <", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsLessThanOrEqualTo(Integer value) {
+            addCriterion("jobs <=", value, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsIn(List<Integer> values) {
+            addCriterion("jobs in", values, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsNotIn(List<Integer> values) {
+            addCriterion("jobs not in", values, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsBetween(Integer value1, Integer value2) {
+            addCriterion("jobs between", value1, value2, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobsNotBetween(Integer value1, Integer value2) {
+            addCriterion("jobs not between", value1, value2, "jobs");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlIsNull() {
+            addCriterion("lvl is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlIsNotNull() {
+            addCriterion("lvl is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlEqualTo(Integer value) {
+            addCriterion("lvl =", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlNotEqualTo(Integer value) {
+            addCriterion("lvl <>", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlGreaterThan(Integer value) {
+            addCriterion("lvl >", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlGreaterThanOrEqualTo(Integer value) {
+            addCriterion("lvl >=", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlLessThan(Integer value) {
+            addCriterion("lvl <", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlLessThanOrEqualTo(Integer value) {
+            addCriterion("lvl <=", value, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlIn(List<Integer> values) {
+            addCriterion("lvl in", values, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlNotIn(List<Integer> values) {
+            addCriterion("lvl not in", values, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlBetween(Integer value1, Integer value2) {
+            addCriterion("lvl between", value1, value2, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLvlNotBetween(Integer value1, Integer value2) {
+            addCriterion("lvl not between", value1, value2, "lvl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceIsNull() {
+            addCriterion("allowance is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceIsNotNull() {
+            addCriterion("allowance is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceEqualTo(BigDecimal value) {
+            addCriterion("allowance =", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceNotEqualTo(BigDecimal value) {
+            addCriterion("allowance <>", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceGreaterThan(BigDecimal value) {
+            addCriterion("allowance >", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("allowance >=", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceLessThan(BigDecimal value) {
+            addCriterion("allowance <", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("allowance <=", value, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceIn(List<BigDecimal> values) {
+            addCriterion("allowance in", values, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceNotIn(List<BigDecimal> values) {
+            addCriterion("allowance not in", values, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("allowance between", value1, value2, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllowanceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("allowance not between", value1, value2, "allowance");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsIsNull() {
+            addCriterion("alive_rewards is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsIsNotNull() {
+            addCriterion("alive_rewards is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsEqualTo(BigDecimal value) {
+            addCriterion("alive_rewards =", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsNotEqualTo(BigDecimal value) {
+            addCriterion("alive_rewards <>", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsGreaterThan(BigDecimal value) {
+            addCriterion("alive_rewards >", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("alive_rewards >=", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsLessThan(BigDecimal value) {
+            addCriterion("alive_rewards <", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("alive_rewards <=", value, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsIn(List<BigDecimal> values) {
+            addCriterion("alive_rewards in", values, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsNotIn(List<BigDecimal> values) {
+            addCriterion("alive_rewards not in", values, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("alive_rewards between", value1, value2, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andAliveRewardsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("alive_rewards not between", value1, value2, "aliveRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsIsNull() {
+            addCriterion("rewards is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsIsNotNull() {
+            addCriterion("rewards is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsEqualTo(BigDecimal value) {
+            addCriterion("rewards =", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsNotEqualTo(BigDecimal value) {
+            addCriterion("rewards <>", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsGreaterThan(BigDecimal value) {
+            addCriterion("rewards >", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("rewards >=", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsLessThan(BigDecimal value) {
+            addCriterion("rewards <", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("rewards <=", value, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsIn(List<BigDecimal> values) {
+            addCriterion("rewards in", values, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsNotIn(List<BigDecimal> values) {
+            addCriterion("rewards not in", values, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("rewards between", value1, value2, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andRewardsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("rewards not between", value1, value2, "rewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsIsNull() {
+            addCriterion("two_rewards is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsIsNotNull() {
+            addCriterion("two_rewards is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsEqualTo(BigDecimal value) {
+            addCriterion("two_rewards =", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsNotEqualTo(BigDecimal value) {
+            addCriterion("two_rewards <>", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsGreaterThan(BigDecimal value) {
+            addCriterion("two_rewards >", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("two_rewards >=", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsLessThan(BigDecimal value) {
+            addCriterion("two_rewards <", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("two_rewards <=", value, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsIn(List<BigDecimal> values) {
+            addCriterion("two_rewards in", values, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsNotIn(List<BigDecimal> values) {
+            addCriterion("two_rewards not in", values, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("two_rewards between", value1, value2, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andTwoRewardsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("two_rewards not between", value1, value2, "twoRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsIsNull() {
+            addCriterion("three_rewards is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsIsNotNull() {
+            addCriterion("three_rewards is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsEqualTo(BigDecimal value) {
+            addCriterion("three_rewards =", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsNotEqualTo(BigDecimal value) {
+            addCriterion("three_rewards <>", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsGreaterThan(BigDecimal value) {
+            addCriterion("three_rewards >", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("three_rewards >=", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsLessThan(BigDecimal value) {
+            addCriterion("three_rewards <", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("three_rewards <=", value, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsIn(List<BigDecimal> values) {
+            addCriterion("three_rewards in", values, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsNotIn(List<BigDecimal> values) {
+            addCriterion("three_rewards not in", values, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("three_rewards between", value1, value2, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andThreeRewardsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("three_rewards not between", value1, value2, "threeRewards");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_level
+     *
+     * @mbg.generated do_not_delete_during_merge Wed Apr 29 14:40:21 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_level
+     *
+     * @mbg.generated Wed Apr 29 14:40:21 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 302 - 0
src/main/java/com/goafanti/common/model/PersonnelWelfare.java

@@ -0,0 +1,302 @@
+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;
+    }
+}

+ 873 - 0
src/main/java/com/goafanti/common/model/PersonnelWelfareExample.java

@@ -0,0 +1,873 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PersonnelWelfareExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * 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
+     */
+    public PersonnelWelfareExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * 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
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * 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
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * 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
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * 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
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * 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
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * 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
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * 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
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeIsNull() {
+            addCriterion("insurance_start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeIsNotNull() {
+            addCriterion("insurance_start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeEqualTo(Date value) {
+            addCriterion("insurance_start_time =", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeNotEqualTo(Date value) {
+            addCriterion("insurance_start_time <>", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeGreaterThan(Date value) {
+            addCriterion("insurance_start_time >", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("insurance_start_time >=", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeLessThan(Date value) {
+            addCriterion("insurance_start_time <", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("insurance_start_time <=", value, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeIn(List<Date> values) {
+            addCriterion("insurance_start_time in", values, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeNotIn(List<Date> values) {
+            addCriterion("insurance_start_time not in", values, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeBetween(Date value1, Date value2) {
+            addCriterion("insurance_start_time between", value1, value2, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("insurance_start_time not between", value1, value2, "insuranceStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeIsNull() {
+            addCriterion("insurance_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeIsNotNull() {
+            addCriterion("insurance_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeEqualTo(Date value) {
+            addCriterion("insurance_end_time =", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeNotEqualTo(Date value) {
+            addCriterion("insurance_end_time <>", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeGreaterThan(Date value) {
+            addCriterion("insurance_end_time >", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("insurance_end_time >=", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeLessThan(Date value) {
+            addCriterion("insurance_end_time <", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("insurance_end_time <=", value, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeIn(List<Date> values) {
+            addCriterion("insurance_end_time in", values, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeNotIn(List<Date> values) {
+            addCriterion("insurance_end_time not in", values, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeBetween(Date value1, Date value2) {
+            addCriterion("insurance_end_time between", value1, value2, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuranceEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("insurance_end_time not between", value1, value2, "insuranceEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeIsNull() {
+            addCriterion("fund_start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeIsNotNull() {
+            addCriterion("fund_start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeEqualTo(Date value) {
+            addCriterion("fund_start_time =", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeNotEqualTo(Date value) {
+            addCriterion("fund_start_time <>", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeGreaterThan(Date value) {
+            addCriterion("fund_start_time >", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("fund_start_time >=", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeLessThan(Date value) {
+            addCriterion("fund_start_time <", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("fund_start_time <=", value, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeIn(List<Date> values) {
+            addCriterion("fund_start_time in", values, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeNotIn(List<Date> values) {
+            addCriterion("fund_start_time not in", values, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeBetween(Date value1, Date value2) {
+            addCriterion("fund_start_time between", value1, value2, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("fund_start_time not between", value1, value2, "fundStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeIsNull() {
+            addCriterion("fund_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeIsNotNull() {
+            addCriterion("fund_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeEqualTo(Date value) {
+            addCriterion("fund_end_time =", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeNotEqualTo(Date value) {
+            addCriterion("fund_end_time <>", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeGreaterThan(Date value) {
+            addCriterion("fund_end_time >", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("fund_end_time >=", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeLessThan(Date value) {
+            addCriterion("fund_end_time <", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("fund_end_time <=", value, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeIn(List<Date> values) {
+            addCriterion("fund_end_time in", values, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeNotIn(List<Date> values) {
+            addCriterion("fund_end_time not in", values, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeBetween(Date value1, Date value2) {
+            addCriterion("fund_end_time between", value1, value2, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("fund_end_time not between", value1, value2, "fundEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksIsNull() {
+            addCriterion("welfare_remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksIsNotNull() {
+            addCriterion("welfare_remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksEqualTo(String value) {
+            addCriterion("welfare_remarks =", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksNotEqualTo(String value) {
+            addCriterion("welfare_remarks <>", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksGreaterThan(String value) {
+            addCriterion("welfare_remarks >", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("welfare_remarks >=", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksLessThan(String value) {
+            addCriterion("welfare_remarks <", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksLessThanOrEqualTo(String value) {
+            addCriterion("welfare_remarks <=", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksLike(String value) {
+            addCriterion("welfare_remarks like", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksNotLike(String value) {
+            addCriterion("welfare_remarks not like", value, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksIn(List<String> values) {
+            addCriterion("welfare_remarks in", values, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksNotIn(List<String> values) {
+            addCriterion("welfare_remarks not in", values, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksBetween(String value1, String value2) {
+            addCriterion("welfare_remarks between", value1, value2, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andWelfareRemarksNotBetween(String value1, String value2) {
+            addCriterion("welfare_remarks not between", value1, value2, "welfareRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlIsNull() {
+            addCriterion("annex_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlIsNotNull() {
+            addCriterion("annex_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlEqualTo(String value) {
+            addCriterion("annex_url =", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlNotEqualTo(String value) {
+            addCriterion("annex_url <>", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlGreaterThan(String value) {
+            addCriterion("annex_url >", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("annex_url >=", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlLessThan(String value) {
+            addCriterion("annex_url <", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlLessThanOrEqualTo(String value) {
+            addCriterion("annex_url <=", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlLike(String value) {
+            addCriterion("annex_url like", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlNotLike(String value) {
+            addCriterion("annex_url not like", value, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlIn(List<String> values) {
+            addCriterion("annex_url in", values, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlNotIn(List<String> values) {
+            addCriterion("annex_url not in", values, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlBetween(String value1, String value2) {
+            addCriterion("annex_url between", value1, value2, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexUrlNotBetween(String value1, String value2) {
+            addCriterion("annex_url not between", value1, value2, "annexUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameIsNull() {
+            addCriterion("annex_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameIsNotNull() {
+            addCriterion("annex_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameEqualTo(String value) {
+            addCriterion("annex_name =", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameNotEqualTo(String value) {
+            addCriterion("annex_name <>", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameGreaterThan(String value) {
+            addCriterion("annex_name >", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameGreaterThanOrEqualTo(String value) {
+            addCriterion("annex_name >=", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameLessThan(String value) {
+            addCriterion("annex_name <", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameLessThanOrEqualTo(String value) {
+            addCriterion("annex_name <=", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameLike(String value) {
+            addCriterion("annex_name like", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameNotLike(String value) {
+            addCriterion("annex_name not like", value, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameIn(List<String> values) {
+            addCriterion("annex_name in", values, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameNotIn(List<String> values) {
+            addCriterion("annex_name not in", values, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameBetween(String value1, String value2) {
+            addCriterion("annex_name between", value1, value2, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnnexNameNotBetween(String value1, String value2) {
+            addCriterion("annex_name not between", value1, value2, "annexName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated do_not_delete_during_merge Wed Apr 29 16:53:46 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table personnel_welfare
+     *
+     * @mbg.generated Wed Apr 29 16:53:46 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 6 - 5
src/main/java/com/goafanti/personnel/bo/InputPersonnelBo.java

@@ -5,7 +5,7 @@ import com.goafanti.common.model.PersonnelDossier;
 public class InputPersonnelBo  extends PersonnelDossier{
 	private String birthdays;
 	private String entryTimes;
-	private String quitTimes;
+	private String promotionTimes;
 	
 
 	public String getBirthdays() {
@@ -24,12 +24,13 @@ public class InputPersonnelBo  extends PersonnelDossier{
 		this.entryTimes = entryTimes;
 	}
 
-	public String getQuitTimes() {
-		return quitTimes;
+
+	public String getPromotionTimes() {
+		return promotionTimes;
 	}
 
-	public void setQuitTimes(String quitTimes) {
-		this.quitTimes = quitTimes;
+	public void setPromotionTimes(String promotionTimes) {
+		this.promotionTimes = promotionTimes;
 	}
 
 }

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

@@ -0,0 +1,7 @@
+package com.goafanti.personnel.bo;
+
+import com.goafanti.common.model.PersonnelLevel;
+
+public class InputPersonnelLvlBo extends PersonnelLevel{
+	
+}

+ 14 - 10
src/main/java/com/goafanti/personnel/bo/OutPersonnelBo.java

@@ -3,12 +3,8 @@ package com.goafanti.personnel.bo;
 import java.math.BigDecimal;
 import java.util.List;
 
-import com.goafanti.common.model.PersonnelChoose;
 import com.goafanti.common.model.PersonnelContact;
-import com.goafanti.common.model.PersonnelContract;
 import com.goafanti.common.model.PersonnelEntry;
-import com.goafanti.common.model.PersonnelPromotion;
-import com.goafanti.common.model.PersonnelQuit;
 
 public class OutPersonnelBo extends OutPersonnelListBo {
 	
@@ -24,9 +20,11 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	
 	private List<PersonnelContractBo> contractList;
 	
-	private List<PersonnelChooseBo> ChooseList;
+	private List<PersonnelChooseBo> chooseList;
 	
-	private List<PersonnelQuitBo> QuitList;
+	private List<PersonnelQuitBo> quitList;
+	
+	private List<PersonnelWelfareBo> welfareList;
 	
 	public String getNation() {
 		return nation;
@@ -65,16 +63,22 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 		this.contractList = contractList;
 	}
 	public List<PersonnelChooseBo> getChooseList() {
-		return ChooseList;
+		return chooseList;
 	}
 	public void setChooseList(List<PersonnelChooseBo> chooseList) {
-		ChooseList = chooseList;
+		this.chooseList = chooseList;
 	}
 	public List<PersonnelQuitBo> getQuitList() {
-		return QuitList;
+		return quitList;
 	}
 	public void setQuitList(List<PersonnelQuitBo> quitList) {
-		QuitList = quitList;
+		this.quitList = quitList;
+	}
+	public List<PersonnelWelfareBo> getWelfareList() {
+		return welfareList;
+	}
+	public void setWelfareList(List<PersonnelWelfareBo> welfareList) {
+		this.welfareList = welfareList;
 	}
 	
 	

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

@@ -57,7 +57,36 @@ public class OutPersonnelListBo {
 	private String residenceName;
 	private String nativePlaceName;
 	private String nowName;
+	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;
+	}
 	public Integer getId() {
 		return id;
 	}

+ 32 - 0
src/main/java/com/goafanti/personnel/bo/OutPersonnelLvlBo.java

@@ -0,0 +1,32 @@
+package com.goafanti.personnel.bo;
+
+import com.goafanti.common.model.PersonnelLevel;
+
+public class OutPersonnelLvlBo extends PersonnelLevel {
+	
+    private String jobsName;
+
+    
+    private String lvlName;
+
+
+	public String getJobsName() {
+		return jobsName;
+	}
+
+
+	public void setJobsName(String jobsName) {
+		this.jobsName = jobsName;
+	}
+
+
+	public String getLvlName() {
+		return lvlName;
+	}
+
+
+	public void setLvlName(String lvlName) {
+		this.lvlName = lvlName;
+	}
+
+}

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

@@ -0,0 +1,7 @@
+package com.goafanti.personnel.bo;
+
+import com.goafanti.common.model.PersonnelWelfare;
+
+public class PersonnelWelfareBo extends PersonnelWelfare{
+
+}

+ 44 - 2
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -22,6 +22,7 @@ import com.goafanti.personnel.bo.InputPersonnelContactBo;
 import com.goafanti.personnel.bo.InputPersonnelContractBo;
 import com.goafanti.personnel.bo.InputPersonnelEntryBo;
 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.service.PersonnelService;
@@ -88,7 +89,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 		try {
 				if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
 				if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
-				if ( !StringUtils.isBlank(i.getQuitTimes()))i.setQuitTime(DateUtils.StringToDate(i.getQuitTimes(), AFTConstants.YYYYMMDD));
+				if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
 				return res;
@@ -197,9 +198,50 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	@RequestMapping(value = "/selectList", method = RequestMethod.GET)
 	public Result selectList(InputPersonnelListBo i){
 		Result res = new Result();
-		System.out.println(1);
 		return res.data(personnelService.selectList(i));
 	}
+	
+	
+	/**
+	 * 人事等级列表
+	 */
+	@RequestMapping(value = "/selectLvlList", method = RequestMethod.GET)
+	public Result selectLvlList(){
+		Result res = new Result();
+		return res.data(personnelService.selectLvlList());
+	}
+	
+	/**
+	 * 人事等级列表
+	 */
+	@RequestMapping(value = "/updateWelfare", method = RequestMethod.POST)
+	public Result updateWelfare(IntpersonnelWelfareBo i){
+		Result res = new Result();
+		if (null==i.getId()) {
+			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));
+		} catch (ParseException e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
+			return res;
+		}
+		return res.data(personnelService.updateWelfare(i));
+	}
+	
+	
+	/**
+	 * 人事等级修改
+	 */
+	@RequestMapping(value = "/updateLvl", method = RequestMethod.POST)
+	public Result updateLvl(InputPersonnelLvlBo i){
+		Result res = new Result();
+		return res.data(personnelService.updateLvl(i));
+	}
 	/**
 	 * 人事详情
 	 */

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

@@ -0,0 +1,58 @@
+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;
+		}
+	    
+
+
+}

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

@@ -1,21 +1,24 @@
 package com.goafanti.personnel.service;
 
 import java.io.IOException;
+import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.patent.bo.PatentNewBo;
 import com.goafanti.personnel.bo.InputPersonnelBo;
 import com.goafanti.personnel.bo.InputPersonnelChooseBo;
 import com.goafanti.personnel.bo.InputPersonnelContactBo;
 import com.goafanti.personnel.bo.InputPersonnelContractBo;
 import com.goafanti.personnel.bo.InputPersonnelEntryBo;
 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.OutPersonnelBo;
 import com.goafanti.personnel.bo.OutPersonnelListBo;
+import com.goafanti.personnel.bo.OutPersonnelLvlBo;
+import com.goafanti.personnel.controller.IntpersonnelWelfareBo;
 
 public interface PersonnelService {
 
@@ -44,5 +47,11 @@ public interface PersonnelService {
 
 	void exportPersonnelList(HttpServletResponse response, InputPersonnelListBo i) throws IOException;
 
+	List<OutPersonnelLvlBo> selectLvlList();
+
+	int updateLvl(InputPersonnelLvlBo i);
+
+	int updateWelfare(IntpersonnelWelfareBo i);
+
 
 }

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

@@ -31,12 +31,15 @@ import com.goafanti.common.dao.PersonnelContactMapper;
 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.PersonnelPromotionMapper;
 import com.goafanti.common.dao.PersonnelQuitMapper;
+import com.goafanti.common.dao.PersonnelWelfareMapper;
 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.PersonnelWelfare;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -47,10 +50,13 @@ import com.goafanti.personnel.bo.InputPersonnelContactBo;
 import com.goafanti.personnel.bo.InputPersonnelContractBo;
 import com.goafanti.personnel.bo.InputPersonnelEntryBo;
 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.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
@@ -70,7 +76,11 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	@Autowired
 	private PersonnelQuitMapper	personnelQuitMapper;
 	@Autowired
-	DistrictGlossoryMapper	districtGlossoryMapper;
+	private PersonnelLevelMapper	personnelLevelMapper;
+	@Autowired
+	private PersonnelWelfareMapper	personnelWelfareMapper;
+	@Autowired
+	private DistrictGlossoryMapper	districtGlossoryMapper;
 	
 	@Override
 	public int addPersonnel(InputPersonnelBo i) {
@@ -164,7 +174,6 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}
 		PersonnelDossier pd=new PersonnelDossier();
 		pd.setId(i.getPdId());
-		pd.setQuitTime(i.getEffectTime());
 		personnelDossierMapper.updateByPrimaryKeySelective(pd);
 		return 1;
 	}
@@ -336,4 +345,30 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 			
 		return residenceName;
 	}
+
+	@Override
+	public List<OutPersonnelLvlBo> selectLvlList() {
+		return personnelLevelMapper.selectAll();
+	}
+
+	@Override
+	public int updateLvl(InputPersonnelLvlBo i) {
+		if (i.getId()==null) {
+			personnelLevelMapper.insertSelective(i);
+		}else {
+			personnelLevelMapper.updateByPrimaryKeySelective(i);
+		}
+		return 1;
+	}
+
+	@Override
+	public int updateWelfare(IntpersonnelWelfareBo i) {
+		PersonnelWelfare p=personnelWelfareMapper.selectByPrimaryKey(i.getId());
+		if (p==null||p.getId()==null) {
+			personnelWelfareMapper.insertSelective(i);
+		}else {
+			personnelWelfareMapper.updateByPrimaryKeySelective(i);
+		}
+		return 1;
+	}
 }