Explorar o código

中间表修改

Signed-off-by: anderx <312518615@qq.com>
anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
5c076cd484

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

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

@@ -9,67 +9,67 @@ public interface PersonnelMidMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	long countByExample(PersonnelMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int deleteByExample(PersonnelMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int insert(PersonnelMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int insertSelective(PersonnelMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	List<PersonnelMid> selectByExample(PersonnelMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	PersonnelMid selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") PersonnelMid record, @Param("example") PersonnelMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int updateByExample(@Param("record") PersonnelMid record, @Param("example") PersonnelMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PersonnelMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	int updateByPrimaryKey(PersonnelMid record);
 }

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

@@ -977,7 +977,7 @@
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,a.jobs,
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
 	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,
+	date_format(e.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,m.welfare_remarks welfareRemarks,
 	a.certification_authority certificationAuthority, a.residence_province residenceProvince,m.welfare_annex_name welfareAnnexName,
 	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,

+ 35 - 20
src/main/java/com/goafanti/common/mapper/PersonnelMidMapper.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 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="welfare_annex_url" jdbcType="VARCHAR" property="welfareAnnexUrl" />
@@ -24,12 +24,13 @@
     <result column="emergency_mobile" jdbcType="VARCHAR" property="emergencyMobile" />
     <result column="quit_time" jdbcType="TIMESTAMP" property="quitTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="welfare_remarks" jdbcType="VARCHAR" property="welfareRemarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -63,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -97,18 +98,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     id, welfare_annex_url, welfare_annex_name, insurance_start_time, insurance_end_time, 
     fund_start_time, fund_end_time, employer_start_time, employer_end_time, contract_start_time, 
     contract_end_time, promotion_time, promotion_remarks, emergency_contact, emergency_mobile, 
-    quit_time, create_time
+    quit_time, create_time, welfare_remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelMidExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     select
     <if test="distinct">
@@ -127,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     delete from personnel_mid
     where id = #{id,jdbcType=INTEGER}
@@ -147,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     delete from personnel_mid
     <if test="_parameter != null">
@@ -158,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     insert into personnel_mid (id, welfare_annex_url, welfare_annex_name, 
       insurance_start_time, insurance_end_time, 
@@ -166,20 +167,20 @@
       employer_end_time, contract_start_time, 
       contract_end_time, promotion_time, promotion_remarks, 
       emergency_contact, emergency_mobile, quit_time, 
-      create_time)
+      create_time, welfare_remarks)
     values (#{id,jdbcType=INTEGER}, #{welfareAnnexUrl,jdbcType=VARCHAR}, #{welfareAnnexName,jdbcType=VARCHAR}, 
       #{insuranceStartTime,jdbcType=TIMESTAMP}, #{insuranceEndTime,jdbcType=TIMESTAMP}, 
       #{fundStartTime,jdbcType=TIMESTAMP}, #{fundEndTime,jdbcType=TIMESTAMP}, #{employerStartTime,jdbcType=TIMESTAMP}, 
       #{employerEndTime,jdbcType=TIMESTAMP}, #{contractStartTime,jdbcType=TIMESTAMP}, 
       #{contractEndTime,jdbcType=TIMESTAMP}, #{promotionTime,jdbcType=TIMESTAMP}, #{promotionRemarks,jdbcType=VARCHAR}, 
       #{emergencyContact,jdbcType=VARCHAR}, #{emergencyMobile,jdbcType=VARCHAR}, #{quitTime,jdbcType=TIMESTAMP}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{welfareRemarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelMid">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     insert into personnel_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -234,6 +235,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="welfareRemarks != null">
+        welfare_remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -287,13 +291,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="welfareRemarks != null">
+        #{welfareRemarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.PersonnelMidExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     select count(*) from personnel_mid
     <if test="_parameter != null">
@@ -304,7 +311,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     update personnel_mid
     <set>
@@ -359,6 +366,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.welfareRemarks != null">
+        welfare_remarks = #{record.welfareRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -368,7 +378,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     update personnel_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -387,7 +397,8 @@
       emergency_contact = #{record.emergencyContact,jdbcType=VARCHAR},
       emergency_mobile = #{record.emergencyMobile,jdbcType=VARCHAR},
       quit_time = #{record.quitTime,jdbcType=TIMESTAMP},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      welfare_remarks = #{record.welfareRemarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -396,7 +407,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     update personnel_mid
     <set>
@@ -448,6 +459,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="welfareRemarks != null">
+        welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -455,7 +469,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 10:47:31 CST 2020.
+      This element was generated on Thu May 07 14:15:57 CST 2020.
     -->
     update personnel_mid
     set welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
@@ -473,7 +487,8 @@
       emergency_contact = #{emergencyContact,jdbcType=VARCHAR},
       emergency_mobile = #{emergencyMobile,jdbcType=VARCHAR},
       quit_time = #{quitTime,jdbcType=TIMESTAMP},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

+ 72 - 51
src/main/java/com/goafanti/common/model/PersonnelMid.java

@@ -5,93 +5,98 @@ import java.util.Date;
 public class PersonnelMid {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.id
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private String welfareAnnexUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private String welfareAnnexName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.insurance_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date insuranceStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.insurance_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date insuranceEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.fund_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date fundStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.fund_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date fundEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.employer_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date employerStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.employer_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date employerEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.contract_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date contractStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.contract_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date contractEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.promotion_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date promotionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.promotion_remarks
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private String promotionRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.emergency_contact
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private String emergencyContact;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.emergency_mobile
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private String emergencyMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.quit_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date quitTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.create_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	private Date createTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_mid.welfare_remarks
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
+	 */
+	private String welfareRemarks;
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.id
 	 * @return  the value of personnel_mid.id
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -99,7 +104,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.id
 	 * @param id  the value for personnel_mid.id
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -107,7 +112,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.welfare_annex_url
 	 * @return  the value of personnel_mid.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getWelfareAnnexUrl() {
 		return welfareAnnexUrl;
@@ -115,7 +120,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.welfare_annex_url
 	 * @param welfareAnnexUrl  the value for personnel_mid.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setWelfareAnnexUrl(String welfareAnnexUrl) {
 		this.welfareAnnexUrl = welfareAnnexUrl;
@@ -123,7 +128,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.welfare_annex_name
 	 * @return  the value of personnel_mid.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getWelfareAnnexName() {
 		return welfareAnnexName;
@@ -131,7 +136,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.welfare_annex_name
 	 * @param welfareAnnexName  the value for personnel_mid.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setWelfareAnnexName(String welfareAnnexName) {
 		this.welfareAnnexName = welfareAnnexName;
@@ -139,7 +144,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.insurance_start_time
 	 * @return  the value of personnel_mid.insurance_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getInsuranceStartTime() {
 		return insuranceStartTime;
@@ -147,7 +152,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.insurance_start_time
 	 * @param insuranceStartTime  the value for personnel_mid.insurance_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setInsuranceStartTime(Date insuranceStartTime) {
 		this.insuranceStartTime = insuranceStartTime;
@@ -155,7 +160,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.insurance_end_time
 	 * @return  the value of personnel_mid.insurance_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getInsuranceEndTime() {
 		return insuranceEndTime;
@@ -163,7 +168,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.insurance_end_time
 	 * @param insuranceEndTime  the value for personnel_mid.insurance_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setInsuranceEndTime(Date insuranceEndTime) {
 		this.insuranceEndTime = insuranceEndTime;
@@ -171,7 +176,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.fund_start_time
 	 * @return  the value of personnel_mid.fund_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getFundStartTime() {
 		return fundStartTime;
@@ -179,7 +184,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.fund_start_time
 	 * @param fundStartTime  the value for personnel_mid.fund_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setFundStartTime(Date fundStartTime) {
 		this.fundStartTime = fundStartTime;
@@ -187,7 +192,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.fund_end_time
 	 * @return  the value of personnel_mid.fund_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getFundEndTime() {
 		return fundEndTime;
@@ -195,7 +200,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.fund_end_time
 	 * @param fundEndTime  the value for personnel_mid.fund_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setFundEndTime(Date fundEndTime) {
 		this.fundEndTime = fundEndTime;
@@ -203,7 +208,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.employer_start_time
 	 * @return  the value of personnel_mid.employer_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getEmployerStartTime() {
 		return employerStartTime;
@@ -211,7 +216,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.employer_start_time
 	 * @param employerStartTime  the value for personnel_mid.employer_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setEmployerStartTime(Date employerStartTime) {
 		this.employerStartTime = employerStartTime;
@@ -219,7 +224,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.employer_end_time
 	 * @return  the value of personnel_mid.employer_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getEmployerEndTime() {
 		return employerEndTime;
@@ -227,7 +232,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.employer_end_time
 	 * @param employerEndTime  the value for personnel_mid.employer_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setEmployerEndTime(Date employerEndTime) {
 		this.employerEndTime = employerEndTime;
@@ -235,7 +240,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.contract_start_time
 	 * @return  the value of personnel_mid.contract_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getContractStartTime() {
 		return contractStartTime;
@@ -243,7 +248,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.contract_start_time
 	 * @param contractStartTime  the value for personnel_mid.contract_start_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setContractStartTime(Date contractStartTime) {
 		this.contractStartTime = contractStartTime;
@@ -251,7 +256,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.contract_end_time
 	 * @return  the value of personnel_mid.contract_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getContractEndTime() {
 		return contractEndTime;
@@ -259,7 +264,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.contract_end_time
 	 * @param contractEndTime  the value for personnel_mid.contract_end_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setContractEndTime(Date contractEndTime) {
 		this.contractEndTime = contractEndTime;
@@ -267,7 +272,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.promotion_time
 	 * @return  the value of personnel_mid.promotion_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getPromotionTime() {
 		return promotionTime;
@@ -275,7 +280,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.promotion_time
 	 * @param promotionTime  the value for personnel_mid.promotion_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setPromotionTime(Date promotionTime) {
 		this.promotionTime = promotionTime;
@@ -283,7 +288,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.promotion_remarks
 	 * @return  the value of personnel_mid.promotion_remarks
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getPromotionRemarks() {
 		return promotionRemarks;
@@ -291,7 +296,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.promotion_remarks
 	 * @param promotionRemarks  the value for personnel_mid.promotion_remarks
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setPromotionRemarks(String promotionRemarks) {
 		this.promotionRemarks = promotionRemarks;
@@ -299,7 +304,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.emergency_contact
 	 * @return  the value of personnel_mid.emergency_contact
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getEmergencyContact() {
 		return emergencyContact;
@@ -307,7 +312,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.emergency_contact
 	 * @param emergencyContact  the value for personnel_mid.emergency_contact
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setEmergencyContact(String emergencyContact) {
 		this.emergencyContact = emergencyContact;
@@ -315,7 +320,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.emergency_mobile
 	 * @return  the value of personnel_mid.emergency_mobile
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getEmergencyMobile() {
 		return emergencyMobile;
@@ -323,7 +328,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.emergency_mobile
 	 * @param emergencyMobile  the value for personnel_mid.emergency_mobile
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setEmergencyMobile(String emergencyMobile) {
 		this.emergencyMobile = emergencyMobile;
@@ -331,7 +336,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.quit_time
 	 * @return  the value of personnel_mid.quit_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getQuitTime() {
 		return quitTime;
@@ -339,7 +344,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.quit_time
 	 * @param quitTime  the value for personnel_mid.quit_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setQuitTime(Date quitTime) {
 		this.quitTime = quitTime;
@@ -347,7 +352,7 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_mid.create_time
 	 * @return  the value of personnel_mid.create_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -355,11 +360,27 @@ public class PersonnelMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.create_time
 	 * @param createTime  the value for personnel_mid.create_time
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 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_mid.welfare_remarks
+	 * @return  the value of personnel_mid.welfare_remarks
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
+	 */
+	public String getWelfareRemarks() {
+		return welfareRemarks;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_mid.welfare_remarks
+	 * @param welfareRemarks  the value for personnel_mid.welfare_remarks
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
+	 */
+	public void setWelfareRemarks(String welfareRemarks) {
+		this.welfareRemarks = welfareRemarks;
+	}
 	public PersonnelMid(Integer id) {
     	this.id=id;
 	}

+ 86 - 16
src/main/java/com/goafanti/common/model/PersonnelMidExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class PersonnelMidExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public PersonnelMidExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class PersonnelMidExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1232,11 +1232,81 @@ public class PersonnelMidExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andWelfareRemarksIsNull() {
+			addCriterion("welfare_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksIsNotNull() {
+			addCriterion("welfare_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksEqualTo(String value) {
+			addCriterion("welfare_remarks =", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksNotEqualTo(String value) {
+			addCriterion("welfare_remarks <>", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksGreaterThan(String value) {
+			addCriterion("welfare_remarks >", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("welfare_remarks >=", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksLessThan(String value) {
+			addCriterion("welfare_remarks <", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksLessThanOrEqualTo(String value) {
+			addCriterion("welfare_remarks <=", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksLike(String value) {
+			addCriterion("welfare_remarks like", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksNotLike(String value) {
+			addCriterion("welfare_remarks not like", value, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksIn(List<String> values) {
+			addCriterion("welfare_remarks in", values, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksNotIn(List<String> values) {
+			addCriterion("welfare_remarks not in", values, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksBetween(String value1, String value2) {
+			addCriterion("welfare_remarks between", value1, value2, "welfareRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andWelfareRemarksNotBetween(String value1, String value2) {
+			addCriterion("welfare_remarks not between", value1, value2, "welfareRemarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_mid
-	 * @mbg.generated  Thu Apr 30 10:47:31 CST 2020
+	 * @mbg.generated  Thu May 07 14:15:57 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 1
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -2,6 +2,7 @@ package com.goafanti.common.task;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -25,6 +26,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.patent.service.PatentNewService;
+import com.goafanti.report.bo.marketingESBo;
 
 
 
@@ -128,7 +130,6 @@ public class PatentTask {
 		LoggerUtils.debug(getClass(), "=====================专利提醒结束======================");
 	}
 	
-	
 
 	/**
 	 * 

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

@@ -10,6 +10,7 @@ public class IntpersonnelWelfareBo extends PersonnelWelfare{
 	  
 	  private String annexUrl;
 	  private String annexName; 
+	  private String remarks;
 
 		public String getStartTimes() {
 			return StartTimes;
@@ -43,6 +44,14 @@ public class IntpersonnelWelfareBo extends PersonnelWelfare{
 			this.annexName = annexName;
 		}
 
+		public String getRemarks() {
+			return remarks;
+		}
+
+		public void setRemarks(String remarks) {
+			this.remarks = remarks;
+		}
+
 	  
 
 

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

@@ -15,6 +15,7 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	private String welfareAnnexUrl;
 	
 	private String welfareAnnexName;
+	private String  welfareRemarks;
 	
 	private List<PersonnelContact> contactList;
 	
@@ -109,6 +110,12 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	public void setWelfareAnnexName(String welfareAnnexName) {
 		this.welfareAnnexName = welfareAnnexName;
 	}
+	public String getWelfareRemarks() {
+		return welfareRemarks;
+	}
+	public void setWelfareRemarks(String welfareRemarks) {
+		this.welfareRemarks = welfareRemarks;
+	}
 	
 	
 	

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

@@ -405,24 +405,29 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	public int updateWelfare(IntpersonnelWelfareBo i) {
 		PersonnelWelfare p=personnelWelfareMapper.selectByPrimaryKey(i.getId());
 		if (p==null||p.getId()==null) {
-			personnelWelfareMapper.insertSelective(i);
+			if (i.getType()!=null) {
+				personnelWelfareMapper.insertSelective(i);
+			}
 		}else {
 			personnelWelfareMapper.updateByPrimaryKeySelective(i);
 		}
 		PersonnelMid m=new PersonnelMid();
 		m.setId(i.getPdId());
-		if (i.getType()==0) {
-			m.setInsuranceStartTime(i.getStartTime());
-			m.setInsuranceEndTime(i.getEndTime());
-		}else if (i.getType()==1) {
-			m.setFundStartTime(i.getStartTime());
-			m.setFundEndTime(i.getEndTime());
-		}else if (i.getType()==2) {
-			m.setEmployerStartTime(i.getStartTime());
-			m.setEmployerEndTime(i.getEndTime());
+		if (i.getType()!=null) {
+			if (i.getType()==0) {
+				m.setInsuranceStartTime(i.getStartTime());
+				m.setInsuranceEndTime(i.getEndTime());
+			}else if (i.getType()==1) {
+				m.setFundStartTime(i.getStartTime());
+				m.setFundEndTime(i.getEndTime());
+			}else if (i.getType()==2) {
+				m.setEmployerStartTime(i.getStartTime());
+				m.setEmployerEndTime(i.getEndTime());
+			}
 		}
 		m.setWelfareAnnexUrl(i.getAnnexUrl());
 		m.setWelfareAnnexName(i.getAnnexName());
+		m.setWelfareRemarks(i.getRemarks());
 		personnelMidMapper.updateByPrimaryKeySelective(m);
 		return 1;
 	}