Quellcode durchsuchen

人事福利修改

Signed-off-by: anderx <312518615@qq.com>
anderx vor 5 Jahren
Ursprung
Commit
f94f96d7af

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

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

@@ -11,68 +11,68 @@ public interface PersonnelWelfareMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	long countByExample(PersonnelWelfareExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int deleteByExample(PersonnelWelfareExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int insert(PersonnelWelfare record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int insertSelective(PersonnelWelfare record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	List<PersonnelWelfare> selectByExample(PersonnelWelfareExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	PersonnelWelfare selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") PersonnelWelfare record,
 			@Param("example") PersonnelWelfareExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int updateByExample(@Param("record") PersonnelWelfare record, @Param("example") PersonnelWelfareExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PersonnelWelfare record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	int updateByPrimaryKey(PersonnelWelfare record);
 

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

@@ -978,12 +978,12 @@
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
 	d.school,d.major,d.title,e.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
 	date_format(e.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,
-	a.certification_authority certificationAuthority, a.residence_province residenceProvince,
+	a.certification_authority certificationAuthority, a.residence_province residenceProvince,m.welfare_annex_name welfareAnnexName,
 	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
+	a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,m.welfare_annex_url welfareAnnexUrl
 	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl 
-	left join department dep on a.company = dep.id
+	left join department dep on a.company = dep.id left join personnel_mid m on a.id=m.id
 	left join personnel_entry d on a.id=d.id left join (select id,pd_id,max(create_time)promotion_time,
 	 	promotion_remarks from personnel_promotion group by pd_id) e on a.id=e.pd_id
 	where 1=1

+ 56 - 23
src/main/java/com/goafanti/common/mapper/PersonnelWelfareMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="pd_id" jdbcType="INTEGER" property="pdId" />
@@ -14,12 +14,14 @@
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="welfare_remarks" jdbcType="VARCHAR" property="welfareRemarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="dep_id" jdbcType="VARCHAR" property="depId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -53,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -87,15 +89,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
-    id, pd_id, type, start_time, end_time, welfare_remarks, create_time
+    id, pd_id, type, start_time, end_time, welfare_remarks, create_time, status, dep_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelWelfareExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     select
     <if test="distinct">
@@ -114,7 +116,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     delete from personnel_welfare
     where id = #{id,jdbcType=INTEGER}
@@ -134,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     delete from personnel_welfare
     <if test="_parameter != null">
@@ -145,20 +147,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     insert into personnel_welfare (id, pd_id, type, 
       start_time, end_time, welfare_remarks, 
-      create_time)
+      create_time, status, dep_id
+      )
     values (#{id,jdbcType=INTEGER}, #{pdId,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, 
       #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{welfareRemarks,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{depId,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelWelfare">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     insert into personnel_welfare
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -183,6 +187,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="depId != null">
+        dep_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -206,13 +216,19 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="depId != null">
+        #{depId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelWelfareExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     select count(*) from personnel_welfare
     <if test="_parameter != null">
@@ -223,7 +239,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     update personnel_welfare
     <set>
@@ -248,6 +264,12 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.depId != null">
+        dep_id = #{record.depId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -257,7 +279,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     update personnel_welfare
     set id = #{record.id,jdbcType=INTEGER},
@@ -266,7 +288,9 @@
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       end_time = #{record.endTime,jdbcType=TIMESTAMP},
       welfare_remarks = #{record.welfareRemarks,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      status = #{record.status,jdbcType=INTEGER},
+      dep_id = #{record.depId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -275,7 +299,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     update personnel_welfare
     <set>
@@ -297,6 +321,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="depId != null">
+        dep_id = #{depId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -304,7 +334,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:53:47 CST 2020.
+      This element was generated on Thu May 07 10:06:28 CST 2020.
     -->
     update personnel_welfare
     set pd_id = #{pdId,jdbcType=INTEGER},
@@ -312,12 +342,15 @@
       start_time = #{startTime,jdbcType=TIMESTAMP},
       end_time = #{endTime,jdbcType=TIMESTAMP},
       welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER},
+      dep_id = #{depId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectBypdId" resultType="com.goafanti.personnel.bo.PersonnelWelfareBo">
-  select id,pd_id pdId,`type`,date_format(start_time,'%Y-%m-%d')startTimes,
-	date_format(end_time,'%Y-%m-%d')endTimes,welfare_remarks,create_time createTime 
-	from personnel_welfare where pd_id= #{id}
+  select a.id,a.pd_id pdId,a.`type`,date_format(a.start_time,'%Y-%m-%d')startTimes,
+	date_format(a.end_time,'%Y-%m-%d')endTimes,a.welfare_remarks,a.create_time createTime,
+	a.status,a.dep_id depId,b.name depName
+	from personnel_welfare a left join department b on a.dep_id=b.id where pd_id= #{id}
   </select>
 </mapper>

+ 67 - 21
src/main/java/com/goafanti/common/model/PersonnelWelfare.java

@@ -6,44 +6,54 @@ public class PersonnelWelfare {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.pd_id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Integer pdId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.type
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.start_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.end_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Date endTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.welfare_remarks
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private String welfareRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.create_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.status
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_welfare.dep_id
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	private String depId;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.id
 	 * @return  the value of personnel_welfare.id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -52,7 +62,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.id
 	 * @param id  the value for personnel_welfare.id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -61,7 +71,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.pd_id
 	 * @return  the value of personnel_welfare.pd_id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Integer getPdId() {
 		return pdId;
@@ -70,7 +80,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.pd_id
 	 * @param pdId  the value for personnel_welfare.pd_id
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setPdId(Integer pdId) {
 		this.pdId = pdId;
@@ -79,7 +89,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.type
 	 * @return  the value of personnel_welfare.type
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -88,7 +98,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.type
 	 * @param type  the value for personnel_welfare.type
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -97,7 +107,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.start_time
 	 * @return  the value of personnel_welfare.start_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -106,7 +116,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.start_time
 	 * @param startTime  the value for personnel_welfare.start_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -115,7 +125,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.end_time
 	 * @return  the value of personnel_welfare.end_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Date getEndTime() {
 		return endTime;
@@ -124,7 +134,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.end_time
 	 * @param endTime  the value for personnel_welfare.end_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
@@ -133,7 +143,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.welfare_remarks
 	 * @return  the value of personnel_welfare.welfare_remarks
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public String getWelfareRemarks() {
 		return welfareRemarks;
@@ -142,7 +152,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.welfare_remarks
 	 * @param welfareRemarks  the value for personnel_welfare.welfare_remarks
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setWelfareRemarks(String welfareRemarks) {
 		this.welfareRemarks = welfareRemarks;
@@ -151,7 +161,7 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.create_time
 	 * @return  the value of personnel_welfare.create_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -160,9 +170,45 @@ public class PersonnelWelfare {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.create_time
 	 * @param createTime  the value for personnel_welfare.create_time
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.status
+	 * @return  the value of personnel_welfare.status
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.status
+	 * @param status  the value for personnel_welfare.status
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_welfare.dep_id
+	 * @return  the value of personnel_welfare.dep_id
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	public String getDepId() {
+		return depId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_welfare.dep_id
+	 * @param depId  the value for personnel_welfare.dep_id
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
+	 */
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
 }

+ 146 - 16
src/main/java/com/goafanti/common/model/PersonnelWelfareExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class PersonnelWelfareExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public PersonnelWelfareExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class PersonnelWelfareExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -592,11 +592,141 @@ public class PersonnelWelfareExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andStatusIsNull() {
+			addCriterion("status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIsNotNull() {
+			addCriterion("status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusEqualTo(Integer value) {
+			addCriterion("status =", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotEqualTo(Integer value) {
+			addCriterion("status <>", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThan(Integer value) {
+			addCriterion("status >", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("status >=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThan(Integer value) {
+			addCriterion("status <", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("status <=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIn(List<Integer> values) {
+			addCriterion("status in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotIn(List<Integer> values) {
+			addCriterion("status not in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusBetween(Integer value1, Integer value2) {
+			addCriterion("status between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("status not between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdIsNull() {
+			addCriterion("dep_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdIsNotNull() {
+			addCriterion("dep_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdEqualTo(String value) {
+			addCriterion("dep_id =", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdNotEqualTo(String value) {
+			addCriterion("dep_id <>", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdGreaterThan(String value) {
+			addCriterion("dep_id >", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdGreaterThanOrEqualTo(String value) {
+			addCriterion("dep_id >=", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdLessThan(String value) {
+			addCriterion("dep_id <", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdLessThanOrEqualTo(String value) {
+			addCriterion("dep_id <=", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdLike(String value) {
+			addCriterion("dep_id like", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdNotLike(String value) {
+			addCriterion("dep_id not like", value, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdIn(List<String> values) {
+			addCriterion("dep_id in", values, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdNotIn(List<String> values) {
+			addCriterion("dep_id not in", values, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdBetween(String value1, String value2) {
+			addCriterion("dep_id between", value1, value2, "depId");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepIdNotBetween(String value1, String value2) {
+			addCriterion("dep_id not between", value1, value2, "depId");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_welfare
-	 * @mbg.generated  Thu Apr 30 08:53:47 CST 2020
+	 * @mbg.generated  Thu May 07 10:06:28 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -12,6 +12,10 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	private String nation;
 	private BigDecimal allowance;
 	
+	private String welfareAnnexUrl;
+	
+	private String welfareAnnexName;
+	
 	private List<PersonnelContact> contactList;
 	
 	private PersonnelEntry personnelEntry;
@@ -93,6 +97,18 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	public void setJobs(Integer jobs) {
 		this.jobs = jobs;
 	}
+	public String getWelfareAnnexUrl() {
+		return welfareAnnexUrl;
+	}
+	public void setWelfareAnnexUrl(String welfareAnnexUrl) {
+		this.welfareAnnexUrl = welfareAnnexUrl;
+	}
+	public String getWelfareAnnexName() {
+		return welfareAnnexName;
+	}
+	public void setWelfareAnnexName(String welfareAnnexName) {
+		this.welfareAnnexName = welfareAnnexName;
+	}
 	
 	
 	

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

@@ -8,6 +8,7 @@ public class PersonnelWelfareBo extends PersonnelWelfare{
 	private String startTimes;
 	
 	private String endTimes;
+	private String depName;
 
 	public String getStartTimes() {
 		return startTimes;
@@ -25,4 +26,12 @@ public class PersonnelWelfareBo extends PersonnelWelfare{
 		this.endTimes = endTimes;
 	}
 
+	public String getDepName() {
+		return depName;
+	}
+
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+
 }