Browse Source

发起变更BUG修复

anderx 3 years ago
parent
commit
06ae752bb8

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

@@ -346,7 +346,7 @@
 
   <insert id="insertSelectiveList" parameterType="java.util.List">
     insert into t_change_task ( tid, cid, split_status,
-      order_no, commodity_id, commodity_name,
+      order_no, commodity_id, commodity_name,main,
       commodity_quantity, commodity_price, task_comment,
         split_super , receiver_name, create_time,service_life,
     service_year, year_sum, contract_term,declaration_batch,patent_type,
@@ -354,7 +354,7 @@
     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.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR},#{item.main},
       #{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.contractTerm,jdbcType=VARCHAR},

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

@@ -662,7 +662,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	public int pushCompleteOrderChange(NewOrderChangeBo nb) {
 		//变更完成
 		changeAdopt(nb);
-		TOrderNew o=pushChange(nb);
+		pushChange(nb);
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		TOrderNewBo order=tOrderNewMapper.getSaleIdByOno(nb.getOrderNo());
 		List<String> alist = getAllAid(nb.getId());