Bläddra i källkod

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 år sedan
förälder
incheckning
384c8d51cb

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="third_party_company"/>
+    <table schema="aft" tableName="t_order_mid"/>
   </context>
 </generatorConfiguration>

+ 11 - 11
src/main/java/com/goafanti/common/dao/TOrderMidMapper.java

@@ -11,67 +11,67 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderMidMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	long countByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int deleteByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int insert(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int insertSelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	List<TOrderMid> selectByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	TOrderMid selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderMid record);
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/FinancialPaymentMapper.xml

@@ -340,7 +340,7 @@
   
   <select id="updateOrderCost">
   update t_order_mid x ,(select a.id,a.tid,b.order_no from t_order_payment a left join t_order_task b on a.tid=b.id 
-	where a.id=#{pid})y,t_task_mid z set x.cost_amount= x.cost_amount+ #{partyAmount}, z.party_amount=z.party_amount+ #{partyAmount}
+	where a.id=#{pid})y,t_task_mid z set x.payment_amount= x.payment_amount+ #{partyAmount}, z.party_amount=z.party_amount+ #{partyAmount}
   where x.order_no=y.order_no and y.tid=z.tid
   </select>
   

+ 40 - 23
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -22,12 +22,13 @@
     <result column="order_arrears" jdbcType="DECIMAL" property="orderArrears" />
     <result column="cost_amount" jdbcType="DECIMAL" property="costAmount" />
     <result column="dep_name" jdbcType="VARCHAR" property="depName" />
+    <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,7 +62,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,17 +96,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables, 
     final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables, 
-    order_arrears, cost_amount, dep_name
+    order_arrears, cost_amount, dep_name, payment_amount
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     select
     <if test="distinct">
@@ -124,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -135,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     delete from t_order_mid
     where id = #{id,jdbcType=INTEGER}
@@ -144,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     delete from t_order_mid
     <if test="_parameter != null">
@@ -155,26 +156,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     insert into t_order_mid (id, order_no, salesman_id, 
       finance_id, salesman_name, finance_name, 
       final_receivables, final_Receivables_time, 
       invoice_amount, create_time, buyer_name, 
       order_receivables, order_arrears, cost_amount, 
-      dep_name)
+      dep_name, payment_amount)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, 
       #{financeId,jdbcType=VARCHAR}, #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, 
       #{finalReceivables,jdbcType=DECIMAL}, #{finalReceivablesTime,jdbcType=TIMESTAMP}, 
       #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{buyerName,jdbcType=VARCHAR}, 
       #{orderReceivables,jdbcType=DECIMAL}, #{orderArrears,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL}, 
-      #{depName,jdbcType=VARCHAR})
+      #{depName,jdbcType=VARCHAR}, #{paymentAmount,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderMid">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     insert into t_order_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -223,6 +224,9 @@
       <if test="depName != null">
         dep_name,
       </if>
+      <if test="paymentAmount != null">
+        payment_amount,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -270,13 +274,16 @@
       <if test="depName != null">
         #{depName,jdbcType=VARCHAR},
       </if>
+      <if test="paymentAmount != null">
+        #{paymentAmount,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     select count(*) from t_order_mid
     <if test="_parameter != null">
@@ -287,7 +294,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -336,6 +343,9 @@
       <if test="record.depName != null">
         dep_name = #{record.depName,jdbcType=VARCHAR},
       </if>
+      <if test="record.paymentAmount != null">
+        payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -345,7 +355,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     update t_order_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -362,7 +372,8 @@
       order_receivables = #{record.orderReceivables,jdbcType=DECIMAL},
       order_arrears = #{record.orderArrears,jdbcType=DECIMAL},
       cost_amount = #{record.costAmount,jdbcType=DECIMAL},
-      dep_name = #{record.depName,jdbcType=VARCHAR}
+      dep_name = #{record.depName,jdbcType=VARCHAR},
+      payment_amount = #{record.paymentAmount,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -371,7 +382,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -417,6 +428,9 @@
       <if test="depName != null">
         dep_name = #{depName,jdbcType=VARCHAR},
       </if>
+      <if test="paymentAmount != null">
+        payment_amount = #{paymentAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -424,7 +438,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 06 11:48:54 CST 2020.
+      This element was generated on Wed Sep 23 11:31:19 CST 2020.
     -->
     update t_order_mid
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -440,7 +454,8 @@
       order_receivables = #{orderReceivables,jdbcType=DECIMAL},
       order_arrears = #{orderArrears,jdbcType=DECIMAL},
       cost_amount = #{costAmount,jdbcType=DECIMAL},
-      dep_name = #{depName,jdbcType=VARCHAR}
+      dep_name = #{depName,jdbcType=VARCHAR},
+      payment_amount = #{paymentAmount,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByOrderNo" resultMap="BaseResultMap">
@@ -474,10 +489,12 @@
   <select id="selectDepNameByDepid" resultType="java.lang.String">
   select name from department where id= #{orderDep}
   </select>
+  
+  
   <update id="updateCostAmount">
-      update t_order_task a ,t_task_mid c
-    set c.cost_amount=#{count}
-    where  a.id=c.tid and a.id= #{tid}
+     update t_order_task a ,t_order_mid b
+    set b.cost_amount= #{count}
+    where  a.order_no=b.order_no and a.id= #{tid}
   </update>
   
 </mapper>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1870 - 1869
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml


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

@@ -523,11 +523,11 @@
 	  </if>
   </select>
   <select id="orderOutsourceList" resultType="com.goafanti.order.bo.OrderOutsourceBo">
-  select a.order_no orderNo,b.contract_no contractNo,date_format(b.create_time,'%Y-%m-%d %H:%i:%S') createTime,a.type,a.tid,
+     select a.order_no orderNo,b.contract_no contractNo,date_format(b.create_time,'%Y-%m-%d %H:%i:%S') createTime,a.type,a.tid,
 	date_format(b.sign_time,'%Y-%m-%d') signTime,c.nickname userName, e.name depName,b.total_amount totalAmount,
 	b.liquidation_status liquidationStatus,a.refund_status refundStatus,d.name adminName,g.name financeName
 	<if test="type == 1">
-	,bc.cname,pa.name pname,bp.bname
+	,bc.cname,pa.name pname,bp.bname,h.split_id splitId,h.split_super splitSuper ,h.split_status splitStatus
 	</if>
 	from t_order_outsource a
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
@@ -541,6 +541,10 @@
 	<if test="type != null">
 	and a.type = #{type}
 	</if>
+	
+	<if test="type ==1 and tid !=null">
+	and (h.id= #{tid} or h.split_super= #{tid})
+	</if>
 	<if test="refundStatus != null">
 	and a.refund_status= #{refundStatus}
 	</if>
@@ -564,6 +568,9 @@
   <if test="type != null">
 	and a.type = #{type}
   </if>
+  <if test="type ==1 and tid !=null">
+	and (h.id= #{tid} or h.split_super= #{tid})
+	</if>
   <if test="refundStatus != null">
 	and a.refund_status= #{refundStatus}
 	</if>

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

@@ -299,9 +299,10 @@
 	left join t_task_mid c on b.id=c.tid
 	where a.id= #{tid}
   </select>
+  
     <update id="updateCostAmount">
-     update t_order_task a ,t_order_mid b
-    set b.cost_amount= #{count}
-    where  a.order_no=b.order_no and a.id= #{tid}
+      update t_order_task a ,t_task_mid c
+    set c.cost_amount=#{count}
+    where  a.id=c.tid and a.id= #{tid}
   </update>
 </mapper>

+ 375 - 352
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -1,353 +1,376 @@
-package com.goafanti.common.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class TOrderMid {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_no
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String orderNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String salesmanId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String financeId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String salesmanName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String financeName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private BigDecimal finalReceivables;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private Date finalReceivablesTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private BigDecimal invoiceAmount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.create_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.buyer_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String buyerName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private BigDecimal orderReceivables;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_arrears
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private BigDecimal orderArrears;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.cost_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private BigDecimal costAmount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.dep_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	private String depName;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.id
-	 * @return  the value of t_order_mid.id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.id
-	 * @param id  the value for t_order_mid.id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_no
-	 * @return  the value of t_order_mid.order_no
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_no
-	 * @param orderNo  the value for t_order_mid.order_no
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_id
-	 * @return  the value of t_order_mid.salesman_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getSalesmanId() {
-		return salesmanId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_id
-	 * @param salesmanId  the value for t_order_mid.salesman_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setSalesmanId(String salesmanId) {
-		this.salesmanId = salesmanId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_id
-	 * @return  the value of t_order_mid.finance_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getFinanceId() {
-		return financeId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_id
-	 * @param financeId  the value for t_order_mid.finance_id
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setFinanceId(String financeId) {
-		this.financeId = financeId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_name
-	 * @return  the value of t_order_mid.salesman_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getSalesmanName() {
-		return salesmanName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_name
-	 * @param salesmanName  the value for t_order_mid.salesman_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setSalesmanName(String salesmanName) {
-		this.salesmanName = salesmanName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_name
-	 * @return  the value of t_order_mid.finance_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getFinanceName() {
-		return financeName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_name
-	 * @param financeName  the value for t_order_mid.finance_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setFinanceName(String financeName) {
-		this.financeName = financeName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_receivables
-	 * @return  the value of t_order_mid.final_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public BigDecimal getFinalReceivables() {
-		return finalReceivables;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_receivables
-	 * @param finalReceivables  the value for t_order_mid.final_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setFinalReceivables(BigDecimal finalReceivables) {
-		this.finalReceivables = finalReceivables;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_Receivables_time
-	 * @return  the value of t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public Date getFinalReceivablesTime() {
-		return finalReceivablesTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_Receivables_time
-	 * @param finalReceivablesTime  the value for t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setFinalReceivablesTime(Date finalReceivablesTime) {
-		this.finalReceivablesTime = finalReceivablesTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.invoice_amount
-	 * @return  the value of t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public BigDecimal getInvoiceAmount() {
-		return invoiceAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.invoice_amount
-	 * @param invoiceAmount  the value for t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setInvoiceAmount(BigDecimal invoiceAmount) {
-		this.invoiceAmount = invoiceAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.create_time
-	 * @return  the value of t_order_mid.create_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.create_time
-	 * @param createTime  the value for t_order_mid.create_time
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.buyer_name
-	 * @return  the value of t_order_mid.buyer_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getBuyerName() {
-		return buyerName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.buyer_name
-	 * @param buyerName  the value for t_order_mid.buyer_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setBuyerName(String buyerName) {
-		this.buyerName = buyerName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_receivables
-	 * @return  the value of t_order_mid.order_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public BigDecimal getOrderReceivables() {
-		return orderReceivables;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_receivables
-	 * @param orderReceivables  the value for t_order_mid.order_receivables
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setOrderReceivables(BigDecimal orderReceivables) {
-		this.orderReceivables = orderReceivables;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_arrears
-	 * @return  the value of t_order_mid.order_arrears
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public BigDecimal getOrderArrears() {
-		return orderArrears;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_arrears
-	 * @param orderArrears  the value for t_order_mid.order_arrears
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setOrderArrears(BigDecimal orderArrears) {
-		this.orderArrears = orderArrears;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.cost_amount
-	 * @return  the value of t_order_mid.cost_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public BigDecimal getCostAmount() {
-		return costAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.cost_amount
-	 * @param costAmount  the value for t_order_mid.cost_amount
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setCostAmount(BigDecimal costAmount) {
-		this.costAmount = costAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.dep_name
-	 * @return  the value of t_order_mid.dep_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public String getDepName() {
-		return depName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.dep_name
-	 * @param depName  the value for t_order_mid.dep_name
-	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
-	 */
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TOrderMid {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_no
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String salesmanId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String financeId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String salesmanName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String financeName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal finalReceivables;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_Receivables_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private Date finalReceivablesTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.invoice_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal invoiceAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.create_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.buyer_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String buyerName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal orderReceivables;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_arrears
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal orderArrears;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.cost_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal costAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.dep_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private String depName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.payment_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	private BigDecimal paymentAmount;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.id
+	 * @return  the value of t_order_mid.id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.id
+	 * @param id  the value for t_order_mid.id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_no
+	 * @return  the value of t_order_mid.order_no
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_no
+	 * @param orderNo  the value for t_order_mid.order_no
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_id
+	 * @return  the value of t_order_mid.salesman_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getSalesmanId() {
+		return salesmanId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_id
+	 * @param salesmanId  the value for t_order_mid.salesman_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setSalesmanId(String salesmanId) {
+		this.salesmanId = salesmanId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_id
+	 * @return  the value of t_order_mid.finance_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getFinanceId() {
+		return financeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_id
+	 * @param financeId  the value for t_order_mid.finance_id
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_name
+	 * @return  the value of t_order_mid.salesman_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_name
+	 * @param salesmanName  the value for t_order_mid.salesman_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_name
+	 * @return  the value of t_order_mid.finance_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getFinanceName() {
+		return financeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_name
+	 * @param financeName  the value for t_order_mid.finance_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_receivables
+	 * @return  the value of t_order_mid.final_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getFinalReceivables() {
+		return finalReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_receivables
+	 * @param finalReceivables  the value for t_order_mid.final_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setFinalReceivables(BigDecimal finalReceivables) {
+		this.finalReceivables = finalReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_Receivables_time
+	 * @return  the value of t_order_mid.final_Receivables_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public Date getFinalReceivablesTime() {
+		return finalReceivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_Receivables_time
+	 * @param finalReceivablesTime  the value for t_order_mid.final_Receivables_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setFinalReceivablesTime(Date finalReceivablesTime) {
+		this.finalReceivablesTime = finalReceivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.invoice_amount
+	 * @return  the value of t_order_mid.invoice_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.invoice_amount
+	 * @param invoiceAmount  the value for t_order_mid.invoice_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.create_time
+	 * @return  the value of t_order_mid.create_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.create_time
+	 * @param createTime  the value for t_order_mid.create_time
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.buyer_name
+	 * @return  the value of t_order_mid.buyer_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getBuyerName() {
+		return buyerName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.buyer_name
+	 * @param buyerName  the value for t_order_mid.buyer_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setBuyerName(String buyerName) {
+		this.buyerName = buyerName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_receivables
+	 * @return  the value of t_order_mid.order_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getOrderReceivables() {
+		return orderReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_receivables
+	 * @param orderReceivables  the value for t_order_mid.order_receivables
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setOrderReceivables(BigDecimal orderReceivables) {
+		this.orderReceivables = orderReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_arrears
+	 * @return  the value of t_order_mid.order_arrears
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getOrderArrears() {
+		return orderArrears;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_arrears
+	 * @param orderArrears  the value for t_order_mid.order_arrears
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setOrderArrears(BigDecimal orderArrears) {
+		this.orderArrears = orderArrears;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.cost_amount
+	 * @return  the value of t_order_mid.cost_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getCostAmount() {
+		return costAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.cost_amount
+	 * @param costAmount  the value for t_order_mid.cost_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setCostAmount(BigDecimal costAmount) {
+		this.costAmount = costAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.dep_name
+	 * @return  the value of t_order_mid.dep_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public String getDepName() {
+		return depName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.dep_name
+	 * @param depName  the value for t_order_mid.dep_name
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.payment_amount
+	 * @return  the value of t_order_mid.payment_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.payment_amount
+	 * @param paymentAmount  the value for t_order_mid.payment_amount
+	 * @mbg.generated  Wed Sep 23 11:31:19 CST 2020
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1292 - 1232
src/main/java/com/goafanti/common/model/TOrderMidExample.java


+ 9 - 1
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -96,8 +96,10 @@ public class OrderListBo {
 	private String orderReceivables;
 	/**欠款 */
 	private String  orderArrears;
-	/**已付成本*/
+	/**成本*/
 	private String  costAmount;
+	/**已付成本*/
+	private String paymentAmount;
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -378,4 +380,10 @@ public class OrderListBo {
 	public void setCostAmount(String costAmount) {
 		this.costAmount = costAmount;
 	}
+	public String getPaymentAmount() {
+		return paymentAmount;
+	}
+	public void setPaymentAmount(String paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
 }

+ 21 - 0
src/main/java/com/goafanti/order/bo/OrderOutsourceBo.java

@@ -18,6 +18,9 @@ public class OrderOutsourceBo  {
 	private String cname;
 	private String pname;
 	private String bname;
+	private Integer splitId;
+	private Integer splitSuper;
+	private Integer splitStatus;
 	
 	
 	public String getOrderNo() {
@@ -118,5 +121,23 @@ public class OrderOutsourceBo  {
 	public void setBname(String bname) {
 		this.bname = bname;
 	}
+	public Integer getSplitId() {
+		return splitId;
+	}
+	public void setSplitId(Integer splitId) {
+		this.splitId = splitId;
+	}
+	public Integer getSplitSuper() {
+		return splitSuper;
+	}
+	public void setSplitSuper(Integer splitSuper) {
+		this.splitSuper = splitSuper;
+	}
+	public Integer getSplitStatus() {
+		return splitStatus;
+	}
+	public void setSplitStatus(Integer splitStatus) {
+		this.splitStatus = splitStatus;
+	}
 	
 }

+ 3 - 2
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -145,9 +145,10 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	 * 外包审核列表
 	 */
 	@RequestMapping(value="/orderOutsourceList", method = RequestMethod.GET)
-	public Result orderOutsourceList(String name,String contractNo,String starTime,String endTime,Integer refundStatus,Integer type,Integer pageNo,Integer pageSize){
+	public Result orderOutsourceList(String name,String contractNo,String starTime,String endTime,Integer tid,
+			Integer refundStatus,Integer type,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(outsourceOrgService.orderOutsourceList(name, contractNo, starTime, endTime,refundStatus,type, pageNo, pageSize));
+		res.data(outsourceOrgService.orderOutsourceList(name, contractNo, starTime, endTime,tid,refundStatus,type, pageNo, pageSize));
 		return res;
 	}
 	

+ 2 - 2
src/main/java/com/goafanti/order/service/OutsourceOrgService.java

@@ -21,8 +21,8 @@ public interface OutsourceOrgService {
 
 	List<OutsourceOrganizationBo> selectOrderOutsourceOrg(String orderNo);
 	
-	Pagination<OrderOutsourceBo> orderOutsourceList(String name, String contractNo, String starTime, String endTime,Integer refundStatus,Integer type, Integer pageNo,
-			Integer pageSize);
+	Pagination<OrderOutsourceBo> orderOutsourceList(String name, String contractNo, String starTime, String endTime, Integer tid,
+			Integer refundStatus,Integer type, Integer pageNo,Integer pageSize);
 	
 	OrderOutsourceDtails orderOutsourceDtails(String orderNo, String tid);
 	

+ 7 - 10
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1306,13 +1306,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			outsourceLogMapper.insertSelective(ol);
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.PROJECT_OUTSOURCE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		}
-		List<OutThirdPartyCompany>tpcs= thirdPartyCompanyMapper.selectByTid(o.getTid());
-		BigDecimal costAmount=new BigDecimal(0);
-		for (OutThirdPartyCompany tpc : tpcs) {
-			costAmount.add(new BigDecimal(tpc.getTotalAmount()));
-		}
-		TTaskMid ttm=new TTaskMid(o.getTid(),costAmount);
-		tTaskMidMapper.updateByPrimaryKeySelective(ttm);
 		List<OutPaymentNode> list=paymentNodeMapper.selectByStatus(0);
 		for (OutPaymentNode outPaymentNode : list) {
 			if (outPaymentNode.getDunType()==1) {
@@ -1334,6 +1327,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 1;
 	}
 
+	/**
+	 * 发起外包时,通过计算获取项目的成本,订单的成本
+	 * @param tid
+	 */
 	private void updateOrderCostAmount(Integer tid) {
 		//计算项目成本
 		List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(tid);
@@ -1351,14 +1348,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}
 		}
-		tOrderMidMapper.updateCostAmount(tid,tCount);
+		tTaskMidMapper.updateCostAmount(tid,tCount);
 		//计算订单成本
 		BigDecimal oCount=new BigDecimal(0);
 		List <TTaskMid> tlist=tTaskMidMapper.selectByTid(tid);
 		for (TTaskMid tm : tlist) {
-			oCount=oCount.add(tm.getCostAmount());
+			oCount=oCount.add(tm.getCostAmount()==null?new BigDecimal(0):tm.getCostAmount());
 		}
-		tTaskMidMapper.updateCostAmount(tid,oCount);
+		tOrderMidMapper.updateCostAmount(tid,oCount);
 	}
 
 	@SuppressWarnings("unchecked")

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

@@ -48,6 +48,7 @@ import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskHoursMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
+import com.goafanti.common.dao.TTaskMidMapper;
 import com.goafanti.common.dao.TaskHoursCountMapper;
 import com.goafanti.common.dao.TaskLogMapper;
 import com.goafanti.common.dao.TaskProgressMapper;
@@ -67,6 +68,7 @@ import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskLog;
+import com.goafanti.common.model.TTaskMid;
 import com.goafanti.common.model.TaskHoursCount;
 import com.goafanti.common.model.TaskLog;
 import com.goafanti.common.model.TaskProgress;
@@ -135,6 +137,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
 	private NoticeMapper	noticeMapper;
+	@Autowired
+	private TTaskMidMapper	tTaskMidMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
 	
@@ -817,7 +821,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				newTask.setCommodityQuantity(Integer.parseInt(string));
 				newTask.setSplitId(i);
 				i++;
-				tOrderTaskMapper.insertSelective(newTask);
+				tOrderTaskMapper.insertSelectiveGetId(newTask);
+				TTaskMid tm=new TTaskMid(newTask.getId(),null);
+				tTaskMidMapper.insertSelective(tm);
 			}
 		return 1;
 	}

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -85,14 +85,15 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	
 	@Override
 	@SuppressWarnings("unchecked")
-	public Pagination<OrderOutsourceBo> orderOutsourceList(String name, String contractNo, String starTime,
-			String endTime,Integer refundStatus,Integer type, Integer pageNo, Integer pageSize) {
+	public Pagination<OrderOutsourceBo> orderOutsourceList(String name, String contractNo, String starTime,String endTime,Integer tid,
+			Integer refundStatus,Integer type, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if(refundStatus != null) params.put("refundStatus", refundStatus);
 		if(type != null)  params.put("type", type);
+		if(type != null)  params.put("tid", tid);
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");

+ 0 - 4
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -423,10 +423,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public int addfinancialPayment(InuptFinancialPayment f) {
 		f.setPaymentTime(DateUtils.StringToDate(f.getPaymentTimes(), AFTConstants.YYYYMMDD));
-//		financialPaymentMapper.updateOrderCost(f.getPid(),f.getPartyAmount());
-//		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(f.getPid());
-//		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-//		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_COMPLETE.getCode());
 		financialPaymentMapper.insertSelectiveGetId(f);
 		return f.getId(); 
 	}