Browse Source

人事开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
a3f357b734
31 changed files with 6615 additions and 1284 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 96 0
      src/main/java/com/goafanti/common/dao/PersonnelChooseMapper.java
  3. 96 0
      src/main/java/com/goafanti/common/dao/PersonnelContractMapper.java
  4. 2 0
      src/main/java/com/goafanti/common/dao/PersonnelDossierMapper.java
  5. 58 77
      src/main/java/com/goafanti/common/dao/PersonnelPromotionMapper.java
  6. 96 0
      src/main/java/com/goafanti/common/dao/PersonnelQuitMapper.java
  7. 333 0
      src/main/java/com/goafanti/common/mapper/PersonnelChooseMapper.xml
  8. 333 0
      src/main/java/com/goafanti/common/mapper/PersonnelContractMapper.xml
  9. 134 0
      src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml
  10. 53 23
      src/main/java/com/goafanti/common/mapper/PersonnelPromotionMapper.xml
  11. 318 0
      src/main/java/com/goafanti/common/mapper/PersonnelQuitMapper.xml
  12. 269 0
      src/main/java/com/goafanti/common/model/PersonnelChoose.java
  13. 813 0
      src/main/java/com/goafanti/common/model/PersonnelChooseExample.java
  14. 269 0
      src/main/java/com/goafanti/common/model/PersonnelContract.java
  15. 813 0
      src/main/java/com/goafanti/common/model/PersonnelContractExample.java
  16. 231 273
      src/main/java/com/goafanti/common/model/PersonnelPromotion.java
  17. 972 873
      src/main/java/com/goafanti/common/model/PersonnelPromotionExample.java
  18. 236 0
      src/main/java/com/goafanti/common/model/PersonnelQuit.java
  19. 753 0
      src/main/java/com/goafanti/common/model/PersonnelQuitExample.java
  20. 1 1
      src/main/java/com/goafanti/personnel/bo/InutpPersonnelBo.java
  21. 15 0
      src/main/java/com/goafanti/personnel/bo/InputPersonnelChooseBo.java
  22. 1 1
      src/main/java/com/goafanti/personnel/bo/InutpPersonnelContactBo.java
  23. 35 0
      src/main/java/com/goafanti/personnel/bo/InputPersonnelContractBo.java
  24. 1 1
      src/main/java/com/goafanti/personnel/bo/InutpPersonnelEntryBo.java
  25. 170 0
      src/main/java/com/goafanti/personnel/bo/InputPersonnelListBo.java
  26. 1 1
      src/main/java/com/goafanti/personnel/bo/InutpPersonnelPromotionBo.java
  27. 16 0
      src/main/java/com/goafanti/personnel/bo/InputPersonnelQuitBo.java
  28. 295 0
      src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java
  29. 100 14
      src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java
  30. 27 9
      src/main/java/com/goafanti/personnel/service/PersonnelService.java
  31. 77 10
      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_promotion"/>
+    <table schema="aft" tableName="personnel_quit"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

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

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

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PersonnelContract;
+import com.goafanti.common.model.PersonnelContractExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PersonnelContractMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    long countByExample(PersonnelContractExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int deleteByExample(PersonnelContractExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int insert(PersonnelContract record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int insertSelective(PersonnelContract record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    List<PersonnelContract> selectByExample(PersonnelContractExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    PersonnelContract selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") PersonnelContract record, @Param("example") PersonnelContractExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int updateByExample(@Param("record") PersonnelContract record, @Param("example") PersonnelContractExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int updateByPrimaryKeySelective(PersonnelContract record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    int updateByPrimaryKey(PersonnelContract record);
+}

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

@@ -93,4 +93,6 @@ public interface PersonnelDossierMapper {
      * @mbg.generated Thu Apr 23 16:39:48 CST 2020
      */
     int updateByPrimaryKey(PersonnelDossier record);
+
+	int checkDoorId(Integer doorId);
 }

+ 58 - 77
src/main/java/com/goafanti/common/dao/PersonnelPromotionMapper.java

@@ -6,91 +6,72 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface PersonnelPromotionMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    long countByExample(PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int deleteByExample(PersonnelPromotionExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	long countByExample(PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int deleteByExample(PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int insert(PersonnelPromotion record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int insertSelective(PersonnelPromotion record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int insert(PersonnelPromotion record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    List<PersonnelPromotion> selectByExample(PersonnelPromotionExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int insertSelective(PersonnelPromotion record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    PersonnelPromotion selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	List<PersonnelPromotion> selectByExample(PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int updateByExampleSelective(@Param("record") PersonnelPromotion record, @Param("example") PersonnelPromotionExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	PersonnelPromotion selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int updateByExample(@Param("record") PersonnelPromotion record, @Param("example") PersonnelPromotionExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") PersonnelPromotion record,
+			@Param("example") PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int updateByPrimaryKeySelective(PersonnelPromotion record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int updateByExample(@Param("record") PersonnelPromotion record,
+			@Param("example") PersonnelPromotionExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table personnel_promotion
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    int updateByPrimaryKey(PersonnelPromotion record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int updateByPrimaryKeySelective(PersonnelPromotion record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_promotion
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	int updateByPrimaryKey(PersonnelPromotion record);
 }

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

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PersonnelQuit;
+import com.goafanti.common.model.PersonnelQuitExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PersonnelQuitMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    long countByExample(PersonnelQuitExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int deleteByExample(PersonnelQuitExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int insert(PersonnelQuit record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int insertSelective(PersonnelQuit record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    List<PersonnelQuit> selectByExample(PersonnelQuitExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    PersonnelQuit selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") PersonnelQuit record, @Param("example") PersonnelQuitExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int updateByExample(@Param("record") PersonnelQuit record, @Param("example") PersonnelQuitExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int updateByPrimaryKeySelective(PersonnelQuit record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    int updateByPrimaryKey(PersonnelQuit record);
+}

+ 333 - 0
src/main/java/com/goafanti/common/mapper/PersonnelChooseMapper.xml

@@ -0,0 +1,333 @@
+<?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.PersonnelChooseMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PersonnelChoose">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pd_id" jdbcType="INTEGER" property="pdId" />
+    <result column="choose_status" jdbcType="INTEGER" property="chooseStatus" />
+    <result column="effect_time" jdbcType="TIMESTAMP" property="effectTime" />
+    <result column="choose_remarks" jdbcType="VARCHAR" property="chooseRemarks" />
+    <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 Sun Apr 26 10:31:26 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 Sun Apr 26 10:31:26 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 Sun Apr 26 10:31:26 CST 2020.
+    -->
+    id, pd_id, choose_status, effect_time, choose_remarks, annex_url, annex_name, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelChooseExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_choose
+    <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 Sun Apr 26 10:31:26 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_choose
+    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 Sun Apr 26 10:31:26 CST 2020.
+    -->
+    delete from personnel_choose
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelChooseExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    delete from personnel_choose
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PersonnelChoose">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    insert into personnel_choose (id, pd_id, choose_status, 
+      effect_time, choose_remarks, annex_url, 
+      annex_name, create_time)
+    values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{chooseStatus,jdbcType=INTEGER}, 
+      #{effectTime,jdbcType=TIMESTAMP}, #{chooseRemarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
+      #{annexName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelChoose">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    insert into personnel_choose
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pdId != null">
+        pd_id,
+      </if>
+      <if test="chooseStatus != null">
+        choose_status,
+      </if>
+      <if test="effectTime != null">
+        effect_time,
+      </if>
+      <if test="chooseRemarks != null">
+        choose_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="pdId != null">
+        #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="chooseStatus != null">
+        #{chooseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="effectTime != null">
+        #{effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="chooseRemarks != null">
+        #{chooseRemarks,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.PersonnelChooseExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    select count(*) from personnel_choose
+    <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 Sun Apr 26 10:31:26 CST 2020.
+    -->
+    update personnel_choose
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pdId != null">
+        pd_id = #{record.pdId,jdbcType=INTEGER},
+      </if>
+      <if test="record.chooseStatus != null">
+        choose_status = #{record.chooseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.effectTime != null">
+        effect_time = #{record.effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.chooseRemarks != null">
+        choose_remarks = #{record.chooseRemarks,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 Sun Apr 26 10:31:26 CST 2020.
+    -->
+    update personnel_choose
+    set id = #{record.id,jdbcType=INTEGER},
+      pd_id = #{record.pdId,jdbcType=INTEGER},
+      choose_status = #{record.chooseStatus,jdbcType=INTEGER},
+      effect_time = #{record.effectTime,jdbcType=TIMESTAMP},
+      choose_remarks = #{record.chooseRemarks,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.PersonnelChoose">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    update personnel_choose
+    <set>
+      <if test="pdId != null">
+        pd_id = #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="chooseStatus != null">
+        choose_status = #{chooseStatus,jdbcType=INTEGER},
+      </if>
+      <if test="effectTime != null">
+        effect_time = #{effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="chooseRemarks != null">
+        choose_remarks = #{chooseRemarks,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.PersonnelChoose">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:31:26 CST 2020.
+    -->
+    update personnel_choose
+    set pd_id = #{pdId,jdbcType=INTEGER},
+      choose_status = #{chooseStatus,jdbcType=INTEGER},
+      effect_time = #{effectTime,jdbcType=TIMESTAMP},
+      choose_remarks = #{chooseRemarks,jdbcType=VARCHAR},
+      annex_url = #{annexUrl,jdbcType=VARCHAR},
+      annex_name = #{annexName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 333 - 0
src/main/java/com/goafanti/common/mapper/PersonnelContractMapper.xml

@@ -0,0 +1,333 @@
+<?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.PersonnelContractMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PersonnelContract">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pd_id" jdbcType="INTEGER" property="pdId" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="contract_remarks" jdbcType="VARCHAR" property="contractRemarks" />
+    <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 Sun Apr 26 10:16:37 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 Sun Apr 26 10:16:37 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 Sun Apr 26 10:16:37 CST 2020.
+    -->
+    id, pd_id, start_time, end_time, contract_remarks, annex_url, annex_name, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelContractExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_contract
+    <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 Sun Apr 26 10:16:37 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_contract
+    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 Sun Apr 26 10:16:37 CST 2020.
+    -->
+    delete from personnel_contract
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelContractExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    delete from personnel_contract
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PersonnelContract">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    insert into personnel_contract (id, pd_id, start_time, 
+      end_time, contract_remarks, annex_url, 
+      annex_name, create_time)
+    values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{contractRemarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
+      #{annexName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelContract">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    insert into personnel_contract
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pdId != null">
+        pd_id,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="contractRemarks != null">
+        contract_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="pdId != null">
+        #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractRemarks != null">
+        #{contractRemarks,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.PersonnelContractExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    select count(*) from personnel_contract
+    <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 Sun Apr 26 10:16:37 CST 2020.
+    -->
+    update personnel_contract
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pdId != null">
+        pd_id = #{record.pdId,jdbcType=INTEGER},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.contractRemarks != null">
+        contract_remarks = #{record.contractRemarks,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 Sun Apr 26 10:16:37 CST 2020.
+    -->
+    update personnel_contract
+    set id = #{record.id,jdbcType=INTEGER},
+      pd_id = #{record.pdId,jdbcType=INTEGER},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      contract_remarks = #{record.contractRemarks,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.PersonnelContract">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    update personnel_contract
+    <set>
+      <if test="pdId != null">
+        pd_id = #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contractRemarks != null">
+        contract_remarks = #{contractRemarks,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.PersonnelContract">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:16:37 CST 2020.
+    -->
+    update personnel_contract
+    set pd_id = #{pdId,jdbcType=INTEGER},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      contract_remarks = #{contractRemarks,jdbcType=VARCHAR},
+      annex_url = #{annexUrl,jdbcType=VARCHAR},
+      annex_name = #{annexName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 134 - 0
src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml

@@ -789,4 +789,138 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+  <select id="checkDoorId" resultType="java.lang.Integer">
+  select count(*) from personnel_dossier where door_id= #{doorId,jdbcType=INTEGER}
+  </select>
+  
+  <select id="selectPersonnelByList" resultType="com.goafanti.personnel.bo.OutPersonnelListBo">
+	  select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,
+	b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
+	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,a.birthday,a.entry_time entryTime,
+	a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,d.school,d.major,d.title,
+	e.promotion_remarks promotionRemarks,date_format(e.promotion_time,'%Y-%m-%d') promotionTime,
+	date_format(f.start_time, '%Y-%m-%d') contractStart,date_format(f.end_time,'%Y-%m-%d')contractEnd,
+	a.mobile,a.fixed_tel fixedTel,a.id_card idCard,a.certification_authority certificationAuthority,
+	a.residence_province residenceProvince,a.residence_city residenceCity,a.residence_area residenceArea,
+	a.residence_address residenceAddress,a.native_place_province nativePlaceProvince,
+	a.native_place_city nativePlaceCity,a.now_province nowProvince,a.now_city nowCity,a.now_area nowArea,
+	a.now_address nowAddress,date_format(g.effect_time,'%Y-%m-%d') quitTime,
+	TIMESTAMPDIFF(year,a.entry_time,now()) workingYear
+	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl 
+	left join personnel_entry d on a.id=d.id left join (select id,pd_id,max(create_time)promotion_time,
+	 	promotion_remarks from personnel_promotion group by pd_id) e on a.id=e.pd_id
+	left join  (select id,pd_id,start_time,end_time,max(create_time) from personnel_contract group by pd_id)f 
+		on a.id=f.pd_id
+	left join (select id,pd_id,effect_time,max(create_time) from personnel_quit group by pd_id)g on a.id=g.pd_id
+	where 1=1
+	<if test="i.name != null">
+	and a.name like concat(#{i.name},'%')
+	</if>
+	<if test="i.company !=null">
+	and a.company= #{i.company}
+	</if>
+	<if test="i.status !=null">
+	and a.status= #{i.status}
+	</if>
+	<if test="i.sex !=null">
+	and a.sex= #{i.sex}
+	</if>
+	<if test="i.marriage !=null">
+	and a.marriage= #{i.marriage}
+	</if>
+	<if test="i.politicalOutlook !=null">
+	and a.political_outlook= #{i.politicalOutlook}
+	</if>
+	<if test="i.birthdayMonth !=null">
+	and month(a.birthday)= #{i.birthdayMonth}
+	</if>
+	<if test="i.promotionStart !=null and i.promotionEnd !=null">
+	and a.promotion_time between #{i.promotionStart} and #{i.promotionEnd}
+	</if>
+	<if test="i.entryStart !=null and i.entryEnd !=null">
+	and g.effect_time	between #{i.entryStart} and #{i.entryEnd}
+	</if>
+	<if test="i.system !=null">
+	and a.`system`= #{system}
+	</if>
+	<if test="i.workingYears ==0">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 0 and 1
+	</if>
+	<if test="i.workingYears ==1">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 1 and 3
+	</if>
+	<if test="i.workingYears ==2">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 3 and 10
+	</if>
+	<if test="i.workingYears ==3">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 10 and 99
+	</if>
+	<if test="i.quitStart !=null and i.quitEnd !=null">
+	and f.end_time between #{i.quitStart} and #{i.quitEnd}
+	</if>
+	<if test="i.education !=null">
+	and d.education= #{i.education}
+	</if>
+	order by a.create_time desc
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+   <select id="selectPersonnelByCount" resultType="java.lang.Integer">
+	  select count(*)
+	from personnel_dossier a left join personnel_entry d on a.id=d.id left join  (select id,pd_id,start_time,
+		end_time,max(create_time) from personnel_contract group by pd_id)f on a.id=f.pd_id
+	left join (select id,pd_id,effect_time,max(create_time) from personnel_quit group by pd_id)g on a.id=g.pd_id
+	where 1=1
+<if test="i.name != null">
+	and a.name like concat(#{i.name},'%')
+	</if>
+	<if test="i.company !=null">
+	and a.company= #{i.company}
+	</if>
+	<if test="i.status !=null">
+	and a.status= #{i.status}
+	</if>
+	<if test="i.sex !=null">
+	and a.sex= #{i.sex}
+	</if>
+	<if test="i.marriage !=null">
+	and a.marriage= #{i.marriage}
+	</if>
+	<if test="i.politicalOutlook !=null">
+	and a.political_outlook= #{i.politicalOutlook}
+	</if>
+	<if test="i.birthdayMonth !=null">
+	and month(a.birthday)= #{i.birthdayMonth}
+	</if>
+	<if test="i.promotionStart !=null and i.promotionEnd !=null">
+	and a.promotion_time between #{i.promotionStart} and #{i.promotionEnd}
+	</if>
+	<if test="i.entryStart !=null and i.entryEnd !=null">
+	and g.effect_time	between #{i.entryStart} and #{i.entryEnd}
+	</if>
+	<if test="i.system !=null">
+	and a.`system`= #{system}
+	</if>
+	<if test="i.workingYears ==0">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 0 and 1
+	</if>
+	<if test="i.workingYears ==1">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 1 and 3
+	</if>
+	<if test="i.workingYears ==2">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 3 and 10
+	</if>
+	<if test="i.workingYears ==3">
+	and TIMESTAMPDIFF(year,a.entry_time,now()) between 10 and 99
+	</if>
+	<if test="i.quitStart !=null and i.quitEnd !=null">
+	and f.end_time between #{i.quitStart} and #{i.quitEnd}
+	</if>
+	<if test="i.education !=null">
+	and d.education= #{i.education}
+	</if>
+  </select>
 </mapper>

+ 53 - 23
src/main/java/com/goafanti/common/mapper/PersonnelPromotionMapper.xml

@@ -5,12 +5,14 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="pd_id" jdbcType="INTEGER" property="pdId" />
     <result column="old_jobs" jdbcType="VARCHAR" property="oldJobs" />
+    <result column="old_lvl" jdbcType="VARCHAR" property="oldLvl" />
     <result column="new_jobs" jdbcType="VARCHAR" property="newJobs" />
+    <result column="new_lvl" jdbcType="VARCHAR" property="newLvl" />
     <result column="promotion_time" jdbcType="TIMESTAMP" property="promotionTime" />
     <result column="promotion_remarks" jdbcType="VARCHAR" property="promotionRemarks" />
     <result column="annex_url" jdbcType="VARCHAR" property="annexUrl" />
@@ -21,7 +23,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,16 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
-    id, pd_id, old_jobs, new_jobs, promotion_time, promotion_remarks, annex_url, annex_name, 
-    create_time
+    id, pd_id, old_jobs, old_lvl, new_jobs, new_lvl, promotion_time, promotion_remarks, 
+    annex_url, annex_name, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelPromotionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     select
     <if test="distinct">
@@ -117,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -128,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     delete from personnel_promotion
     where id = #{id,jdbcType=INTEGER}
@@ -137,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     delete from personnel_promotion
     <if test="_parameter != null">
@@ -148,22 +150,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     insert into personnel_promotion (id, pd_id, old_jobs, 
-      new_jobs, promotion_time, promotion_remarks, 
-      annex_url, annex_name, create_time
-      )
+      old_lvl, new_jobs, new_lvl, 
+      promotion_time, promotion_remarks, annex_url, 
+      annex_name, create_time)
     values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{oldJobs,jdbcType=VARCHAR}, 
-      #{newJobs,jdbcType=VARCHAR}, #{promotionTime,jdbcType=TIMESTAMP}, #{promotionRemarks,jdbcType=VARCHAR}, 
-      #{annexUrl,jdbcType=VARCHAR}, #{annexName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{oldLvl,jdbcType=VARCHAR}, #{newJobs,jdbcType=VARCHAR}, #{newLvl,jdbcType=VARCHAR}, 
+      #{promotionTime,jdbcType=TIMESTAMP}, #{promotionRemarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
+      #{annexName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelPromotion">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     insert into personnel_promotion
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -176,9 +178,15 @@
       <if test="oldJobs != null">
         old_jobs,
       </if>
+      <if test="oldLvl != null">
+        old_lvl,
+      </if>
       <if test="newJobs != null">
         new_jobs,
       </if>
+      <if test="newLvl != null">
+        new_lvl,
+      </if>
       <if test="promotionTime != null">
         promotion_time,
       </if>
@@ -205,9 +213,15 @@
       <if test="oldJobs != null">
         #{oldJobs,jdbcType=VARCHAR},
       </if>
+      <if test="oldLvl != null">
+        #{oldLvl,jdbcType=VARCHAR},
+      </if>
       <if test="newJobs != null">
         #{newJobs,jdbcType=VARCHAR},
       </if>
+      <if test="newLvl != null">
+        #{newLvl,jdbcType=VARCHAR},
+      </if>
       <if test="promotionTime != null">
         #{promotionTime,jdbcType=TIMESTAMP},
       </if>
@@ -229,7 +243,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     select count(*) from personnel_promotion
     <if test="_parameter != null">
@@ -240,7 +254,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     update personnel_promotion
     <set>
@@ -253,9 +267,15 @@
       <if test="record.oldJobs != null">
         old_jobs = #{record.oldJobs,jdbcType=VARCHAR},
       </if>
+      <if test="record.oldLvl != null">
+        old_lvl = #{record.oldLvl,jdbcType=VARCHAR},
+      </if>
       <if test="record.newJobs != null">
         new_jobs = #{record.newJobs,jdbcType=VARCHAR},
       </if>
+      <if test="record.newLvl != null">
+        new_lvl = #{record.newLvl,jdbcType=VARCHAR},
+      </if>
       <if test="record.promotionTime != null">
         promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
       </if>
@@ -280,13 +300,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     update personnel_promotion
     set id = #{record.id,jdbcType=INTEGER},
       pd_id = #{record.pdId,jdbcType=INTEGER},
       old_jobs = #{record.oldJobs,jdbcType=VARCHAR},
+      old_lvl = #{record.oldLvl,jdbcType=VARCHAR},
       new_jobs = #{record.newJobs,jdbcType=VARCHAR},
+      new_lvl = #{record.newLvl,jdbcType=VARCHAR},
       promotion_time = #{record.promotionTime,jdbcType=TIMESTAMP},
       promotion_remarks = #{record.promotionRemarks,jdbcType=VARCHAR},
       annex_url = #{record.annexUrl,jdbcType=VARCHAR},
@@ -300,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     update personnel_promotion
     <set>
@@ -310,9 +332,15 @@
       <if test="oldJobs != null">
         old_jobs = #{oldJobs,jdbcType=VARCHAR},
       </if>
+      <if test="oldLvl != null">
+        old_lvl = #{oldLvl,jdbcType=VARCHAR},
+      </if>
       <if test="newJobs != null">
         new_jobs = #{newJobs,jdbcType=VARCHAR},
       </if>
+      <if test="newLvl != null">
+        new_lvl = #{newLvl,jdbcType=VARCHAR},
+      </if>
       <if test="promotionTime != null">
         promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
       </if>
@@ -335,12 +363,14 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 24 11:38:17 CST 2020.
+      This element was generated on Sun Apr 26 10:10:12 CST 2020.
     -->
     update personnel_promotion
     set pd_id = #{pdId,jdbcType=INTEGER},
       old_jobs = #{oldJobs,jdbcType=VARCHAR},
+      old_lvl = #{oldLvl,jdbcType=VARCHAR},
       new_jobs = #{newJobs,jdbcType=VARCHAR},
+      new_lvl = #{newLvl,jdbcType=VARCHAR},
       promotion_time = #{promotionTime,jdbcType=TIMESTAMP},
       promotion_remarks = #{promotionRemarks,jdbcType=VARCHAR},
       annex_url = #{annexUrl,jdbcType=VARCHAR},

+ 318 - 0
src/main/java/com/goafanti/common/mapper/PersonnelQuitMapper.xml

@@ -0,0 +1,318 @@
+<?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.PersonnelQuitMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PersonnelQuit">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pd_id" jdbcType="INTEGER" property="pdId" />
+    <result column="effect_time" jdbcType="TIMESTAMP" property="effectTime" />
+    <result column="quit_remarks" jdbcType="VARCHAR" property="quitRemarks" />
+    <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 Sun Apr 26 10:46:24 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 Sun Apr 26 10:46:24 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 Sun Apr 26 10:46:24 CST 2020.
+    -->
+    id, pd_id, effect_time, quit_remarks, annex_url, annex_name, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelQuitExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from personnel_quit
+    <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 Sun Apr 26 10:46:24 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from personnel_quit
+    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 Sun Apr 26 10:46:24 CST 2020.
+    -->
+    delete from personnel_quit
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PersonnelQuitExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    delete from personnel_quit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PersonnelQuit">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    insert into personnel_quit (id, pd_id, effect_time, 
+      quit_remarks, annex_url, annex_name, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{effectTime,jdbcType=TIMESTAMP}, 
+      #{quitRemarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{annexName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelQuit">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    insert into personnel_quit
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pdId != null">
+        pd_id,
+      </if>
+      <if test="effectTime != null">
+        effect_time,
+      </if>
+      <if test="quitRemarks != null">
+        quit_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="pdId != null">
+        #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="effectTime != null">
+        #{effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="quitRemarks != null">
+        #{quitRemarks,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.PersonnelQuitExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    select count(*) from personnel_quit
+    <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 Sun Apr 26 10:46:24 CST 2020.
+    -->
+    update personnel_quit
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pdId != null">
+        pd_id = #{record.pdId,jdbcType=INTEGER},
+      </if>
+      <if test="record.effectTime != null">
+        effect_time = #{record.effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.quitRemarks != null">
+        quit_remarks = #{record.quitRemarks,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 Sun Apr 26 10:46:24 CST 2020.
+    -->
+    update personnel_quit
+    set id = #{record.id,jdbcType=INTEGER},
+      pd_id = #{record.pdId,jdbcType=INTEGER},
+      effect_time = #{record.effectTime,jdbcType=TIMESTAMP},
+      quit_remarks = #{record.quitRemarks,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.PersonnelQuit">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    update personnel_quit
+    <set>
+      <if test="pdId != null">
+        pd_id = #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="effectTime != null">
+        effect_time = #{effectTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="quitRemarks != null">
+        quit_remarks = #{quitRemarks,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.PersonnelQuit">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 26 10:46:24 CST 2020.
+    -->
+    update personnel_quit
+    set pd_id = #{pdId,jdbcType=INTEGER},
+      effect_time = #{effectTime,jdbcType=TIMESTAMP},
+      quit_remarks = #{quitRemarks,jdbcType=VARCHAR},
+      annex_url = #{annexUrl,jdbcType=VARCHAR},
+      annex_name = #{annexName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 269 - 0
src/main/java/com/goafanti/common/model/PersonnelChoose.java

@@ -0,0 +1,269 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PersonnelChoose {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private Integer pdId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.choose_status
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private Integer chooseStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private Date effectTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.choose_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private String chooseRemarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private String annexUrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private String annexName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_choose.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_choose.id
+     *
+     * @return the value of personnel_choose.id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.id
+     *
+     * @param id the value for personnel_choose.id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose.pd_id
+     *
+     * @return the value of personnel_choose.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.pd_id
+     *
+     * @param pdId the value for personnel_choose.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_choose.choose_status
+     *
+     * @return the value of personnel_choose.choose_status
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public Integer getChooseStatus() {
+        return chooseStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.choose_status
+     *
+     * @param chooseStatus the value for personnel_choose.choose_status
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public void setChooseStatus(Integer chooseStatus) {
+        this.chooseStatus = chooseStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_choose.effect_time
+     *
+     * @return the value of personnel_choose.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public Date getEffectTime() {
+        return effectTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.effect_time
+     *
+     * @param effectTime the value for personnel_choose.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public void setEffectTime(Date effectTime) {
+        this.effectTime = effectTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_choose.choose_remarks
+     *
+     * @return the value of personnel_choose.choose_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public String getChooseRemarks() {
+        return chooseRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.choose_remarks
+     *
+     * @param chooseRemarks the value for personnel_choose.choose_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public void setChooseRemarks(String chooseRemarks) {
+        this.chooseRemarks = chooseRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_choose.annex_url
+     *
+     * @return the value of personnel_choose.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public String getAnnexUrl() {
+        return annexUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.annex_url
+     *
+     * @param annexUrl the value for personnel_choose.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose.annex_name
+     *
+     * @return the value of personnel_choose.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public String getAnnexName() {
+        return annexName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.annex_name
+     *
+     * @param annexName the value for personnel_choose.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose.create_time
+     *
+     * @return the value of personnel_choose.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_choose.create_time
+     *
+     * @param createTime the value for personnel_choose.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 813 - 0
src/main/java/com/goafanti/common/model/PersonnelChooseExample.java

@@ -0,0 +1,813 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PersonnelChooseExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public PersonnelChooseExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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 andPdIdIsNull() {
+            addCriterion("pd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIsNotNull() {
+            addCriterion("pd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdEqualTo(Integer value) {
+            addCriterion("pd_id =", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotEqualTo(Integer value) {
+            addCriterion("pd_id <>", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThan(Integer value) {
+            addCriterion("pd_id >", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pd_id >=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThan(Integer value) {
+            addCriterion("pd_id <", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pd_id <=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIn(List<Integer> values) {
+            addCriterion("pd_id in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotIn(List<Integer> values) {
+            addCriterion("pd_id not in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id not between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusIsNull() {
+            addCriterion("choose_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusIsNotNull() {
+            addCriterion("choose_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusEqualTo(Integer value) {
+            addCriterion("choose_status =", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusNotEqualTo(Integer value) {
+            addCriterion("choose_status <>", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusGreaterThan(Integer value) {
+            addCriterion("choose_status >", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("choose_status >=", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusLessThan(Integer value) {
+            addCriterion("choose_status <", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("choose_status <=", value, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusIn(List<Integer> values) {
+            addCriterion("choose_status in", values, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusNotIn(List<Integer> values) {
+            addCriterion("choose_status not in", values, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusBetween(Integer value1, Integer value2) {
+            addCriterion("choose_status between", value1, value2, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("choose_status not between", value1, value2, "chooseStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIsNull() {
+            addCriterion("effect_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIsNotNull() {
+            addCriterion("effect_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeEqualTo(Date value) {
+            addCriterion("effect_time =", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotEqualTo(Date value) {
+            addCriterion("effect_time <>", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeGreaterThan(Date value) {
+            addCriterion("effect_time >", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("effect_time >=", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeLessThan(Date value) {
+            addCriterion("effect_time <", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeLessThanOrEqualTo(Date value) {
+            addCriterion("effect_time <=", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIn(List<Date> values) {
+            addCriterion("effect_time in", values, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotIn(List<Date> values) {
+            addCriterion("effect_time not in", values, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeBetween(Date value1, Date value2) {
+            addCriterion("effect_time between", value1, value2, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotBetween(Date value1, Date value2) {
+            addCriterion("effect_time not between", value1, value2, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksIsNull() {
+            addCriterion("choose_remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksIsNotNull() {
+            addCriterion("choose_remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksEqualTo(String value) {
+            addCriterion("choose_remarks =", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksNotEqualTo(String value) {
+            addCriterion("choose_remarks <>", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksGreaterThan(String value) {
+            addCriterion("choose_remarks >", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("choose_remarks >=", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksLessThan(String value) {
+            addCriterion("choose_remarks <", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksLessThanOrEqualTo(String value) {
+            addCriterion("choose_remarks <=", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksLike(String value) {
+            addCriterion("choose_remarks like", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksNotLike(String value) {
+            addCriterion("choose_remarks not like", value, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksIn(List<String> values) {
+            addCriterion("choose_remarks in", values, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksNotIn(List<String> values) {
+            addCriterion("choose_remarks not in", values, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksBetween(String value1, String value2) {
+            addCriterion("choose_remarks between", value1, value2, "chooseRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseRemarksNotBetween(String value1, String value2) {
+            addCriterion("choose_remarks not between", value1, value2, "chooseRemarks");
+            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_choose
+     *
+     * @mbg.generated do_not_delete_during_merge Sun Apr 26 10:31:26 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_choose
+     *
+     * @mbg.generated Sun Apr 26 10:31:26 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);
+        }
+    }
+}

+ 269 - 0
src/main/java/com/goafanti/common/model/PersonnelContract.java

@@ -0,0 +1,269 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PersonnelContract {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private Integer pdId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.start_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private Date startTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.end_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private Date endTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.contract_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private String contractRemarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private String annexUrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private String annexName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_contract.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_contract.id
+     *
+     * @return the value of personnel_contract.id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.id
+     *
+     * @param id the value for personnel_contract.id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract.pd_id
+     *
+     * @return the value of personnel_contract.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.pd_id
+     *
+     * @param pdId the value for personnel_contract.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_contract.start_time
+     *
+     * @return the value of personnel_contract.start_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.start_time
+     *
+     * @param startTime the value for personnel_contract.start_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_contract.end_time
+     *
+     * @return the value of personnel_contract.end_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.end_time
+     *
+     * @param endTime the value for personnel_contract.end_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_contract.contract_remarks
+     *
+     * @return the value of personnel_contract.contract_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public String getContractRemarks() {
+        return contractRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.contract_remarks
+     *
+     * @param contractRemarks the value for personnel_contract.contract_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public void setContractRemarks(String contractRemarks) {
+        this.contractRemarks = contractRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_contract.annex_url
+     *
+     * @return the value of personnel_contract.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public String getAnnexUrl() {
+        return annexUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.annex_url
+     *
+     * @param annexUrl the value for personnel_contract.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract.annex_name
+     *
+     * @return the value of personnel_contract.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public String getAnnexName() {
+        return annexName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.annex_name
+     *
+     * @param annexName the value for personnel_contract.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract.create_time
+     *
+     * @return the value of personnel_contract.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_contract.create_time
+     *
+     * @param createTime the value for personnel_contract.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 813 - 0
src/main/java/com/goafanti/common/model/PersonnelContractExample.java

@@ -0,0 +1,813 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PersonnelContractExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public PersonnelContractExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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 andPdIdIsNull() {
+            addCriterion("pd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIsNotNull() {
+            addCriterion("pd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdEqualTo(Integer value) {
+            addCriterion("pd_id =", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotEqualTo(Integer value) {
+            addCriterion("pd_id <>", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThan(Integer value) {
+            addCriterion("pd_id >", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pd_id >=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThan(Integer value) {
+            addCriterion("pd_id <", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pd_id <=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIn(List<Integer> values) {
+            addCriterion("pd_id in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotIn(List<Integer> values) {
+            addCriterion("pd_id not in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id not between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNull() {
+            addCriterion("start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNotNull() {
+            addCriterion("start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeEqualTo(Date value) {
+            addCriterion("start_time =", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotEqualTo(Date value) {
+            addCriterion("start_time <>", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThan(Date value) {
+            addCriterion("start_time >", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("start_time >=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThan(Date value) {
+            addCriterion("start_time <", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("start_time <=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIn(List<Date> values) {
+            addCriterion("start_time in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotIn(List<Date> values) {
+            addCriterion("start_time not in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeBetween(Date value1, Date value2) {
+            addCriterion("start_time between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("start_time not between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Date value) {
+            addCriterion("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Date value) {
+            addCriterion("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Date value) {
+            addCriterion("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Date value) {
+            addCriterion("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Date> values) {
+            addCriterion("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Date> values) {
+            addCriterion("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Date value1, Date value2) {
+            addCriterion("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("end_time not between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksIsNull() {
+            addCriterion("contract_remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksIsNotNull() {
+            addCriterion("contract_remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksEqualTo(String value) {
+            addCriterion("contract_remarks =", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksNotEqualTo(String value) {
+            addCriterion("contract_remarks <>", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksGreaterThan(String value) {
+            addCriterion("contract_remarks >", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_remarks >=", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksLessThan(String value) {
+            addCriterion("contract_remarks <", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksLessThanOrEqualTo(String value) {
+            addCriterion("contract_remarks <=", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksLike(String value) {
+            addCriterion("contract_remarks like", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksNotLike(String value) {
+            addCriterion("contract_remarks not like", value, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksIn(List<String> values) {
+            addCriterion("contract_remarks in", values, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksNotIn(List<String> values) {
+            addCriterion("contract_remarks not in", values, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksBetween(String value1, String value2) {
+            addCriterion("contract_remarks between", value1, value2, "contractRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractRemarksNotBetween(String value1, String value2) {
+            addCriterion("contract_remarks not between", value1, value2, "contractRemarks");
+            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_contract
+     *
+     * @mbg.generated do_not_delete_during_merge Sun Apr 26 10:16:37 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_contract
+     *
+     * @mbg.generated Sun Apr 26 10:16:37 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);
+        }
+    }
+}

+ 231 - 273
src/main/java/com/goafanti/common/model/PersonnelPromotion.java

@@ -3,300 +3,258 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class PersonnelPromotion {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.pd_id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private Integer pdId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.pd_id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private Integer pdId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.old_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String oldJobs;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.old_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String oldLvl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.new_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String newJobs;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.new_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String newLvl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.promotion_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private Date promotionTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.promotion_remarks
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String promotionRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.annex_url
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String annexUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.annex_name
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private String annexName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_promotion.create_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	private Date createTime;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.old_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private String oldJobs;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.id
+	 * @return  the value of personnel_promotion.id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.new_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private String newJobs;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.id
+	 * @param id  the value for personnel_promotion.id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.promotion_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private Date promotionTime;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.pd_id
+	 * @return  the value of personnel_promotion.pd_id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public Integer getPdId() {
+		return pdId;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.promotion_remarks
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private String promotionRemarks;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.pd_id
+	 * @param pdId  the value for personnel_promotion.pd_id
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setPdId(Integer pdId) {
+		this.pdId = pdId;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.annex_url
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private String annexUrl;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.old_jobs
+	 * @return  the value of personnel_promotion.old_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getOldJobs() {
+		return oldJobs;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.annex_name
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private String annexName;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.old_jobs
+	 * @param oldJobs  the value for personnel_promotion.old_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setOldJobs(String oldJobs) {
+		this.oldJobs = oldJobs;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column personnel_promotion.create_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    private Date createTime;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.old_lvl
+	 * @return  the value of personnel_promotion.old_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getOldLvl() {
+		return oldLvl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.id
-     *
-     * @return the value of personnel_promotion.id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public Integer getId() {
-        return id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.old_lvl
+	 * @param oldLvl  the value for personnel_promotion.old_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setOldLvl(String oldLvl) {
+		this.oldLvl = oldLvl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.id
-     *
-     * @param id the value for personnel_promotion.id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 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_promotion.new_jobs
+	 * @return  the value of personnel_promotion.new_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getNewJobs() {
+		return newJobs;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.pd_id
-     *
-     * @return the value of personnel_promotion.pd_id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public Integer getPdId() {
-        return pdId;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.new_jobs
+	 * @param newJobs  the value for personnel_promotion.new_jobs
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setNewJobs(String newJobs) {
+		this.newJobs = newJobs;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.pd_id
-     *
-     * @param pdId the value for personnel_promotion.pd_id
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setPdId(Integer pdId) {
-        this.pdId = pdId;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.new_lvl
+	 * @return  the value of personnel_promotion.new_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getNewLvl() {
+		return newLvl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.old_jobs
-     *
-     * @return the value of personnel_promotion.old_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public String getOldJobs() {
-        return oldJobs;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.new_lvl
+	 * @param newLvl  the value for personnel_promotion.new_lvl
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setNewLvl(String newLvl) {
+		this.newLvl = newLvl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.old_jobs
-     *
-     * @param oldJobs the value for personnel_promotion.old_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setOldJobs(String oldJobs) {
-        this.oldJobs = oldJobs;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.promotion_time
+	 * @return  the value of personnel_promotion.promotion_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public Date getPromotionTime() {
+		return promotionTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.new_jobs
-     *
-     * @return the value of personnel_promotion.new_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public String getNewJobs() {
-        return newJobs;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.promotion_time
+	 * @param promotionTime  the value for personnel_promotion.promotion_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setPromotionTime(Date promotionTime) {
+		this.promotionTime = promotionTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.new_jobs
-     *
-     * @param newJobs the value for personnel_promotion.new_jobs
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setNewJobs(String newJobs) {
-        this.newJobs = newJobs;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.promotion_remarks
+	 * @return  the value of personnel_promotion.promotion_remarks
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getPromotionRemarks() {
+		return promotionRemarks;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.promotion_time
-     *
-     * @return the value of personnel_promotion.promotion_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public Date getPromotionTime() {
-        return promotionTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.promotion_remarks
+	 * @param promotionRemarks  the value for personnel_promotion.promotion_remarks
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setPromotionRemarks(String promotionRemarks) {
+		this.promotionRemarks = promotionRemarks;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.promotion_time
-     *
-     * @param promotionTime the value for personnel_promotion.promotion_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setPromotionTime(Date promotionTime) {
-        this.promotionTime = promotionTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.annex_url
+	 * @return  the value of personnel_promotion.annex_url
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getAnnexUrl() {
+		return annexUrl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.promotion_remarks
-     *
-     * @return the value of personnel_promotion.promotion_remarks
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public String getPromotionRemarks() {
-        return promotionRemarks;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.annex_url
+	 * @param annexUrl  the value for personnel_promotion.annex_url
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setAnnexUrl(String annexUrl) {
+		this.annexUrl = annexUrl;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.promotion_remarks
-     *
-     * @param promotionRemarks the value for personnel_promotion.promotion_remarks
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setPromotionRemarks(String promotionRemarks) {
-        this.promotionRemarks = promotionRemarks;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_promotion.annex_name
+	 * @return  the value of personnel_promotion.annex_name
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public String getAnnexName() {
+		return annexName;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.annex_url
-     *
-     * @return the value of personnel_promotion.annex_url
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public String getAnnexUrl() {
-        return annexUrl;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.annex_name
+	 * @param annexName  the value for personnel_promotion.annex_name
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setAnnexName(String annexName) {
+		this.annexName = annexName;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.annex_url
-     *
-     * @param annexUrl the value for personnel_promotion.annex_url
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 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_promotion.create_time
+	 * @return  the value of personnel_promotion.create_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column personnel_promotion.annex_name
-     *
-     * @return the value of personnel_promotion.annex_name
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public String getAnnexName() {
-        return annexName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.annex_name
-     *
-     * @param annexName the value for personnel_promotion.annex_name
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 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_promotion.create_time
-     *
-     * @return the value of personnel_promotion.create_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column personnel_promotion.create_time
-     *
-     * @param createTime the value for personnel_promotion.create_time
-     *
-     * @mbg.generated Fri Apr 24 11:38:17 CST 2020
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_promotion.create_time
+	 * @param createTime  the value for personnel_promotion.create_time
+	 * @mbg.generated  Sun Apr 26 10:10:12 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

File diff suppressed because it is too large
+ 972 - 873
src/main/java/com/goafanti/common/model/PersonnelPromotionExample.java


+ 236 - 0
src/main/java/com/goafanti/common/model/PersonnelQuit.java

@@ -0,0 +1,236 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PersonnelQuit {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private Integer pdId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private Date effectTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.quit_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private String quitRemarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private String annexUrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private String annexName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column personnel_quit.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_quit.id
+     *
+     * @return the value of personnel_quit.id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.id
+     *
+     * @param id the value for personnel_quit.id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit.pd_id
+     *
+     * @return the value of personnel_quit.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.pd_id
+     *
+     * @param pdId the value for personnel_quit.pd_id
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_quit.effect_time
+     *
+     * @return the value of personnel_quit.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public Date getEffectTime() {
+        return effectTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.effect_time
+     *
+     * @param effectTime the value for personnel_quit.effect_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public void setEffectTime(Date effectTime) {
+        this.effectTime = effectTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_quit.quit_remarks
+     *
+     * @return the value of personnel_quit.quit_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public String getQuitRemarks() {
+        return quitRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.quit_remarks
+     *
+     * @param quitRemarks the value for personnel_quit.quit_remarks
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public void setQuitRemarks(String quitRemarks) {
+        this.quitRemarks = quitRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column personnel_quit.annex_url
+     *
+     * @return the value of personnel_quit.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public String getAnnexUrl() {
+        return annexUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.annex_url
+     *
+     * @param annexUrl the value for personnel_quit.annex_url
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit.annex_name
+     *
+     * @return the value of personnel_quit.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public String getAnnexName() {
+        return annexName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.annex_name
+     *
+     * @param annexName the value for personnel_quit.annex_name
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit.create_time
+     *
+     * @return the value of personnel_quit.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column personnel_quit.create_time
+     *
+     * @param createTime the value for personnel_quit.create_time
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 753 - 0
src/main/java/com/goafanti/common/model/PersonnelQuitExample.java

@@ -0,0 +1,753 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PersonnelQuitExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public PersonnelQuitExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table personnel_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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 andPdIdIsNull() {
+            addCriterion("pd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIsNotNull() {
+            addCriterion("pd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdEqualTo(Integer value) {
+            addCriterion("pd_id =", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotEqualTo(Integer value) {
+            addCriterion("pd_id <>", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThan(Integer value) {
+            addCriterion("pd_id >", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pd_id >=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThan(Integer value) {
+            addCriterion("pd_id <", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pd_id <=", value, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdIn(List<Integer> values) {
+            addCriterion("pd_id in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotIn(List<Integer> values) {
+            addCriterion("pd_id not in", values, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pd_id not between", value1, value2, "pdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIsNull() {
+            addCriterion("effect_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIsNotNull() {
+            addCriterion("effect_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeEqualTo(Date value) {
+            addCriterion("effect_time =", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotEqualTo(Date value) {
+            addCriterion("effect_time <>", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeGreaterThan(Date value) {
+            addCriterion("effect_time >", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("effect_time >=", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeLessThan(Date value) {
+            addCriterion("effect_time <", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeLessThanOrEqualTo(Date value) {
+            addCriterion("effect_time <=", value, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeIn(List<Date> values) {
+            addCriterion("effect_time in", values, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotIn(List<Date> values) {
+            addCriterion("effect_time not in", values, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeBetween(Date value1, Date value2) {
+            addCriterion("effect_time between", value1, value2, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectTimeNotBetween(Date value1, Date value2) {
+            addCriterion("effect_time not between", value1, value2, "effectTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksIsNull() {
+            addCriterion("quit_remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksIsNotNull() {
+            addCriterion("quit_remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksEqualTo(String value) {
+            addCriterion("quit_remarks =", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksNotEqualTo(String value) {
+            addCriterion("quit_remarks <>", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksGreaterThan(String value) {
+            addCriterion("quit_remarks >", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("quit_remarks >=", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksLessThan(String value) {
+            addCriterion("quit_remarks <", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksLessThanOrEqualTo(String value) {
+            addCriterion("quit_remarks <=", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksLike(String value) {
+            addCriterion("quit_remarks like", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksNotLike(String value) {
+            addCriterion("quit_remarks not like", value, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksIn(List<String> values) {
+            addCriterion("quit_remarks in", values, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksNotIn(List<String> values) {
+            addCriterion("quit_remarks not in", values, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksBetween(String value1, String value2) {
+            addCriterion("quit_remarks between", value1, value2, "quitRemarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuitRemarksNotBetween(String value1, String value2) {
+            addCriterion("quit_remarks not between", value1, value2, "quitRemarks");
+            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_quit
+     *
+     * @mbg.generated do_not_delete_during_merge Sun Apr 26 10:46:24 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_quit
+     *
+     * @mbg.generated Sun Apr 26 10:46:24 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);
+        }
+    }
+}

+ 1 - 1
src/main/java/com/goafanti/personnel/bo/InutpPersonnelBo.java

@@ -2,7 +2,7 @@ package com.goafanti.personnel.bo;
 
 import com.goafanti.common.model.PersonnelDossier;
 
-public class InutpPersonnelBo  extends PersonnelDossier{
+public class InputPersonnelBo  extends PersonnelDossier{
 	private String birthdays;
 	private String entryTimes;
 	private String quitTimes;

+ 15 - 0
src/main/java/com/goafanti/personnel/bo/InputPersonnelChooseBo.java

@@ -0,0 +1,15 @@
+package com.goafanti.personnel.bo;
+
+import com.goafanti.common.model.PersonnelChoose;
+
+public class InputPersonnelChooseBo extends PersonnelChoose {
+	private String effectTimes;
+
+	public String getEffectTimes() {
+		return effectTimes;
+	}
+
+	public void setEffectTimes(String effectTimes) {
+		this.effectTimes = effectTimes;
+	}
+}

+ 1 - 1
src/main/java/com/goafanti/personnel/bo/InutpPersonnelContactBo.java

@@ -1,6 +1,6 @@
 package com.goafanti.personnel.bo;
 
-public class InutpPersonnelContactBo {
+public class InputPersonnelContactBo {
 	private Integer id;
 	private String mobile;
 	private String fixedTel;

+ 35 - 0
src/main/java/com/goafanti/personnel/bo/InputPersonnelContractBo.java

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

+ 1 - 1
src/main/java/com/goafanti/personnel/bo/InutpPersonnelEntryBo.java

@@ -2,6 +2,6 @@ package com.goafanti.personnel.bo;
 
 import com.goafanti.common.model.PersonnelEntry;
 
-public class InutpPersonnelEntryBo extends PersonnelEntry{
+public class InputPersonnelEntryBo extends PersonnelEntry{
 
 }

+ 170 - 0
src/main/java/com/goafanti/personnel/bo/InputPersonnelListBo.java

@@ -0,0 +1,170 @@
+package com.goafanti.personnel.bo;
+
+public class InputPersonnelListBo {
+//	1)按名字关键字搜索
+	private String name;
+//	2)按所属公司搜索
+	private String company;
+//	3)按员工状态搜索
+	private Integer status;
+//	4)按职位搜索
+	private Integer jobs;
+//	5)按性别搜索
+	private Integer sex;
+//	6)按婚姻状态搜索
+	private Integer marriage;
+//	7)按政治面貌搜索
+	private Integer politicalOutlook;
+//	8)按生日月份进行搜索
+	private Integer birthdayMonth;
+//	9)按转正日期搜索
+	private String promotionStart;
+	private String promotionEnd;
+//	10)按入职日期搜索
+	private String entryStart;
+	private String entryEnd;
+//	11)按离职日期搜索
+	private String quitStart;
+	private String quitEnd;
+//	12)按政治面貌搜索
+//	13)按系统进行搜索
+	private Integer system; 
+//	14)按工龄期间(小于1年;1~3年;3~10年;10年之上)
+	private Integer workingYears;
+//	15)按学历搜索
+	private Integer education;
+//	16)按合同到期时间搜索
+	private String contractStart;
+	private String contractEnd;
+	
+	private Integer pageSize;
+	private Integer pageNo;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getCompany() {
+		return company;
+	}
+	public void setCompany(String company) {
+		this.company = company;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getJobs() {
+		return jobs;
+	}
+	public void setJobs(Integer jobs) {
+		this.jobs = jobs;
+	}
+	public Integer getSex() {
+		return sex;
+	}
+	public void setSex(Integer sex) {
+		this.sex = sex;
+	}
+	public Integer getMarriage() {
+		return marriage;
+	}
+	public void setMarriage(Integer marriage) {
+		this.marriage = marriage;
+	}
+	public Integer getPoliticalOutlook() {
+		return politicalOutlook;
+	}
+	public void setPoliticalOutlook(Integer politicalOutlook) {
+		this.politicalOutlook = politicalOutlook;
+	}
+	public Integer getBirthdayMonth() {
+		return birthdayMonth;
+	}
+	public void setBirthdayMonth(Integer birthdayMonth) {
+		this.birthdayMonth = birthdayMonth;
+	}
+	public String getPromotionStart() {
+		return promotionStart;
+	}
+	public void setPromotionStart(String promotionStart) {
+		this.promotionStart = promotionStart;
+	}
+	public String getPromotionEnd() {
+		return promotionEnd;
+	}
+	public void setPromotionEnd(String promotionEnd) {
+		this.promotionEnd = promotionEnd;
+	}
+	public String getEntryStart() {
+		return entryStart;
+	}
+	public void setEntryStart(String entryStart) {
+		this.entryStart = entryStart;
+	}
+	public String getEntryEnd() {
+		return entryEnd;
+	}
+	public void setEntryEnd(String entryEnd) {
+		this.entryEnd = entryEnd;
+	}
+	public String getQuitStart() {
+		return quitStart;
+	}
+	public void setQuitStart(String quitStart) {
+		this.quitStart = quitStart;
+	}
+	public String getQuitEnd() {
+		return quitEnd;
+	}
+	public void setQuitEnd(String quitEnd) {
+		this.quitEnd = quitEnd;
+	}
+	public Integer getSystem() {
+		return system;
+	}
+	public void setSystem(Integer system) {
+		this.system = system;
+	}
+	public Integer getWorkingYears() {
+		return workingYears;
+	}
+	public void setWorkingYears(Integer workingYears) {
+		this.workingYears = workingYears;
+	}
+	public Integer getEducation() {
+		return education;
+	}
+	public void setEducation(Integer education) {
+		this.education = education;
+	}
+	public String getContractStart() {
+		return contractStart;
+	}
+	public void setContractStart(String contractStart) {
+		this.contractStart = contractStart;
+	}
+	public String getContractEnd() {
+		return contractEnd;
+	}
+	public void setContractEnd(String contractEnd) {
+		this.contractEnd = contractEnd;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	
+	
+}

+ 1 - 1
src/main/java/com/goafanti/personnel/bo/InutpPersonnelPromotionBo.java

@@ -2,7 +2,7 @@ package com.goafanti.personnel.bo;
 
 import com.goafanti.common.model.PersonnelPromotion;
 
-public class InutpPersonnelPromotionBo  extends PersonnelPromotion{
+public class InputPersonnelPromotionBo  extends PersonnelPromotion{
 	private String promotionTimes;
 
 	public String getPromotionTimes() {

+ 16 - 0
src/main/java/com/goafanti/personnel/bo/InputPersonnelQuitBo.java

@@ -0,0 +1,16 @@
+package com.goafanti.personnel.bo;
+
+
+import com.goafanti.common.model.PersonnelQuit;
+
+public class InputPersonnelQuitBo extends PersonnelQuit{
+	private String effectTimes;
+
+	public String getEffectTimes() {
+		return effectTimes;
+	}
+
+	public void setEffectTimes(String effectTimes) {
+		this.effectTimes = effectTimes;
+	}
+}

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

@@ -0,0 +1,295 @@
+package com.goafanti.personnel.bo;
+
+public class OutPersonnelListBo {
+	private Integer id;
+	private Integer doorId;
+	private String name;
+	private Integer status;
+	private String system;
+	private String company;
+	private String jobsName;
+	private Integer lvl;
+	private String starName;
+	private String entryTimes;
+	private String promotionTimes;
+	private String birthday;
+	private String entryTime;
+	private Integer sex;
+	private Integer son;
+	private Integer girl;
+	private Integer politicalOutlook;
+	private Integer education;
+	private String school;
+	private String major;
+	private String title;
+	private String promotionRemarks;
+	private String promotionTime;
+	private String contractStart;
+	private String contractEnd;
+	private String mobile;
+	private String fixedTel;
+	private String idCard;
+	private String certificationAuthority;
+	private Integer residenceProvince;
+	private Integer residenceCity;
+	private Integer residenceArea;
+	private String residenceAddress;
+	private Integer nativePlaceProvince;
+	private Integer nativePlaceCity;
+	private Integer nowProvince;
+	private Integer nowCity;
+	private Integer nowArea;
+	private String nowAddress;
+	private String quitTime;
+	private Integer workingYear;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getDoorId() {
+		return doorId;
+	}
+	public void setDoorId(Integer doorId) {
+		this.doorId = doorId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public String getSystem() {
+		return system;
+	}
+	public void setSystem(String system) {
+		this.system = system;
+	}
+	public String getCompany() {
+		return company;
+	}
+	public void setCompany(String company) {
+		this.company = company;
+	}
+	public String getJobsName() {
+		return jobsName;
+	}
+	public void setJobsName(String jobsName) {
+		this.jobsName = jobsName;
+	}
+	public Integer getLvl() {
+		return lvl;
+	}
+	public void setLvl(Integer lvl) {
+		this.lvl = lvl;
+	}
+	public String getStarName() {
+		return starName;
+	}
+	public void setStarName(String starName) {
+		this.starName = starName;
+	}
+	public String getEntryTimes() {
+		return entryTimes;
+	}
+	public void setEntryTimes(String entryTimes) {
+		this.entryTimes = entryTimes;
+	}
+	public String getPromotionTimes() {
+		return promotionTimes;
+	}
+	public void setPromotionTimes(String promotionTimes) {
+		this.promotionTimes = promotionTimes;
+	}
+	public String getBirthday() {
+		return birthday;
+	}
+	public void setBirthday(String birthday) {
+		this.birthday = birthday;
+	}
+	public String getEntryTime() {
+		return entryTime;
+	}
+	public void setEntryTime(String entryTime) {
+		this.entryTime = entryTime;
+	}
+	public Integer getSex() {
+		return sex;
+	}
+	public void setSex(Integer sex) {
+		this.sex = sex;
+	}
+	public Integer getSon() {
+		return son;
+	}
+	public void setSon(Integer son) {
+		this.son = son;
+	}
+	public Integer getGirl() {
+		return girl;
+	}
+	public void setGirl(Integer girl) {
+		this.girl = girl;
+	}
+	public Integer getPoliticalOutlook() {
+		return politicalOutlook;
+	}
+	public void setPoliticalOutlook(Integer politicalOutlook) {
+		this.politicalOutlook = politicalOutlook;
+	}
+	public Integer getEducation() {
+		return education;
+	}
+	public void setEducation(Integer education) {
+		this.education = education;
+	}
+	public String getSchool() {
+		return school;
+	}
+	public void setSchool(String school) {
+		this.school = school;
+	}
+	public String getMajor() {
+		return major;
+	}
+	public void setMajor(String major) {
+		this.major = major;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getPromotionRemarks() {
+		return promotionRemarks;
+	}
+	public void setPromotionRemarks(String promotionRemarks) {
+		this.promotionRemarks = promotionRemarks;
+	}
+	public String getPromotionTime() {
+		return promotionTime;
+	}
+	public void setPromotionTime(String promotionTime) {
+		this.promotionTime = promotionTime;
+	}
+	public String getContractStart() {
+		return contractStart;
+	}
+	public void setContractStart(String contractStart) {
+		this.contractStart = contractStart;
+	}
+	public String getContractEnd() {
+		return contractEnd;
+	}
+	public void setContractEnd(String contractEnd) {
+		this.contractEnd = contractEnd;
+	}
+	public String getMobile() {
+		return mobile;
+	}
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	public String getFixedTel() {
+		return fixedTel;
+	}
+	public void setFixedTel(String fixedTel) {
+		this.fixedTel = fixedTel;
+	}
+	public String getIdCard() {
+		return idCard;
+	}
+	public void setIdCard(String idCard) {
+		this.idCard = idCard;
+	}
+	public String getCertificationAuthority() {
+		return certificationAuthority;
+	}
+	public void setCertificationAuthority(String certificationAuthority) {
+		this.certificationAuthority = certificationAuthority;
+	}
+	public Integer getResidenceProvince() {
+		return residenceProvince;
+	}
+	public void setResidenceProvince(Integer residenceProvince) {
+		this.residenceProvince = residenceProvince;
+	}
+	public Integer getResidenceCity() {
+		return residenceCity;
+	}
+	public void setResidenceCity(Integer residenceCity) {
+		this.residenceCity = residenceCity;
+	}
+	public Integer getResidenceArea() {
+		return residenceArea;
+	}
+	public void setResidenceArea(Integer residenceArea) {
+		this.residenceArea = residenceArea;
+	}
+	public String getResidenceAddress() {
+		return residenceAddress;
+	}
+	public void setResidenceAddress(String residenceAddress) {
+		this.residenceAddress = residenceAddress;
+	}
+	public Integer getNativePlaceProvince() {
+		return nativePlaceProvince;
+	}
+	public void setNativePlaceProvince(Integer nativePlaceProvince) {
+		this.nativePlaceProvince = nativePlaceProvince;
+	}
+	public Integer getNativePlaceCity() {
+		return nativePlaceCity;
+	}
+	public void setNativePlaceCity(Integer nativePlaceCity) {
+		this.nativePlaceCity = nativePlaceCity;
+	}
+	public Integer getNowProvince() {
+		return nowProvince;
+	}
+	public void setNowProvince(Integer nowProvince) {
+		this.nowProvince = nowProvince;
+	}
+	public Integer getNowCity() {
+		return nowCity;
+	}
+	public void setNowCity(Integer nowCity) {
+		this.nowCity = nowCity;
+	}
+	public Integer getNowArea() {
+		return nowArea;
+	}
+	public void setNowArea(Integer nowArea) {
+		this.nowArea = nowArea;
+	}
+	public String getNowAddress() {
+		return nowAddress;
+	}
+	public void setNowAddress(String nowAddress) {
+		this.nowAddress = nowAddress;
+	}
+	public String getQuitTime() {
+		return quitTime;
+	}
+	public void setQuitTime(String quitTime) {
+		this.quitTime = quitTime;
+	}
+	public Integer getWorkingYear() {
+		return workingYear;
+	}
+	public void setWorkingYear(Integer workingYear) {
+		this.workingYear = workingYear;
+	}
+
+	
+	
+	
+}

+ 100 - 14
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -1,7 +1,6 @@
 package com.goafanti.personnel.controller;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -16,12 +15,14 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.patent.bo.PatentNewBo;
-import com.goafanti.patent.service.PatentNewService;
-import com.goafanti.personnel.bo.InutpPersonnelBo;
-import com.goafanti.personnel.bo.InutpPersonnelContactBo;
-import com.goafanti.personnel.bo.InutpPersonnelEntryBo;
-import com.goafanti.personnel.bo.InutpPersonnelPromotionBo;
+import com.goafanti.personnel.bo.InputPersonnelChooseBo;
+import com.goafanti.personnel.bo.InputPersonnelBo;
+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.InputPersonnelPromotionBo;
+import com.goafanti.personnel.bo.InputPersonnelQuitBo;
 import com.goafanti.personnel.service.PersonnelService;
 
 
@@ -37,7 +38,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 新增人事档案
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public Result addPersonnel(InutpPersonnelBo i){
+	public Result addPersonnel(InputPersonnelBo i){
 		Result res = new Result();
 		if (StringUtils.isBlank(i.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
@@ -55,12 +56,29 @@ public class AdminPersonnelApiController extends CertifyApiController {
 		return res.data(personnelService.addPersonnel(i));
 	}
 	
+	/**
+	 * 门禁检测
+	 */
+	@RequestMapping(value ="/checkDoorId", method =RequestMethod.GET)
+	public Result checkDoorId(Integer doorId) {
+		Result res = new Result();
+		if (null==doorId) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		int i=personnelService.checkDoorId(doorId);
+		if (i>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		return res.data(i);
+	}
 	
 	/**
 	 * 修改人事档案
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
-	public Result updatePersonnel(InutpPersonnelBo i){
+	public Result updatePersonnel(InputPersonnelBo i){
 		Result res = new Result();
 		if (StringUtils.isBlank(i.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
@@ -71,7 +89,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 				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));
 			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "出生日期", "出生日期"));
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
 				return res;
 			}
 		return res.data(personnelService.updatePersonnel(i));
@@ -81,7 +99,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 修改人事联系人
 	 */
 	@RequestMapping(value = "/updateContact", method = RequestMethod.POST)
-	public Result updateContact(InutpPersonnelContactBo i){
+	public Result updateContact(InputPersonnelContactBo i){
 		Result res = new Result();
 		return res.data(personnelService.updateContact(i));
 	}
@@ -90,7 +108,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 修改人事联系人
 	 */
 	@RequestMapping(value = "/updateEntry", method = RequestMethod.POST)
-	public Result updateEntry(InutpPersonnelEntryBo i){
+	public Result updateEntry(InputPersonnelEntryBo i){
 		Result res = new Result();
 		return res.data(personnelService.updateEntry(i));
 	}
@@ -99,7 +117,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 修改人事晋升
 	 */
 	@RequestMapping(value = "/updatePromotion", method = RequestMethod.POST)
-	public Result updatePromotion(InutpPersonnelPromotionBo i){
+	public Result updatePromotion(InputPersonnelPromotionBo i){
 		Result res = new Result();
 		if (null==i.getPdId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
@@ -108,12 +126,80 @@ public class AdminPersonnelApiController extends CertifyApiController {
 		try {
 			if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "出生日期", "出生日期"));
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
 			return res;
 		}
 		return res.data(personnelService.updatePromotion(i));
 	}
 	
+	/**
+	 * 修改人事合同
+	 */
+	@RequestMapping(value = "/updateContract", method = RequestMethod.POST)
+	public Result updateContract(InputPersonnelContractBo i){
+		Result res = new Result();
+		if (null==i.getPdId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
+			return res;
+		}
+		try {
+			if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+			if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
+			return res;
+		}
+		return res.data(personnelService.updateContract(i));
+	}
+	
+	/**
+	 * 修改人事奖惩
+	 */
+	@RequestMapping(value = "/updateChoose", method = RequestMethod.POST)
+	public Result updateChoose(InputPersonnelChooseBo i){
+		Result res = new Result();
+		if (null==i.getPdId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
+			return res;
+		}
+		try {
+			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
+			return res;
+		}
+		return res.data(personnelService.updateChoose(i));
+	}
+	
+	/**
+	 * 修改人事离职
+	 */
+	@RequestMapping(value = "/updateQuit", method = RequestMethod.POST)
+	public Result updateQuit(InputPersonnelQuitBo i){
+		Result res = new Result();
+		if (null==i.getPdId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
+			return res;
+		}
+		try {
+			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
+			return res;
+		}
+		return res.data(personnelService.updateQuit(i));
+	}
+	
+	/**
+	 * 人事列表
+	 */
+	@RequestMapping(value = "/selectList", method = RequestMethod.GET)
+	public Result selectList(InputPersonnelListBo i){
+		Result res = new Result();
+		
+		return res.data(personnelService.selectList(i));
+	}
+	
 	
 	/** 证件上传 **/
 	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)

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

@@ -1,20 +1,38 @@
 package com.goafanti.personnel.service;
 
-import com.goafanti.personnel.bo.InutpPersonnelBo;
-import com.goafanti.personnel.bo.InutpPersonnelContactBo;
-import com.goafanti.personnel.bo.InutpPersonnelEntryBo;
-import com.goafanti.personnel.bo.InutpPersonnelPromotionBo;
+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.InputPersonnelPromotionBo;
+import com.goafanti.personnel.bo.InputPersonnelQuitBo;
+import com.goafanti.personnel.bo.OutPersonnelListBo;
 
 public interface PersonnelService {
 
-	int addPersonnel(InutpPersonnelBo i);
+	int addPersonnel(InputPersonnelBo i);
 
-	int updatePersonnel(InutpPersonnelBo i);
+	int updatePersonnel(InputPersonnelBo i);
 
-	int updateContact(InutpPersonnelContactBo i);
+	int updateContact(InputPersonnelContactBo i);
 
-	int updateEntry(InutpPersonnelEntryBo i);
+	int updateEntry(InputPersonnelEntryBo i);
+
+	int updatePromotion(InputPersonnelPromotionBo i);
+
+	int checkDoorId(Integer doorId);
+
+	int updateContract(InputPersonnelContractBo i);
+
+	int updateChoose(InputPersonnelChooseBo i);
+
+	int updateQuit(InputPersonnelQuitBo i);
+
+	Pagination<OutPersonnelListBo> selectList(InputPersonnelListBo i);
 
-	int updatePromotion(InutpPersonnelPromotionBo i);
 
 }

+ 77 - 10
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -1,25 +1,36 @@
 package com.goafanti.personnel.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.goafanti.common.dao.PersonnelChooseMapper;
 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.PersonnelPromotionMapper;
+import com.goafanti.common.dao.PersonnelQuitMapper;
 import com.goafanti.common.model.PersonnelContact;
 import com.goafanti.common.model.PersonnelDossier;
 import com.goafanti.common.model.PersonnelEntry;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.personnel.bo.InutpPersonnelBo;
-import com.goafanti.personnel.bo.InutpPersonnelContactBo;
-import com.goafanti.personnel.bo.InutpPersonnelEntryBo;
-import com.goafanti.personnel.bo.InutpPersonnelPromotionBo;
+import com.goafanti.core.mybatis.page.Pagination;
+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.InputPersonnelPromotionBo;
+import com.goafanti.personnel.bo.InputPersonnelQuitBo;
+import com.goafanti.personnel.bo.OutPersonnelListBo;
 import com.goafanti.personnel.service.PersonnelService;
 
 @Service
@@ -32,19 +43,25 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	private PersonnelEntryMapper	personnelEntryMapper;
 	@Autowired
 	private PersonnelPromotionMapper	personnelPromotionMapper;
+	@Autowired
+	private PersonnelContractMapper	personnelContractMapper;
+	@Autowired
+	private PersonnelChooseMapper	personnelChooseMapper;
+	@Autowired
+	private PersonnelQuitMapper	personnelQuitMapper;
 	
 	@Override
-	public int addPersonnel(InutpPersonnelBo i) {
+	public int addPersonnel(InputPersonnelBo i) {
 		return personnelDossierMapper.insertSelective(i);
 	}
 
 	@Override
-	public int updatePersonnel(InutpPersonnelBo i) {
+	public int updatePersonnel(InputPersonnelBo i) {
 		return personnelDossierMapper.updateByPrimaryKeySelective(i);
 	}
 
 	@Override
-	public int updateContact(InutpPersonnelContactBo i) {
+	public int updateContact(InputPersonnelContactBo i) {
 		PersonnelDossier p=new PersonnelDossier();
 		p.setId(i.getId());
 		p.setMobile(i.getMobile());
@@ -70,7 +87,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	}
 
 	@Override
-	public int updateEntry(InutpPersonnelEntryBo i) {
+	public int updateEntry(InputPersonnelEntryBo i) {
 		PersonnelEntry p=personnelEntryMapper.selectByPrimaryKey(i.getId());
 		if (p==null||p.getId()==null) {
 			personnelEntryMapper.insertSelective(i);
@@ -81,13 +98,63 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	}
 
 	@Override
-	public int updatePromotion(InutpPersonnelPromotionBo i) {
+	public int updatePromotion(InputPersonnelPromotionBo i) {
 		if (i.getId()==null) {
 			personnelPromotionMapper.insertSelective(i);
 		}else {
 			personnelPromotionMapper.updateByPrimaryKeySelective(i);
 		}
-		return 0;
+		return 1;
+	}
+
+	@Override
+	public int checkDoorId(Integer doorId) {
+		int i=personnelDossierMapper.checkDoorId(doorId);
+		return i;
+	}
+
+	@Override
+	public int updateContract(InputPersonnelContractBo i) {
+		if (i.getId()==null) {
+			personnelContractMapper.insertSelective(i);
+		} else {
+			personnelContractMapper.updateByPrimaryKeySelective(i);
+		}
+		return 1;
 	}
 
+	@Override
+	public int updateChoose(InputPersonnelChooseBo i) {
+		if (i.getId()==null) {
+			personnelChooseMapper.insertSelective(i);
+		} else {
+			personnelChooseMapper.updateByPrimaryKeySelective(i);
+		}
+		return 1;
+	}
+
+	@Override
+	public int updateQuit(InputPersonnelQuitBo i) {
+		if (i.getId()==null) {
+			personnelQuitMapper.insertSelective(i);
+		} else {
+			personnelQuitMapper.updateByPrimaryKeySelective(i);
+		}
+		PersonnelDossier pd=new PersonnelDossier();
+		pd.setId(i.getPdId());
+		pd.setQuitTime(i.getEffectTime());
+		personnelDossierMapper.updateByPrimaryKeySelective(pd);
+		return 1;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OutPersonnelListBo> selectList(InputPersonnelListBo i) {
+		Map<String, Object> params = new HashMap<>();
+		if (i.getPageNo()==null||i.getPageNo()<1)i.setPageNo(1);
+		if (i.getPageSize()==null||i.getPageSize()<1) i.setPageSize(10);
+		params.put("i", i);
+		return (Pagination<OutPersonnelListBo>) findPage("selectPersonnelByList", "selectPersonnelByCount",
+				params, i.getPageNo(), i.getPageSize());
+	}
 }