Browse Source

部门接口BUG修复

anderx 3 years ago
parent
commit
049979e893

+ 32 - 26
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -22,11 +22,12 @@
     <result column="service_life" jdbcType="VARCHAR" property="serviceLife" />
     <result column="service_year" jdbcType="VARCHAR" property="serviceYear" />
     <result column="year_sum" jdbcType="INTEGER" property="yearSum" />
+    <result column="contract_term" jdbcType="VARCHAR" property="contractTerm" />
   </resultMap>
   <sql id="Base_Column_List">
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price,
     task_comment, `type`, create_time, split_status, split_super, receiver_name, official_cost,
-    cost_reduction, service_life, service_year, year_sum
+    cost_reduction, service_life, service_year, year_sum, contract_term
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -38,28 +39,25 @@
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TChangeTask">
-    insert into t_change_task (id, tid, cid,
-      order_no, main, commodity_id,
-      commodity_name, commodity_quantity, commodity_price,
-      task_comment, `type`, create_time,
-      split_status, split_super, receiver_name,
-      official_cost, cost_reduction, service_life,
-      service_year, year_sum)
-    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER},
-      #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR},
-      #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL},
-      #{taskComment,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-      #{splitStatus,jdbcType=INTEGER}, #{splitSuper,jdbcType=INTEGER}, #{receiverName,jdbcType=VARCHAR},
-      #{officialCost,jdbcType=INTEGER}, #{costReduction,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR},
-      #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER})
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TChangeTask" useGeneratedKeys="true">
+    insert into t_change_task (tid, cid, order_no,
+      main, commodity_id, commodity_name,
+      commodity_quantity, commodity_price, task_comment,
+      `type`, create_time, split_status,
+      split_super, receiver_name, official_cost,
+      cost_reduction, service_life, service_year,
+      year_sum, contract_term)
+    values (#{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR},
+      #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR},
+      #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, #{taskComment,jdbcType=VARCHAR},
+      #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{splitStatus,jdbcType=INTEGER},
+      #{splitSuper,jdbcType=INTEGER}, #{receiverName,jdbcType=VARCHAR}, #{officialCost,jdbcType=INTEGER},
+      #{costReduction,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR}, #{serviceYear,jdbcType=VARCHAR},
+      #{yearSum,jdbcType=INTEGER}, #{contractTerm,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeTask">
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TChangeTask" useGeneratedKeys="true">
     insert into t_change_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="tid != null">
         tid,
       </if>
@@ -117,11 +115,11 @@
       <if test="yearSum != null">
         year_sum,
       </if>
+      <if test="contractTerm != null">
+        contract_term,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="tid != null">
         #{tid,jdbcType=INTEGER},
       </if>
@@ -179,6 +177,9 @@
       <if test="yearSum != null">
         #{yearSum,jdbcType=INTEGER},
       </if>
+      <if test="contractTerm != null">
+        #{contractTerm,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeTask">
@@ -241,6 +242,9 @@
       <if test="yearSum != null">
         year_sum = #{yearSum,jdbcType=INTEGER},
       </if>
+      <if test="contractTerm != null">
+        contract_term = #{contractTerm,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -264,7 +268,8 @@
       cost_reduction = #{costReduction,jdbcType=INTEGER},
       service_life = #{serviceLife,jdbcType=VARCHAR},
       service_year = #{serviceYear,jdbcType=VARCHAR},
-      year_sum = #{yearSum,jdbcType=INTEGER}
+      year_sum = #{yearSum,jdbcType=INTEGER},
+      contract_term = #{contractTerm,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -273,14 +278,15 @@
       order_no, commodity_id, commodity_name,
       commodity_quantity, commodity_price, task_comment,
         split_super , receiver_name, create_time,service_life,
-    service_year, year_sum, picture_url)
+    service_year, year_sum, contract_term)
     values
     <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, #{item.splitStatus,jdbcType=INTEGER},
       #{item.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR},
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR},
        #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now(), #{item.serviceLife,jdbcType=VARCHAR},
-      #{item.serviceYear,jdbcType=VARCHAR}, #{item.yearSum,jdbcType=INTEGER}, #{item.pictureUrl,jdbcType=VARCHAR})
+      #{item.serviceYear,jdbcType=VARCHAR}, #{item.yearSum,jdbcType=INTEGER}, #{item.pictureUrl,jdbcType=VARCHAR},
+       #{item.contractTerm,jdbcType=VARCHAR})
     </foreach>
   </insert>
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">

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

@@ -109,6 +109,11 @@ public class TChangeTask implements Serializable {
      */
     private Integer yearSum;
 
+    /**
+     * 合同期限
+     */
+    private String contractTerm;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -270,4 +275,12 @@ public class TChangeTask implements Serializable {
     public void setYearSum(Integer yearSum) {
         this.yearSum = yearSum;
     }
+
+    public String getContractTerm() {
+        return contractTerm;
+    }
+
+    public void setContractTerm(String contractTerm) {
+        this.contractTerm = contractTerm;
+    }
 }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputAddTask.java

@@ -6,6 +6,15 @@ public class InputAddTask  extends TOrderTask {
     private String serviceLife;
     private String serviceYear;
     private Integer yearSum;
+    private String contractTerm;
+
+    public String getContractTerm() {
+        return contractTerm;
+    }
+
+    public void setContractTerm(String contractTerm) {
+        this.contractTerm = contractTerm;
+    }
 
     public String getServiceLife() {
         return serviceLife;

+ 6 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -772,7 +772,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ot.setTaskStatus(0);
 			tOrderTaskMapper.insertSelective(ot);
 			if (cd.getServiceLife()!=null){
-				addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum());
+				addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 			}
 			cd.setTid(ot.getId());
 			tChangeTaskMapper.updateByPrimaryKeySelective(cd);
@@ -783,7 +783,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setCommodityQuantity(cd.getCommodityQuantity());
 				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
 				if (cd.getServiceLife()!=null){
-					updateTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum());
+					updateTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				}
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
@@ -821,21 +821,23 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 	}
 
-	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum) {
+	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
 		TTaskMember ttm=new TTaskMember();
 		ttm.setTid(id);
 		ttm.setServiceLife(serviceLife);
 		ttm.setServiceYear(serviceYear);
 		ttm.setYearSum(yearSum);
+		ttm.setContractTerm(contractTerm);
 		tTaskMemberMapper.updateByTid(ttm);
 	}
 
-	private void addTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum) {
+	private void addTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
 		TTaskMember ttm=new TTaskMember();
 		ttm.setTid(id);
 		ttm.setServiceLife(serviceLife);
 		ttm.setServiceYear(serviceYear);
 		ttm.setYearSum(yearSum);
+		ttm.setContractTerm(contractTerm);
 		tTaskMemberMapper.insertSelective(ttm);
 	}
 

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -203,6 +203,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			ttm.setServiceLife(t.getServiceLife());
 			ttm.setServiceYear(t.getServiceYear());
 			ttm.setYearSum(t.getYearSum());
+			ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
 		TTaskMid tm=new TTaskMid();
@@ -313,6 +314,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			ttm.setServiceLife(t.getServiceLife());
 			ttm.setServiceYear(t.getServiceYear());
 			ttm.setYearSum(t.getYearSum());
+			ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.updateByTid(ttm);
 		}
 		if (flag) {