Browse Source

部门接口BUG修复

anderx 3 years ago
parent
commit
e4f73665ac

+ 35 - 24
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -8,9 +8,10 @@
     <result column="service_year" jdbcType="VARCHAR" property="serviceYear" />
     <result column="year_sum" jdbcType="INTEGER" property="yearSum" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="contract_term" jdbcType="VARCHAR" property="contractTerm" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, tid, service_life, service_year, year_sum, create_time
+    id, tid, service_life, service_year, year_sum, create_time, contract_term
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -24,11 +25,11 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TTaskMember">
     insert into t_task_member (id, tid, service_life,
-      service_year, year_sum, create_time
-      )
+      service_year, year_sum, create_time,
+      contract_term)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR},
-      #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+      #{contractTerm,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMember">
     insert into t_task_member
@@ -51,6 +52,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="contractTerm != null">
+        contract_term,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -71,6 +75,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="contractTerm != null">
+        #{contractTerm,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMember">
@@ -91,6 +98,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="contractTerm != null">
+        contract_term = #{contractTerm,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -100,26 +110,27 @@
       service_life = #{serviceLife,jdbcType=VARCHAR},
       service_year = #{serviceYear,jdbcType=VARCHAR},
       year_sum = #{yearSum,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      contract_term = #{contractTerm,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-    <update id="updateByTid">
-      update t_task_member
-      <set>
-        <if test="serviceLife != null">
-          service_life = #{serviceLife,jdbcType=VARCHAR},
-        </if>
-        <if test="serviceYear != null">
-          service_year = #{serviceYear,jdbcType=VARCHAR},
-        </if>
-        <if test="yearSum != null">
-          year_sum = #{yearSum,jdbcType=INTEGER},
-        </if>
-        <if test="createTime != null">
-          create_time = #{createTime,jdbcType=TIMESTAMP},
-        </if>
-      </set>
-      where tid = #{tid,jdbcType=INTEGER}
-    </update>
+  <update id="updateByTid">
+    update t_task_member
+    <set>
+      <if test="serviceLife != null">
+        service_life = #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        service_year = #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="yearSum != null">
+        year_sum = #{yearSum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where tid = #{tid,jdbcType=INTEGER}
+  </update>
 </mapper>

+ 13 - 0
src/main/java/com/goafanti/common/model/TTaskMember.java

@@ -38,6 +38,11 @@ public class TTaskMember implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 合同期限
+     */
+    private String contractTerm;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -87,4 +92,12 @@ public class TTaskMember implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getContractTerm() {
+        return contractTerm;
+    }
+
+    public void setContractTerm(String contractTerm) {
+        this.contractTerm = contractTerm;
+    }
 }