Sfoglia il codice sorgente

变更开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 anni fa
parent
commit
04d8d13393

+ 3 - 1
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -77,7 +77,7 @@ public interface NewOrderChangeMapper {
 	 */
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 	int updateByPrimaryKey(NewOrderChange record);
 
 
-	NewOrderChangeBo selectByorderNo(String orderNo);
+	List<NewOrderChangeBo> selectByorderNo(String orderNo);
 
 
 	int checkOderNo(String orderNo);
 	int checkOderNo(String orderNo);
 
 
@@ -86,4 +86,6 @@ public interface NewOrderChangeMapper {
 	void addRefundInvoice(@Param("orderNo")String orderNo, @Param("amount")BigDecimal amount);
 	void addRefundInvoice(@Param("orderNo")String orderNo, @Param("amount")BigDecimal amount);
 
 
 	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
 	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
+
+	NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
 }
 }

+ 14 - 12
src/main/java/com/goafanti/common/dao/TChanggeTaskMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 
 import com.goafanti.common.model.TChanggeTask;
 import com.goafanti.common.model.TChanggeTask;
 import com.goafanti.common.model.TChanggeTaskExample;
 import com.goafanti.common.model.TChanggeTaskExample;
+import com.goafanti.order.bo.TChanggeTaskOut;
+
 import java.util.List;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -9,71 +11,71 @@ public interface TChanggeTaskMapper {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	long countByExample(TChanggeTaskExample example);
 	long countByExample(TChanggeTaskExample example);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int deleteByExample(TChanggeTaskExample example);
 	int deleteByExample(TChanggeTaskExample example);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int deleteByPrimaryKey(Integer id);
 	int deleteByPrimaryKey(Integer id);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int insert(TChanggeTask record);
 	int insert(TChanggeTask record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int insertSelective(TChanggeTask record);
 	int insertSelective(TChanggeTask record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	List<TChanggeTask> selectByExample(TChanggeTaskExample example);
 	List<TChanggeTask> selectByExample(TChanggeTaskExample example);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	TChanggeTask selectByPrimaryKey(Integer id);
 	TChanggeTask selectByPrimaryKey(Integer id);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int updateByExampleSelective(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
 	int updateByExampleSelective(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int updateByExample(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
 	int updateByExample(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int updateByPrimaryKeySelective(TChanggeTask record);
 	int updateByPrimaryKeySelective(TChanggeTask record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	int updateByPrimaryKey(TChanggeTask record);
 	int updateByPrimaryKey(TChanggeTask record);
 
 
 	void insertSelectiveList(@Param("list")List<TChanggeTask> list);
 	void insertSelectiveList(@Param("list")List<TChanggeTask> list);
 
 
-	List<TChanggeTask> selectByCid(Integer id);
+	List<TChanggeTaskOut> selectByCid(Integer id);
 }
 }

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

@@ -640,10 +640,22 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 and status!=4
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 
 	and a.order_no= #{orderNo}
 	and a.order_no= #{orderNo}
+	order by a.create_time desc limit 1
+  </select>
+  <select id="selectByorderNoAndStatus" resultType="com.goafanti.order.bo.NewOrderChangeBo">
+select
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
+	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
+	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
+	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 and status!=4
+	and a.order_no= #{orderNo} 
 	order by a.create_time desc
 	order by a.create_time desc
-	limit 1
+	
   </select>
   </select>
   
   
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">

+ 45 - 28
src/main/java/com/goafanti/common/mapper/TChanggeTaskMapper.xml

@@ -5,12 +5,13 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="main" jdbcType="INTEGER" property="main" />
     <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
     <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
     <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
     <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
     <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
     <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
@@ -22,7 +23,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     <where>
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +57,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     <where>
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,16 +91,16 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
-    id, tid, cid, order_no, commodity_id, commodity_name, commodity_quantity, commodity_price, 
+    id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
     task_comment, create_time
     task_comment, create_time
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" resultMap="BaseResultMap">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     select
     select
     <if test="distinct">
     <if test="distinct">
@@ -118,7 +119,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
@@ -129,7 +130,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     delete from t_changge_task
     delete from t_changge_task
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -138,7 +139,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     delete from t_changge_task
     delete from t_changge_task
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -149,22 +150,22 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     insert into t_changge_task (id, tid, cid, 
     insert into t_changge_task (id, tid, cid, 
-      order_no, commodity_id, commodity_name, 
-      commodity_quantity, commodity_price, task_comment, 
-      create_time)
+      order_no, main, commodity_id, 
+      commodity_name, commodity_quantity, commodity_price, 
+      task_comment, create_time)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
-      #{orderNo,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
-      #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, #{taskComment,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR}, 
+      #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
+      #{taskComment,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeTask">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeTask">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     insert into t_changge_task
     insert into t_changge_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -180,6 +181,9 @@
       <if test="orderNo != null">
       <if test="orderNo != null">
         order_no,
         order_no,
       </if>
       </if>
+      <if test="main != null">
+        main,
+      </if>
       <if test="commodityId != null">
       <if test="commodityId != null">
         commodity_id,
         commodity_id,
       </if>
       </if>
@@ -212,6 +216,9 @@
       <if test="orderNo != null">
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
         #{orderNo,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="main != null">
+        #{main,jdbcType=INTEGER},
+      </if>
       <if test="commodityId != null">
       <if test="commodityId != null">
         #{commodityId,jdbcType=VARCHAR},
         #{commodityId,jdbcType=VARCHAR},
       </if>
       </if>
@@ -236,7 +243,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     select count(*) from t_changge_task
     select count(*) from t_changge_task
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -247,7 +254,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     update t_changge_task
     update t_changge_task
     <set>
     <set>
@@ -263,6 +270,9 @@
       <if test="record.orderNo != null">
       <if test="record.orderNo != null">
         order_no = #{record.orderNo,jdbcType=VARCHAR},
         order_no = #{record.orderNo,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="record.main != null">
+        main = #{record.main,jdbcType=INTEGER},
+      </if>
       <if test="record.commodityId != null">
       <if test="record.commodityId != null">
         commodity_id = #{record.commodityId,jdbcType=VARCHAR},
         commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       </if>
       </if>
@@ -290,13 +300,14 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     update t_changge_task
     update t_changge_task
     set id = #{record.id,jdbcType=INTEGER},
     set id = #{record.id,jdbcType=INTEGER},
       tid = #{record.tid,jdbcType=INTEGER},
       tid = #{record.tid,jdbcType=INTEGER},
       cid = #{record.cid,jdbcType=INTEGER},
       cid = #{record.cid,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
+      main = #{record.main,jdbcType=INTEGER},
       commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       commodity_name = #{record.commodityName,jdbcType=VARCHAR},
       commodity_name = #{record.commodityName,jdbcType=VARCHAR},
       commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
       commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
@@ -311,7 +322,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     update t_changge_task
     update t_changge_task
     <set>
     <set>
@@ -324,6 +335,9 @@
       <if test="orderNo != null">
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="main != null">
+        main = #{main,jdbcType=INTEGER},
+      </if>
       <if test="commodityId != null">
       <if test="commodityId != null">
         commodity_id = #{commodityId,jdbcType=VARCHAR},
         commodity_id = #{commodityId,jdbcType=VARCHAR},
       </if>
       </if>
@@ -349,12 +363,13 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+      This element was generated on Sat Jan 11 11:53:39 CST 2020.
     -->
     -->
     update t_changge_task
     update t_changge_task
     set tid = #{tid,jdbcType=INTEGER},
     set tid = #{tid,jdbcType=INTEGER},
       cid = #{cid,jdbcType=INTEGER},
       cid = #{cid,jdbcType=INTEGER},
       order_no = #{orderNo,jdbcType=VARCHAR},
       order_no = #{orderNo,jdbcType=VARCHAR},
+      main = #{main,jdbcType=INTEGER},
       commodity_id = #{commodityId,jdbcType=VARCHAR},
       commodity_id = #{commodityId,jdbcType=VARCHAR},
       commodity_name = #{commodityName,jdbcType=VARCHAR},
       commodity_name = #{commodityName,jdbcType=VARCHAR},
       commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
       commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
@@ -370,17 +385,19 @@
       commodity_quantity, commodity_price, task_comment, 
       commodity_quantity, commodity_price, task_comment, 
       create_time)
       create_time)
     values 
     values 
-    <foreach collection="list" item="item" index= "index" separator =",">
+    <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,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.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR}, 
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR}, 
       now())
       now())
     </foreach>
     </foreach>
   </insert>
   </insert>
-  <select id="selectByCid" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from t_changge_task
-    where cid= #{id}
+  <select id="selectByCid" resultType="com.goafanti.order.bo.TChanggeTaskOut">
+     select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
+  	 a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,
+  a.task_comment as taskComment ,a.commodity_price as commodityPrice
+    from t_changge_task a left join business_project i on a.commodity_id=i.id
+  	left join business_category c on i.cid=c.id 
+  	where a.cid= #{id}
   </select>
   </select>
 </mapper>
 </mapper>

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1197,7 +1197,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
-  	,f.name as consultantName,a.settlement_amount as settlementAmount
+  	,f.name as consultantName,a.settlement_amount as settlementAmount,if(isnull(g.order_no)=0,1,0) ischange
   	</if>
   	</if>
   	from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
   	from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
   	left join department dep on a.order_dep=dep.id
   	left join department dep on a.order_dep=dep.id
@@ -1209,9 +1209,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	left join admin f on e.initiate=f.id
   	left join admin f on e.initiate=f.id
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
-  	left join (select * from t_order_task
-	where super_id is null )  e on e.order_no=a.order_no
+  	left join (select * from t_order_task where super_id is null )  e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	left join admin f on e.task_receiver=f.id
+  	left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
   	</if>
   	</if>
   	where a.delete_sign !=1
   	where a.delete_sign !=1
   	<if test="outsource != null">
   	<if test="outsource != null">

+ 53 - 30
src/main/java/com/goafanti/common/model/TChanggeTask.java

@@ -7,59 +7,64 @@ public class TChanggeTask {
 
 
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private Integer id;
 	private Integer id;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.tid
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.tid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private Integer tid;
 	private Integer tid;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.cid
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.cid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private Integer cid;
 	private Integer cid;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.order_no
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private String orderNo;
 	private String orderNo;
 	/**
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.main
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 */
+	private Integer main;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_id
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private String commodityId;
 	private String commodityId;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_name
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_name
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private String commodityName;
 	private String commodityName;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_quantity
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_quantity
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private Integer commodityQuantity;
 	private Integer commodityQuantity;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_price
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_price
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private BigDecimal commodityPrice;
 	private BigDecimal commodityPrice;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.task_comment
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.task_comment
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private String taskComment;
 	private String taskComment;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.create_time
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	private Date createTime;
 	private Date createTime;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.id
 	 * @return  the value of t_changge_task.id
 	 * @return  the value of t_changge_task.id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;
@@ -68,7 +73,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.id
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.id
 	 * @param id  the value for t_changge_task.id
 	 * @param id  the value for t_changge_task.id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setId(Integer id) {
 	public void setId(Integer id) {
 		this.id = id;
 		this.id = id;
@@ -77,7 +82,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.tid
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.tid
 	 * @return  the value of t_changge_task.tid
 	 * @return  the value of t_changge_task.tid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Integer getTid() {
 	public Integer getTid() {
 		return tid;
 		return tid;
@@ -86,7 +91,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.tid
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.tid
 	 * @param tid  the value for t_changge_task.tid
 	 * @param tid  the value for t_changge_task.tid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setTid(Integer tid) {
 	public void setTid(Integer tid) {
 		this.tid = tid;
 		this.tid = tid;
@@ -95,7 +100,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.cid
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.cid
 	 * @return  the value of t_changge_task.cid
 	 * @return  the value of t_changge_task.cid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Integer getCid() {
 	public Integer getCid() {
 		return cid;
 		return cid;
@@ -104,7 +109,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.cid
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.cid
 	 * @param cid  the value for t_changge_task.cid
 	 * @param cid  the value for t_changge_task.cid
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCid(Integer cid) {
 	public void setCid(Integer cid) {
 		this.cid = cid;
 		this.cid = cid;
@@ -113,7 +118,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.order_no
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.order_no
 	 * @return  the value of t_changge_task.order_no
 	 * @return  the value of t_changge_task.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public String getOrderNo() {
 	public String getOrderNo() {
 		return orderNo;
 		return orderNo;
@@ -122,16 +127,34 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.order_no
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.order_no
 	 * @param orderNo  the value for t_changge_task.order_no
 	 * @param orderNo  the value for t_changge_task.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setOrderNo(String orderNo) {
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 		this.orderNo = orderNo;
 	}
 	}
 
 
 	/**
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.main
+	 * @return  the value of t_changge_task.main
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 */
+	public Integer getMain() {
+		return main;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.main
+	 * @param main  the value for t_changge_task.main
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 */
+	public void setMain(Integer main) {
+		this.main = main;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_id
 	 * @return  the value of t_changge_task.commodity_id
 	 * @return  the value of t_changge_task.commodity_id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public String getCommodityId() {
 	public String getCommodityId() {
 		return commodityId;
 		return commodityId;
@@ -140,7 +163,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_id
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_id
 	 * @param commodityId  the value for t_changge_task.commodity_id
 	 * @param commodityId  the value for t_changge_task.commodity_id
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCommodityId(String commodityId) {
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
 		this.commodityId = commodityId;
@@ -149,7 +172,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_name
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_name
 	 * @return  the value of t_changge_task.commodity_name
 	 * @return  the value of t_changge_task.commodity_name
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public String getCommodityName() {
 	public String getCommodityName() {
 		return commodityName;
 		return commodityName;
@@ -158,7 +181,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_name
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_name
 	 * @param commodityName  the value for t_changge_task.commodity_name
 	 * @param commodityName  the value for t_changge_task.commodity_name
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCommodityName(String commodityName) {
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
 		this.commodityName = commodityName;
@@ -167,7 +190,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_quantity
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_quantity
 	 * @return  the value of t_changge_task.commodity_quantity
 	 * @return  the value of t_changge_task.commodity_quantity
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Integer getCommodityQuantity() {
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
 		return commodityQuantity;
@@ -176,7 +199,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_quantity
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_changge_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_changge_task.commodity_quantity
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
 		this.commodityQuantity = commodityQuantity;
@@ -185,7 +208,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_price
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_price
 	 * @return  the value of t_changge_task.commodity_price
 	 * @return  the value of t_changge_task.commodity_price
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public BigDecimal getCommodityPrice() {
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
 		return commodityPrice;
@@ -194,7 +217,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_price
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_price
 	 * @param commodityPrice  the value for t_changge_task.commodity_price
 	 * @param commodityPrice  the value for t_changge_task.commodity_price
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
 		this.commodityPrice = commodityPrice;
@@ -203,7 +226,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.task_comment
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.task_comment
 	 * @return  the value of t_changge_task.task_comment
 	 * @return  the value of t_changge_task.task_comment
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public String getTaskComment() {
 	public String getTaskComment() {
 		return taskComment;
 		return taskComment;
@@ -212,7 +235,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.task_comment
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.task_comment
 	 * @param taskComment  the value for t_changge_task.task_comment
 	 * @param taskComment  the value for t_changge_task.task_comment
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setTaskComment(String taskComment) {
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
 		this.taskComment = taskComment;
@@ -221,7 +244,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.create_time
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.create_time
 	 * @return  the value of t_changge_task.create_time
 	 * @return  the value of t_changge_task.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Date getCreateTime() {
 	public Date getCreateTime() {
 		return createTime;
 		return createTime;
@@ -230,7 +253,7 @@ public class TChanggeTask {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.create_time
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.create_time
 	 * @param createTime  the value for t_changge_task.create_time
 	 * @param createTime  the value for t_changge_task.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setCreateTime(Date createTime) {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 		this.createTime = createTime;

+ 76 - 16
src/main/java/com/goafanti/common/model/TChanggeTaskExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TChanggeTaskExample {
 public class TChanggeTaskExample {
     /**
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	protected String orderByClause;
 	protected String orderByClause;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	protected boolean distinct;
 	protected boolean distinct;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	protected List<Criteria> oredCriteria;
 	protected List<Criteria> oredCriteria;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public TChanggeTaskExample() {
 	public TChanggeTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setOrderByClause(String orderByClause) {
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public String getOrderByClause() {
 	public String getOrderByClause() {
 		return orderByClause;
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void setDistinct(boolean distinct) {
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public boolean isDistinct() {
 	public boolean isDistinct() {
 		return distinct;
 		return distinct;
@@ -64,7 +64,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public List<Criteria> getOredCriteria() {
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void or(Criteria criteria) {
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Criteria or() {
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public Criteria createCriteria() {
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	protected Criteria createCriteriaInternal() {
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public void clear() {
 	public void clear() {
 		oredCriteria.clear();
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	protected abstract static class GeneratedCriteria {
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
 		protected List<Criterion> criteria;
@@ -414,6 +414,66 @@ public class TChanggeTaskExample {
 			return (Criteria) this;
 			return (Criteria) this;
 		}
 		}
 
 
+		public Criteria andMainIsNull() {
+			addCriterion("main is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainIsNotNull() {
+			addCriterion("main is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainEqualTo(Integer value) {
+			addCriterion("main =", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainNotEqualTo(Integer value) {
+			addCriterion("main <>", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainGreaterThan(Integer value) {
+			addCriterion("main >", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainGreaterThanOrEqualTo(Integer value) {
+			addCriterion("main >=", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainLessThan(Integer value) {
+			addCriterion("main <", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainLessThanOrEqualTo(Integer value) {
+			addCriterion("main <=", value, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainIn(List<Integer> values) {
+			addCriterion("main in", values, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainNotIn(List<Integer> values) {
+			addCriterion("main not in", values, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainBetween(Integer value1, Integer value2) {
+			addCriterion("main between", value1, value2, "main");
+			return (Criteria) this;
+		}
+
+		public Criteria andMainNotBetween(Integer value1, Integer value2) {
+			addCriterion("main not between", value1, value2, "main");
+			return (Criteria) this;
+		}
+
 		public Criteria andCommodityIdIsNull() {
 		public Criteria andCommodityIdIsNull() {
 			addCriterion("commodity_id is null");
 			addCriterion("commodity_id is null");
 			return (Criteria) this;
 			return (Criteria) this;
@@ -807,7 +867,7 @@ public class TChanggeTaskExample {
 
 
 	/**
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
 	 */
 	 */
 	public static class Criterion {
 	public static class Criterion {
 		private String condition;
 		private String condition;

+ 22 - 0
src/main/java/com/goafanti/order/bo/TChanggeTaskOut.java

@@ -0,0 +1,22 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TChanggeTask;
+
+public class TChanggeTaskOut extends TChanggeTask{
+	private String cname;
+	private Integer cSort;
+	public Integer getcSort() {
+		return cSort;
+	}
+	public void setcSort(Integer cSort) {
+		this.cSort = cSort;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	
+	
+}

+ 10 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -46,6 +46,10 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer dunStatus;
 	private Integer dunStatus;
 	private BigDecimal appropriationRatio;
 	private BigDecimal appropriationRatio;
 	private BigDecimal setUpAmount;
 	private BigDecimal setUpAmount;
+	/**
+	 * 是否变更 0否 1是
+	 */
+	private Integer ischange;
 	
 	
 	public String getDunSubject() {
 	public String getDunSubject() {
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
@@ -335,5 +339,11 @@ public class TOrderNewBo extends TOrderNew{
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
 		this.setUpAmount = setUpAmount;
 	}
 	}
+	public Integer getIschange() {
+		return ischange;
+	}
+	public void setIschange(Integer ischange) {
+		this.ischange = ischange;
+	}
 	
 	
 }
 }

+ 2 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -676,9 +676,10 @@ public class AdminOrderApiController extends CertifyApiController {
 	 * @param changeComment
 	 * @param changeComment
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = "/taddOrderChange",method = RequestMethod.POST)
+	@RequestMapping(value = "/addOrderChange",method = RequestMethod.POST)
 	public Result addOrderChange(String orderNo,String changeComment,String taskList,String dunList){
 	public Result addOrderChange(String orderNo,String changeComment,String taskList,String dunList){
 		Result res = new Result();
 		Result res = new Result();
+		//此订单变更为原订单变更已经确定不再使用。
 		if(StringUtils.isBlank(orderNo)){
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 			return res;

+ 60 - 23
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -22,12 +22,11 @@ import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderChangeService;
 
 
 @RestController
 @RestController
-@RequestMapping(value = "/open/admin/orderChange")
+@RequestMapping(value = "/api/admin/orderChange")
 public class OrderChangeApiController extends CertifyApiController {
 public class OrderChangeApiController extends CertifyApiController {
 	
 	
 	@Autowired
 	@Autowired
 	private OrderChangeService	orderChangeService;
 	private OrderChangeService	orderChangeService;
-	@Autowired
 	
 	
 	
 	
 	/**
 	/**
@@ -48,7 +47,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 		return res;
 	}
 	}
 	
 	
-	@RequestMapping(value = "/addChangeTask", method = RequestMethod.GET)
+	@RequestMapping(value = "/addChangeTask", method = RequestMethod.POST)
 	public Result addChangeTask(TChanggeTask t){
 	public Result addChangeTask(TChanggeTask t){
 		Result res = new Result();
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getCommodityId())){
 		if(StringUtils.isBlank(t.getCommodityId())){
@@ -67,48 +66,86 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 			return res;
 		}
 		}
-		
+		if(null==t.getCid()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更编号"));
+			return res;
+		}
 		res.setData(orderChangeService.addChangeTask(t));
 		res.setData(orderChangeService.addChangeTask(t));
 		return res;
 		return res;
 	}
 	}
-	@RequestMapping(value = "/addChangeDun", method = RequestMethod.GET)
-	public Result addChangeDun(TChanggeDun d){
+	/**
+	 *  变更项目列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectChangeTask", method = RequestMethod.GET)
+	public Result selectChangeTask(Integer id){
 		Result res = new Result();
 		Result res = new Result();
-		if(StringUtils.isBlank(d.getOrderNo())||null==d.getTid()) {
-			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
 			return res;
 			return res;
 		}
 		}
-		if(null==d.getProjectType()||null==d.getDunType()) {
-			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
+		res.setData(orderChangeService.selectChangeTask(id));
+		return res;
+	}
+	/**
+	 *  变更催款列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectChangeDun", method = RequestMethod.GET)
+	public Result selectChangeDun(Integer id){
+		Result res = new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
 			return res;
 			return res;
 		}
 		}
-		res.setData(orderChangeService.addChangeDun(d));
+		res.setData(orderChangeService.selectChangeDun(id));
 		return res;
 		return res;
 	}
 	}
 	/**
 	/**
-	 *    查看变更项目
+	 *  删除变更项目
+	 * @param t
+	 * @return
 	 */
 	 */
-	@RequestMapping(value = "/changeTasklist", method = RequestMethod.GET)
-	public Result changeTasklist(Integer id){
+	@RequestMapping(value = "/deleteChangeTask", method = RequestMethod.POST)
+	public Result deleteChangeTask(TChanggeTask t){
 		Result res = new Result();
 		Result res = new Result();
-		if(null==id){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "变更id"));
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
 			return res;
 			return res;
 		}
 		}
-		res.setData(orderChangeService.changeTasklist( id));
+		res.setData(orderChangeService.deleteChangeTask(t.getId()));
 		return res;
 		return res;
 	}
 	}
+	
 	/**
 	/**
-	 *    查看变更催款
+	 *  删除变更催款
+	 * @param t
+	 * @return
 	 */
 	 */
-	@RequestMapping(value = "/changeDunlist", method = RequestMethod.GET)
-	public Result changeDunlist(Integer id){
+	@RequestMapping(value = "/deleteChangeDun", method = RequestMethod.POST)
+	public Result deleteChangeDun(TChanggeDun t){
 		Result res = new Result();
 		Result res = new Result();
-		if(null==id){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "变更id"));
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更任务id"));
+			return res;
+		}
+		res.setData(orderChangeService.deleteChangeDun(t.getId()));
+		return res;
+	}
+	@RequestMapping(value = "/addChangeDun", method = RequestMethod.POST)
+	public Result addChangeDun(TChanggeDun d){
+		Result res = new Result();
+		if(StringUtils.isBlank(d.getOrderNo())||null==d.getTid()) {
+			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
+			return res;
+		}
+		if(null==d.getProjectType()||null==d.getDunType()) {
+			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
 			return res;
 			return res;
 		}
 		}
-		res.setData(orderChangeService.changeDunlist( id));
+		res.setData(orderChangeService.addChangeDun(d));
 		return res;
 		return res;
 	}
 	}
 	/**
 	/**

+ 7 - 5
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -12,14 +12,14 @@ import com.goafanti.common.model.TChanggeTask;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
-import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.TChanggeTaskOut;
 
 
 public interface OrderChangeService {
 public interface OrderChangeService {
 
 
 	int addOrderChange(NewOrderChangeBo t, String startRemarks);
 	int addOrderChange(NewOrderChangeBo t, String startRemarks);
 
 
-	NewOrderChangeBo orderChangeDetails(String orderNo);
+	List<NewOrderChangeBo> orderChangeDetails(String orderNo);
 
 
 	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState, Integer rejectState);
 	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState, Integer rejectState);
 
 
@@ -48,17 +48,19 @@ public interface OrderChangeService {
 			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 			Integer pageNo) throws IOException ;
 
 
-	List<TChanggeTask> changeTasklist(Integer id);
 
 
-	List<TChanggeDun> changeDunlist(Integer id);
 
 
 	int addChangeTask(TChanggeTask t);
 	int addChangeTask(TChanggeTask t);
 
 
 	int addChangeDun(TChanggeDun d);
 	int addChangeDun(TChanggeDun d);
 
 
+	int deleteChangeTask(Integer id);
 
 
-	
+	int deleteChangeDun(Integer id);
 
 
+	List<TChanggeTaskOut> selectChangeTask(Integer cid);
+	
+	List<TChanggeDun> selectChangeDun(Integer cid);
 
 
 
 
 }
 }

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

@@ -20,9 +20,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.bo.OrderExamineBo;
@@ -64,6 +61,7 @@ import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.TChanggeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderChangeType;
@@ -72,8 +70,7 @@ import com.goafanti.order.enums.OrderType;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OrderService;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+
 @Service
 @Service
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
 	@Autowired
 	@Autowired
@@ -118,7 +115,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew ton=new TOrderNew();
 		TOrderNew ton=new TOrderNew();
 		ton.setOrderNo(t.getOrderNo());
 		ton.setOrderNo(t.getOrderNo());
 		ton.setDeleteSign(2);//将订单置为锁定
 		ton.setDeleteSign(2);//将订单置为锁定
-		t.setProcessState(1);//设置营销管理员来审核
+		t.setProcessState(0);//设置营销管理员来审核
 		tOrderNewMapper.updateByPrimaryKeySelective(ton);
 		tOrderNewMapper.updateByPrimaryKeySelective(ton);
 		BigDecimal invoiceAmount=tOrderInvoiceMapper.conutAmountByOrderNo(t.getOrderNo());
 		BigDecimal invoiceAmount=tOrderInvoiceMapper.conutAmountByOrderNo(t.getOrderNo());
 		t.setInvoiceAmount(invoiceAmount);//开票金额
 		t.setInvoiceAmount(invoiceAmount);//开票金额
@@ -128,16 +125,52 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
 		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
 		t.setEstimateCost(estimateCost);
 		t.setEstimateCost(estimateCost);
 		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
 		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
-		
+		t.setZxsRemarks(startRemarks);
 		newOrderChangeMapper.insertSelective(t);
 		newOrderChangeMapper.insertSelective(t);
-		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNo(t.getOrderNo());
+		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
+		List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null,null);
+		List<TChanggeDun> listcd=new ArrayList<>();
+		for (OutNewOrderDunBo d : listDun) {
+			TChanggeDun cd=new TChanggeDun();
+			cd.setOrderNo(d.getOrderNo());
+			cd.setAid(d.getAid());
+			cd.setAppropriationRatio(d.getAppropriationRatio());
+			cd.setCid(ncb.getId());
+			cd.setDid(d.getId());
+			cd.setTid(d.getTid());
+			cd.setProjectType(d.getProjectType());
+			cd.setDunType(d.getDunType());
+			cd.setMoney(d.getMoney());
+			cd.setWaitDay(d.getWaitDay());
+			cd.setStartTime(d.getStartTime());
+			cd.setEffectiveCount(d.getEffectiveCount());
+			listcd.add(cd);
+		}
+		tChanggeDunMapper.insertSelectiveList(listcd);
+		List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
+		List<TChanggeTask> listck=new ArrayList<>();
+		for (TOrderTaskBo tt : listTask) {
+			TChanggeTask ck=new TChanggeTask();
+			ck.setOrderNo(tt.getOrderNo());
+			ck.setCid(ncb.getId());
+			ck.setCommodityId(tt.getCommodityId());
+			ck.setOrderNo(tt.getOrderNo());
+			ck.setCommodityName(tt.getCommodityName());
+			ck.setCommodityPrice(tt.getCommodityPrice());
+			ck.setCommodityQuantity(tt.getCommodityQuantity());
+			ck.setTaskComment(tt.getTaskComment());
+			ck.setMain(tt.getMain());
+			ck.setTid(tt.getId());
+			listck.add(ck);
+		}
+		tChanggeTaskMapper.insertSelectiveList(listck);
 		OrderChangeLog ocl=new OrderChangeLog();
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
 		ocl.setAuditor(TokenManager.getAdminId());
 		ocl.setOrderNo(t.getOrderNo());
 		ocl.setOrderNo(t.getOrderNo());
 		ocl.setRemarks(startRemarks);
 		ocl.setRemarks(startRemarks);
 		ocl.setChangeId(ncb.getId());
 		ocl.setChangeId(ncb.getId());
 		ocl.setStatus(0);
 		ocl.setStatus(0);
-		sendNotice(0, t);//设置与通过一样发送信息
+		//sendNotice(0, t);//设置与通过一样发送信息
 		orderChangeLogMapper.insertSelective(ocl);
 		orderChangeLogMapper.insertSelective(ocl);
 		return 1;
 		return 1;
 	}
 	}
@@ -172,9 +205,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	}
 
 
 	@Override
 	@Override
-	public NewOrderChangeBo orderChangeDetails(String orderNo) {
-		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
-		return nb;
+	public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
+		List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
+		return list;
 	}
 	}
 	@Override
 	@Override
 	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
 	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
@@ -189,7 +222,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	}
 	@Override
 	@Override
 	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState,Integer rejectState) {
 	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState,Integer rejectState) {
-		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
+		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNoAndStatus(orderNo);
 		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
 		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 		}
 		}
@@ -606,26 +639,36 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				    }
 				    }
 			}
 			}
 
 
+
+			@Override
+			public int addChangeTask(TChanggeTask t) {
+				return tChanggeTaskMapper.insertSelective(t);
+			}
+
 			@Override
 			@Override
-			public List<TChanggeTask> changeTasklist(Integer id) {
-				List<TChanggeTask> list=tChanggeTaskMapper.selectByCid(id);
-				return list;
+			public int addChangeDun(TChanggeDun d) {
+				d.setAid(TokenManager.getAdminId());
+				return tChanggeDunMapper.insertSelective(d);
 			}
 			}
 
 
 			@Override
 			@Override
-			public List<TChanggeDun> changeDunlist(Integer id) {
-				List<TChanggeDun> list=tChanggeDunMapper.selectByCid(id);
-				return list;
+			public int deleteChangeTask(Integer id) {
+				return tChanggeTaskMapper.deleteByPrimaryKey(id);
 			}
 			}
 
 
 			@Override
 			@Override
-			public int addChangeTask(TChanggeTask t) {
-				return tChanggeTaskMapper.insertSelective(t);
+			public int deleteChangeDun(Integer id) {
+				return tChanggeDunMapper.deleteByPrimaryKey(id);
 			}
 			}
 
 
 			@Override
 			@Override
-			public int addChangeDun(TChanggeDun d) {
-				return tChanggeDunMapper.insertSelective(d);
+			public List<TChanggeTaskOut> selectChangeTask(Integer cid) {
+				return tChanggeTaskMapper.selectByCid(cid);
+			}
+
+			@Override
+			public List<TChanggeDun> selectChangeDun(Integer cid) {
+				return tChanggeDunMapper.selectByCid(cid);
 			}
 			}