1

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperEducationMapper.xml

@@ -21,6 +21,7 @@
     <result column="org_id" property="orgId" jdbcType="INTEGER"  />
     <result column="fzywlx" jdbcType="VARCHAR" property="fzywlx" />
     <result column="fzywsj" jdbcType="TIMESTAMP" property="fzywsj" />
+    <result column="file_path" property="filePath" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,7 +83,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, keeper_id, datatype, type, occupation, college, department, education, degree, 
-    degree_detailed, rank, issue_facility, issue_time, sfwslzy, zsbh, rych, org_id, fzywlx, fzywsj
+    degree_detailed, rank, issue_facility, issue_time, sfwslzy, zsbh, rych, org_id, fzywlx, fzywsj, file_path
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducationExample" resultMap="BaseResultMap">
     select
@@ -123,13 +124,14 @@
       department, education, degree, 
       degree_detailed, rank, issue_facility, 
       issue_time, sfwslzy, 
-      zsbh, rych, org_id, fzywlx, fzywsj)
+      zsbh, rych, org_id, fzywlx, fzywsj, file_path)
     values (#{id,jdbcType=INTEGER}, #{keeperId,jdbcType=INTEGER}, #{datatype,jdbcType=INTEGER}, 
       #{type,jdbcType=INTEGER}, #{occupation,jdbcType=INTEGER}, #{college,jdbcType=VARCHAR}, 
       #{department,jdbcType=VARCHAR}, #{education,jdbcType=INTEGER}, #{degree,jdbcType=INTEGER}, 
       #{degreeDetailed,jdbcType=INTEGER}, #{rank,jdbcType=VARCHAR}, #{issueFacility,jdbcType=VARCHAR}, 
       #{issueTime,jdbcType=TIMESTAMP}, #{sfwslzy,jdbcType=VARCHAR}, 
-      #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR}, #{org_id,jdbcType=INTEGER}, #{fzywlx,jdbcType=VARCHAR}, #{fzywsj,jdbcType=TIMESTAMP})
+      #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR}, #{org_id,jdbcType=INTEGER}, #{fzywlx,jdbcType=VARCHAR}, 
+      #{fzywsj,jdbcType=TIMESTAMP}, #{filePath,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducation">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer">
@@ -194,6 +196,9 @@
       <if test="fzywsj != null">
         fzywsj,
       </if>
+      <if test="filePath != null">
+        file_path,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -253,6 +258,9 @@
       <if test="fzywsj != null">
         #{fzywsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="filePath != null">
+        #{filePath,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducationExample" resultType="java.lang.Integer">
@@ -321,6 +329,9 @@
       <if test="record.fzywsj != null">
         fzywsj = #{record.fzywsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.filePath != null">
+        file_path = #{record.filePath,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -346,7 +357,8 @@
       rych = #{record.rych,jdbcType=VARCHAR},
       org_id = #{record.orgId,jdbcType=INTEGER},
       fzywlx = #{record.fzywlx,jdbcType=VARCHAR},
-      fzywsj = #{record.fzywsj,jdbcType=TIMESTAMP}
+      fzywsj = #{record.fzywsj,jdbcType=TIMESTAMP},
+      file_path = #{record.filePath,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -408,6 +420,9 @@
       <if test="fzywsj != null">
         fzywsj = #{fzywsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="filePath != null">
+        file_path = #{filePath,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -430,7 +445,8 @@
       rych = #{rych,jdbcType=VARCHAR},
       org_id = #{orgId,jdbcType=INTEGER},
       fzywlx = #{fzywlx,jdbcType=VARCHAR},
-      fzywsj = #{fzywsj,jdbcType=TIMESTAMP}
+      fzywsj = #{fzywsj,jdbcType=TIMESTAMP},
+      file_path = #{filePath,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperMapper.xml

@@ -41,6 +41,7 @@
     <result column="zgzt" jdbcType="VARCHAR" property="zgzt" />
     <result column="cyfzr" property="cyfzr" jdbcType="VARCHAR" />
     <result column="gwxz" property="gwxz" jdbcType="VARCHAR" />
+    <result column="gwlb" property="gwlb" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -105,7 +106,7 @@
     email, work_Year, entry_time, employee_nature, handover_Date, input_Person_Id, input_Date, 
     edit_Person_Id, edit_Date, house_id, province_Id, city_Id, grain_Id, depot_name, 
     avator_Url, nation, isdepartment_time, political, sync_flag, del_flag, sfsjjllg, cjslqygzsj,
-    cjgzsj, zw, mz, zgzt, gwxz, cyfzr
+    cjgzsj, zw, mz, zgzt, gwxz, cyfzr, gwlb
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperExample" resultMap="BaseResultMap">
     select
@@ -151,7 +152,7 @@
       province_Id, city_Id, grain_Id, 
       depot_name, avator_Url, nation, 
       isdepartment_time, political, sync_flag, 
-      del_flag, sfsjjllg, cjslqygzsj, cjgzsj, zw, mz, zgzt, gwxz, cyfzr)
+      del_flag, sfsjjllg, cjslqygzsj, cjgzsj, zw, mz, zgzt, gwxz, cyfzr, gwlb)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{postType,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER}, 
       #{orgId,jdbcType=INTEGER}, #{sex,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
@@ -164,7 +165,7 @@
       #{isdepartmentTime,jdbcType=TIMESTAMP}, #{political,jdbcType=INTEGER}, #{syncFlag,jdbcType=VARCHAR}, 
       #{delFlag,jdbcType=INTEGER}, #{sfsjjllg,jdbcType=VARCHAR}, #{cjslqygzsj,jdbcType=TIMESTAMP},
       #{cjgzsj,jdbcType=TIMESTAMP}, #{zw,jdbcType=VARCHAR}, #{mz,jdbcType=INTEGER}, #{zgzt,jdbcType=VARCHAR},
-      #{gwxz,jdbcType=VARCHAR}, #{cyfzr,jdbcType=VARCHAR})
+      #{gwxz,jdbcType=VARCHAR}, #{cyfzr,jdbcType=VARCHAR}, #{gwlb,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyProperty="id" useGeneratedKeys="true" parameterType="com.chinaitop.depot.basic.model.BasicKeeper">
     <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
@@ -289,6 +290,9 @@
       <if test="cyfzr != null">
         cyfzr,
       </if>
+      <if test="gwlb != null">
+        gwlb,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -408,6 +412,9 @@
       <if test="cyfzr != null">
         #{cyfzr,jdbcType=VARCHAR},
       </if>
+      <if test="gwlb != null">
+        #{gwlb,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperExample" resultType="java.lang.Integer">
@@ -536,6 +543,9 @@
       <if test="record.cyfzr != null">
         cyfzr = #{record.cyfzr,jdbcType=VARCHAR},
       </if>
+      <if test="record.gwlb != null">
+        gwlb = #{record.gwlb,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -581,7 +591,8 @@
       mz = #{record.mz,jdbcType=INTEGER},
       zgzt = #{record.zgzt,jdbcType=VARCHAR},
       gwxz = #{record.gwxz,jdbcType=VARCHAR},
-      cyfzr = #{record.cyfzr,jdbcType=VARCHAR}
+      cyfzr = #{record.cyfzr,jdbcType=VARCHAR},
+      gwlb = #{record.gwlb,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -703,6 +714,9 @@
       <if test="cyfzr != null">
         cyfzr = #{cyfzr,jdbcType=VARCHAR},
       </if>
+      <if test="gwlb != null">
+        gwlb = #{gwlb,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -745,7 +759,8 @@
       mz = #{mz,jdbcType=INTEGER},
       zgzt = #{zgzt,jdbcType=VARCHAR},
       gwxz = #{gwxz,jdbcType=VARCHAR},
-      cyfzr = #{cyfzr,jdbcType=VARCHAR}
+      cyfzr = #{cyfzr,jdbcType=VARCHAR},
+      gwlb = #{gwlb,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

src/main/java/com/chinaitop/depot/basic/model/BasicKeeper.java

@@ -84,6 +84,8 @@ public class BasicKeeper {
     private Date cjgzsj;
     //关键部门负责人
     private String cyfzr;
+    //岗位类型
+    private String gwlb;
 
     //业务字段
     private String keeperNames;
@@ -720,4 +722,20 @@ public class BasicKeeper {
 		this.cyfzr = cyfzr;
 	}
 
+	/**
+	 * 岗位类型
+	 * @return
+	 */
+	public String getGwlb() {
+		return gwlb;
+	}
+
+	/**
+	 * 岗位类型
+	 * @param gwlb
+	 */
+	public void setGwlb(String gwlb) {
+		this.gwlb = gwlb;
+	}
+
 }

src/main/java/com/chinaitop/depot/basic/model/BasicKeeperEducation.java

@@ -41,6 +41,8 @@ public class BasicKeeperEducation {
 
     private String fzywlx;
 
+    private String filePath;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date fzywsj;
 
@@ -339,4 +341,20 @@ public class BasicKeeperEducation {
 	public void setFzywsj(Date fzywsj) {
 		this.fzywsj = fzywsj;
 	}
+
+	/**
+	 * 附件路径
+	 * @return
+	 */
+	public String getFilePath() {
+		return filePath;
+	}
+
+	/**
+	 * 附件路径
+	 * @param filePath
+	 */
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperServiceImpl.java

@@ -371,7 +371,7 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 				bke.setOrgId(orgId);
 				eduMapper.insertSelective(bke);
 			} else {
-				eduMapper.updateByPrimaryKeySelective(bke);
+				eduMapper.updateByPrimaryKey(bke);
 			}
 		}
 	}