工作经历开始结束时间

yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringWorkingExperience.java

@@ -19,12 +19,12 @@ public class PractitionerHiringWorkingExperience {
     /**
     /**
      * 开始年月
      * 开始年月
      */
      */
-    private Date workingStart;
+    private String workingStart;
 
 
     /**
     /**
      * 结束年月
      * 结束年月
      */
      */
-    private Date workingEnd;
+    private String workingEnd;
 
 
     /**
     /**
      * 获取 工作单位
      * 获取 工作单位
@@ -67,7 +67,7 @@ public class PractitionerHiringWorkingExperience {
      *
      *
      * @return workingStart 开始年月
      * @return workingStart 开始年月
      */
      */
-    public Date getWorkingStart() {
+    public String getWorkingStart() {
         return this.workingStart;
         return this.workingStart;
     }
     }
 
 
@@ -76,7 +76,7 @@ public class PractitionerHiringWorkingExperience {
      *
      *
      * @param workingStart 开始年月
      * @param workingStart 开始年月
      */
      */
-    public void setWorkingStart(Date workingStart) {
+    public void setWorkingStart(String workingStart) {
         this.workingStart = workingStart;
         this.workingStart = workingStart;
     }
     }
 
 
@@ -85,7 +85,7 @@ public class PractitionerHiringWorkingExperience {
      *
      *
      * @return workingEnd 结束年月
      * @return workingEnd 结束年月
      */
      */
-    public Date getWorkingEnd() {
+    public String getWorkingEnd() {
         return this.workingEnd;
         return this.workingEnd;
     }
     }
 
 
@@ -94,7 +94,7 @@ public class PractitionerHiringWorkingExperience {
      *
      *
      * @param workingEnd 结束年月
      * @param workingEnd 结束年月
      */
      */
-    public void setWorkingEnd(Date workingEnd) {
+    public void setWorkingEnd(String workingEnd) {
         this.workingEnd = workingEnd;
         this.workingEnd = workingEnd;
     }
     }
 
 

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringWorkingExperience.java

@@ -31,12 +31,12 @@ public class AclPractitionerHiringWorkingExperience {
     /**
     /**
     * 开始年月
     * 开始年月
     */
     */
-    private Date workingStart;
+    private String workingStart;
 
 
     /**
     /**
     * 结束年月
     * 结束年月
     */
     */
-    private Date workingEnd;
+    private String workingEnd;
 
 
     /**
     /**
     * 排序
     * 排序

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringWorkingExperienceMapper.xml

@@ -8,8 +8,8 @@
     <result column="hiring_basic_info_id" jdbcType="BIGINT" property="hiringBasicInfoId" />
     <result column="hiring_basic_info_id" jdbcType="BIGINT" property="hiringBasicInfoId" />
     <result column="working_company" jdbcType="VARCHAR" property="workingCompany" />
     <result column="working_company" jdbcType="VARCHAR" property="workingCompany" />
     <result column="position" jdbcType="VARCHAR" property="position" />
     <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="working_start" jdbcType="TIMESTAMP" property="workingStart" />
-    <result column="working_end" jdbcType="TIMESTAMP" property="workingEnd" />
+    <result column="working_start" jdbcType="VARCHAR" property="workingStart" />
+    <result column="working_end" jdbcType="VARCHAR" property="workingEnd" />
     <result column="seq" jdbcType="BIGINT" property="seq" />
     <result column="seq" jdbcType="BIGINT" property="seq" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -42,7 +42,7 @@
       created_by, updated_at, updated_by
       created_by, updated_at, updated_by
       )
       )
     values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{workingCompany,jdbcType=VARCHAR}, 
     values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{workingCompany,jdbcType=VARCHAR}, 
-      #{position,jdbcType=VARCHAR}, #{workingStart,jdbcType=TIMESTAMP}, #{workingEnd,jdbcType=TIMESTAMP}, 
+      #{position,jdbcType=VARCHAR}, #{workingStart,jdbcType=VARCHAR}, #{workingEnd,jdbcType=VARCHAR},
       #{seq,jdbcType=BIGINT}, #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
       #{seq,jdbcType=BIGINT}, #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, 
       #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}
       #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}
       )
       )
@@ -96,10 +96,10 @@
         #{position,jdbcType=VARCHAR},
         #{position,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="workingStart != null">
       <if test="workingStart != null">
-        #{workingStart,jdbcType=TIMESTAMP},
+        #{workingStart,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="workingEnd != null">
       <if test="workingEnd != null">
-        #{workingEnd,jdbcType=TIMESTAMP},
+        #{workingEnd,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="seq != null">
       <if test="seq != null">
         #{seq,jdbcType=BIGINT},
         #{seq,jdbcType=BIGINT},
@@ -135,10 +135,10 @@
         `position` = #{position,jdbcType=VARCHAR},
         `position` = #{position,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="workingStart != null">
       <if test="workingStart != null">
-        working_start = #{workingStart,jdbcType=TIMESTAMP},
+        working_start = #{workingStart,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="workingEnd != null">
       <if test="workingEnd != null">
-        working_end = #{workingEnd,jdbcType=TIMESTAMP},
+        working_end = #{workingEnd,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="seq != null">
       <if test="seq != null">
         seq = #{seq,jdbcType=BIGINT},
         seq = #{seq,jdbcType=BIGINT},
@@ -167,8 +167,8 @@
     set hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT},
     set hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT},
       working_company = #{workingCompany,jdbcType=VARCHAR},
       working_company = #{workingCompany,jdbcType=VARCHAR},
       `position` = #{position,jdbcType=VARCHAR},
       `position` = #{position,jdbcType=VARCHAR},
-      working_start = #{workingStart,jdbcType=TIMESTAMP},
-      working_end = #{workingEnd,jdbcType=TIMESTAMP},
+      working_start = #{workingStart,jdbcType=VARCHAR},
+      working_end = #{workingEnd,jdbcType=VARCHAR},
       seq = #{seq,jdbcType=BIGINT},
       seq = #{seq,jdbcType=BIGINT},
       is_active = #{isActive,jdbcType=INTEGER},
       is_active = #{isActive,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -198,12 +198,12 @@
       </trim>
       </trim>
       <trim prefix="working_start = case" suffix="end,">
       <trim prefix="working_start = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=BIGINT} then #{item.workingStart,jdbcType=TIMESTAMP}
+          when id = #{item.id,jdbcType=BIGINT} then #{item.workingStart,jdbcType=VARCHAR}
         </foreach>
         </foreach>
       </trim>
       </trim>
       <trim prefix="working_end = case" suffix="end,">
       <trim prefix="working_end = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=BIGINT} then #{item.workingEnd,jdbcType=TIMESTAMP}
+          when id = #{item.id,jdbcType=BIGINT} then #{item.workingEnd,jdbcType=VARCHAR}
         </foreach>
         </foreach>
       </trim>
       </trim>
       <trim prefix="seq = case" suffix="end,">
       <trim prefix="seq = case" suffix="end,">
@@ -270,14 +270,14 @@
       <trim prefix="working_start = case" suffix="end,">
       <trim prefix="working_start = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
           <if test="item.workingStart != null">
           <if test="item.workingStart != null">
-            when id = #{item.id,jdbcType=BIGINT} then #{item.workingStart,jdbcType=TIMESTAMP}
+            when id = #{item.id,jdbcType=BIGINT} then #{item.workingStart,jdbcType=VARCHAR}
           </if>
           </if>
         </foreach>
         </foreach>
       </trim>
       </trim>
       <trim prefix="working_end = case" suffix="end,">
       <trim prefix="working_end = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
           <if test="item.workingEnd != null">
           <if test="item.workingEnd != null">
-            when id = #{item.id,jdbcType=BIGINT} then #{item.workingEnd,jdbcType=TIMESTAMP}
+            when id = #{item.id,jdbcType=BIGINT} then #{item.workingEnd,jdbcType=VARCHAR}
           </if>
           </if>
         </foreach>
         </foreach>
       </trim>
       </trim>
@@ -337,7 +337,7 @@
     values
     values
     <foreach collection="list" item="item" separator=",">
     <foreach collection="list" item="item" separator=",">
       (#{item.hiringBasicInfoId,jdbcType=BIGINT}, #{item.workingCompany,jdbcType=VARCHAR}, 
       (#{item.hiringBasicInfoId,jdbcType=BIGINT}, #{item.workingCompany,jdbcType=VARCHAR}, 
-        #{item.position,jdbcType=VARCHAR}, #{item.workingStart,jdbcType=TIMESTAMP}, #{item.workingEnd,jdbcType=TIMESTAMP}, 
+        #{item.position,jdbcType=VARCHAR}, #{item.workingStart,jdbcType=VARCHAR}, #{item.workingEnd,jdbcType=VARCHAR},
         #{item.seq,jdbcType=BIGINT}, #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, 
         #{item.seq,jdbcType=BIGINT}, #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, 
         #{item.createdBy,jdbcType=BIGINT}, #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT}
         #{item.createdBy,jdbcType=BIGINT}, #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT}
         )
         )