Przeglądaj źródła

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 lat temu
rodzic
commit
6e1d42af6c
24 zmienionych plików z 1700 dodań i 286 usunięć
  1. 1 1
      GeneratorConfig.xml
  2. 11 11
      src/main/java/com/goafanti/common/dao/PaymentNodeMapper.java
  3. 13 11
      src/main/java/com/goafanti/common/dao/TOrderMidMapper.java
  4. 11 11
      src/main/java/com/goafanti/common/dao/TOrderPaymentMapper.java
  5. 1 1
      src/main/java/com/goafanti/common/mapper/BusinessCategoryMapper.xml
  6. 37 22
      src/main/java/com/goafanti/common/mapper/PaymentNodeMapper.xml
  7. 55 20
      src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml
  8. 84 22
      src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml
  9. 171 0
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  10. 68 45
      src/main/java/com/goafanti/common/model/PaymentNode.java
  11. 76 16
      src/main/java/com/goafanti/common/model/PaymentNodeExample.java
  12. 85 39
      src/main/java/com/goafanti/common/model/TOrderMid.java
  13. 146 16
      src/main/java/com/goafanti/common/model/TOrderMidExample.java
  14. 128 36
      src/main/java/com/goafanti/common/model/TOrderPayment.java
  15. 276 16
      src/main/java/com/goafanti/common/model/TOrderPaymentExample.java
  16. 2 5
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  17. 84 0
      src/main/java/com/goafanti/organization/bo/InputNodeList.java
  18. 92 0
      src/main/java/com/goafanti/organization/bo/InputPaymentList.java
  19. 117 0
      src/main/java/com/goafanti/organization/bo/outNodeList.java
  20. 110 0
      src/main/java/com/goafanti/organization/bo/outPaymentList.java
  21. 27 0
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  22. 10 0
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  23. 89 8
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  24. 6 6
      src/main/resources/props/config_local.properties

+ 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="t_order_payment"/>
+    <table schema="aft" tableName="payment_node"/>
   </context>
 </generatorConfiguration>

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

@@ -11,67 +11,67 @@ import org.apache.ibatis.annotations.Param;
 public interface PaymentNodeMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	long countByExample(PaymentNodeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int deleteByExample(PaymentNodeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int insert(PaymentNode record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int insertSelective(PaymentNode record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	List<PaymentNode> selectByExample(PaymentNodeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	PaymentNode selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") PaymentNode record, @Param("example") PaymentNodeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int updateByExample(@Param("record") PaymentNode record, @Param("example") PaymentNodeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PaymentNode record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	int updateByPrimaryKey(PaymentNode record);
 

+ 13 - 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderMid record);
 
@@ -86,4 +86,6 @@ public interface TOrderMidMapper {
 	void updateInvoice(String orderNo);
 
 	void addOrderReceivables(@Param("orderNo")String orderNo, @Param("money")BigDecimal money);
+
+	String selectDepNameByDepid(String orderDep);
 }

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

@@ -11,67 +11,67 @@ public interface TOrderPaymentMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	long countByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int deleteByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int insert(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int insertSelective(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	List<TOrderPayment> selectByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	TOrderPayment selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderPayment record, @Param("example") TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderPayment record, @Param("example") TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderPayment record);
 

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

@@ -522,7 +522,7 @@
 	where b.delete_sign=0
 	and b.status=0
 	and b.layer=1
-	ORDER BY if(isnull(b.sort),1,0),b.sort
+	ORDER BY b.sort
   	</select>
   	
   	<select id="getCidMax" resultType="String">

+ 37 - 22
src/main/java/com/goafanti/common/mapper/PaymentNodeMapper.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 Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -22,12 +22,13 @@
     <result column="dun_status" jdbcType="INTEGER" property="dunStatus" />
     <result column="effective_count" jdbcType="INTEGER" property="effectiveCount" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
   </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 Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 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 Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,16 +96,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     id, tid, cid, company_name, project_type, dun_type, unit_price, quantity, total_amount, 
-    party_amount, party_time, create_time, dun_status, effective_count, start_time
+    party_amount, party_time, create_time, dun_status, effective_count, start_time, status
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PaymentNodeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     select
     <if test="distinct">
@@ -123,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -134,7 +135,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     delete from payment_node
     where id = #{id,jdbcType=INTEGER}
@@ -143,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     delete from payment_node
     <if test="_parameter != null">
@@ -154,26 +155,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     insert into payment_node (id, tid, cid, 
       company_name, project_type, dun_type, 
       unit_price, quantity, total_amount, 
       party_amount, party_time, create_time, 
-      dun_status, effective_count, start_time
-      )
+      dun_status, effective_count, start_time, 
+      status)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
       #{companyName,jdbcType=VARCHAR}, #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, 
       #{unitPrice,jdbcType=DECIMAL}, #{quantity,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL}, 
       #{partyAmount,jdbcType=DECIMAL}, #{partyTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{dunStatus,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}
-      )
+      #{dunStatus,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{status,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PaymentNode">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     insert into payment_node
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -222,6 +223,9 @@
       <if test="startTime != null">
         start_time,
       </if>
+      <if test="status != null">
+        status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -269,13 +273,16 @@
       <if test="startTime != null">
         #{startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.PaymentNodeExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     select count(*) from payment_node
     <if test="_parameter != null">
@@ -286,7 +293,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     update payment_node
     <set>
@@ -335,6 +342,9 @@
       <if test="record.startTime != null">
         start_time = #{record.startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -344,7 +354,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     update payment_node
     set id = #{record.id,jdbcType=INTEGER},
@@ -361,7 +371,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       dun_status = #{record.dunStatus,jdbcType=INTEGER},
       effective_count = #{record.effectiveCount,jdbcType=INTEGER},
-      start_time = #{record.startTime,jdbcType=TIMESTAMP}
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      status = #{record.status,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -370,7 +381,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     update payment_node
     <set>
@@ -416,6 +427,9 @@
       <if test="startTime != null">
         start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -423,7 +437,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 15 11:31:47 CST 2020.
+      This element was generated on Tue Jul 07 13:58:53 CST 2020.
     -->
     update payment_node
     set tid = #{tid,jdbcType=INTEGER},
@@ -439,7 +453,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       dun_status = #{dunStatus,jdbcType=INTEGER},
       effective_count = #{effectiveCount,jdbcType=INTEGER},
-      start_time = #{startTime,jdbcType=TIMESTAMP}
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

+ 55 - 20
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 Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -20,12 +20,14 @@
     <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
     <result column="order_receivables" jdbcType="DECIMAL" property="orderReceivables" />
     <result column="order_arrears" jdbcType="DECIMAL" property="orderArrears" />
+    <result column="cost_amount" jdbcType="DECIMAL" property="costAmount" />
+    <result column="dep_name" jdbcType="VARCHAR" property="depName" />
   </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 Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,17 +95,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 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
+    order_arrears, cost_amount, dep_name
   </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 Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     select
     <if test="distinct">
@@ -122,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -133,7 +135,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     delete from t_order_mid
     where id = #{id,jdbcType=INTEGER}
@@ -142,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     delete from t_order_mid
     <if test="_parameter != null">
@@ -153,24 +155,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 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)
+      order_receivables, order_arrears, cost_amount, 
+      dep_name)
     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})
+      #{orderReceivables,jdbcType=DECIMAL}, #{orderArrears,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL}, 
+      #{depName,jdbcType=VARCHAR})
   </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 Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     insert into t_order_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -213,6 +217,12 @@
       <if test="orderArrears != null">
         order_arrears,
       </if>
+      <if test="costAmount != null">
+        cost_amount,
+      </if>
+      <if test="depName != null">
+        dep_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -254,13 +264,19 @@
       <if test="orderArrears != null">
         #{orderArrears,jdbcType=DECIMAL},
       </if>
+      <if test="costAmount != null">
+        #{costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="depName != null">
+        #{depName,jdbcType=VARCHAR},
+      </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 Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     select count(*) from t_order_mid
     <if test="_parameter != null">
@@ -271,7 +287,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -314,6 +330,12 @@
       <if test="record.orderArrears != null">
         order_arrears = #{record.orderArrears,jdbcType=DECIMAL},
       </if>
+      <if test="record.costAmount != null">
+        cost_amount = #{record.costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.depName != null">
+        dep_name = #{record.depName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -323,7 +345,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     update t_order_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -338,7 +360,9 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       buyer_name = #{record.buyerName,jdbcType=VARCHAR},
       order_receivables = #{record.orderReceivables,jdbcType=DECIMAL},
-      order_arrears = #{record.orderArrears,jdbcType=DECIMAL}
+      order_arrears = #{record.orderArrears,jdbcType=DECIMAL},
+      cost_amount = #{record.costAmount,jdbcType=DECIMAL},
+      dep_name = #{record.depName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -347,7 +371,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -387,6 +411,12 @@
       <if test="orderArrears != null">
         order_arrears = #{orderArrears,jdbcType=DECIMAL},
       </if>
+      <if test="costAmount != null">
+        cost_amount = #{costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="depName != null">
+        dep_name = #{depName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -394,7 +424,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 10 15:06:35 CST 2020.
+      This element was generated on Mon Jul 06 11:48:54 CST 2020.
     -->
     update t_order_mid
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -408,7 +438,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       buyer_name = #{buyerName,jdbcType=VARCHAR},
       order_receivables = #{orderReceivables,jdbcType=DECIMAL},
-      order_arrears = #{orderArrears,jdbcType=DECIMAL}
+      order_arrears = #{orderArrears,jdbcType=DECIMAL},
+      cost_amount = #{costAmount,jdbcType=DECIMAL},
+      dep_name = #{depName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByOrderNo" resultMap="BaseResultMap">
@@ -439,4 +471,7 @@
   order_arrears=order_arrears+#{money}
 	where order_no=#{orderNo}
   </update>
+  <select id="selectDepNameByDepid" resultType="java.lang.String">
+  select name from department where id= #{orderDep}
+  </select>
 </mapper>

+ 84 - 22
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -19,12 +19,16 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="tpc_id" jdbcType="INTEGER" property="tpcId" />
+    <result column="application_amount" jdbcType="DECIMAL" property="applicationAmount" />
+    <result column="choose_type" jdbcType="INTEGER" property="chooseType" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="aname" jdbcType="VARCHAR" property="aname" />
   </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 Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +62,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +96,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     id, tid, node_id, payment_type, company_name, quantity, payment_status, status, payment_amount, 
-    remarks, create_time, tpc_id
+    remarks, create_time, tpc_id, application_amount, choose_type, aid, aname
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     select
     <if test="distinct">
@@ -120,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -131,7 +135,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     delete from t_order_payment
     where id = #{id,jdbcType=INTEGER}
@@ -140,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     delete from t_order_payment
     <if test="_parameter != null">
@@ -151,24 +155,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     insert into t_order_payment (id, tid, node_id, 
       payment_type, company_name, quantity, 
       payment_status, status, payment_amount, 
-      remarks, create_time, tpc_id
-      )
+      remarks, create_time, tpc_id, 
+      application_amount, choose_type, aid, 
+      aname)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, 
       #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, 
       #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{paymentAmount,jdbcType=DECIMAL}, 
-      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{tpcId,jdbcType=INTEGER}
-      )
+      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{tpcId,jdbcType=INTEGER}, 
+      #{applicationAmount,jdbcType=DECIMAL}, #{chooseType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
+      #{aname,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderPayment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     insert into t_order_payment
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -208,6 +214,18 @@
       <if test="tpcId != null">
         tpc_id,
       </if>
+      <if test="applicationAmount != null">
+        application_amount,
+      </if>
+      <if test="chooseType != null">
+        choose_type,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="aname != null">
+        aname,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -246,13 +264,25 @@
       <if test="tpcId != null">
         #{tpcId,jdbcType=INTEGER},
       </if>
+      <if test="applicationAmount != null">
+        #{applicationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="chooseType != null">
+        #{chooseType,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        #{aname,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     select count(*) from t_order_payment
     <if test="_parameter != null">
@@ -263,7 +293,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     update t_order_payment
     <set>
@@ -303,6 +333,18 @@
       <if test="record.tpcId != null">
         tpc_id = #{record.tpcId,jdbcType=INTEGER},
       </if>
+      <if test="record.applicationAmount != null">
+        application_amount = #{record.applicationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.chooseType != null">
+        choose_type = #{record.chooseType,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aname != null">
+        aname = #{record.aname,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -312,7 +354,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     update t_order_payment
     set id = #{record.id,jdbcType=INTEGER},
@@ -326,7 +368,11 @@
       payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      tpc_id = #{record.tpcId,jdbcType=INTEGER}
+      tpc_id = #{record.tpcId,jdbcType=INTEGER},
+      application_amount = #{record.applicationAmount,jdbcType=DECIMAL},
+      choose_type = #{record.chooseType,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      aname = #{record.aname,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -335,7 +381,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     update t_order_payment
     <set>
@@ -372,6 +418,18 @@
       <if test="tpcId != null">
         tpc_id = #{tpcId,jdbcType=INTEGER},
       </if>
+      <if test="applicationAmount != null">
+        application_amount = #{applicationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="chooseType != null">
+        choose_type = #{chooseType,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        aname = #{aname,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -379,7 +437,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 19 15:35:38 CST 2020.
+      This element was generated on Tue Jul 07 11:46:04 CST 2020.
     -->
     update t_order_payment
     set tid = #{tid,jdbcType=INTEGER},
@@ -392,7 +450,11 @@
       payment_amount = #{paymentAmount,jdbcType=DECIMAL},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      tpc_id = #{tpcId,jdbcType=INTEGER}
+      tpc_id = #{tpcId,jdbcType=INTEGER},
+      application_amount = #{applicationAmount,jdbcType=DECIMAL},
+      choose_type = #{chooseType,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      aname = #{aname,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

+ 171 - 0
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -430,4 +430,175 @@
    income,remarks,cid
    from third_party_company where tid= #{tid}
   </select>
+   <select id="selectPaymentList" resultType="com.goafanti.organization.bo.outPaymentList">
+		select c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.cost_amount costAmount,
+		a.payment_type paymentType,a.payment_amount paymentAmount,a.application_amount applicationAmount,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname,
+		b.commodity_name pname,b.project_status projectStatus,a.status
+		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
+		left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
+		where 1=1
+		<if test="lvl==0">
+		and c.finance_id= #{aid}
+		</if>
+		<if test="lvl==1">
+		and c.finance_id in (select id from admin where superior_id= #{aid} )
+		</if>
+		<if test="contractNo !=null">
+		and c.contract_no like concat('%', #{contractNo},'%')
+		</if>
+		<if test="orderNo !=null">
+		and c.order_no like concat('%', #{orderNo} ,'%')
+		</if>
+		<if test="userName !=null">
+		and d.buyer_name like concat('%', #{userName},'%')
+		</if>
+		<if test="depId !=null">
+		and c.order_dep= #{depId}
+		</if>
+		<if test="aname !=null">
+		and a.aname like concat('%',#{aname},'%')
+		</if>
+		<if test="financeName !=null">
+		and d.finance_name like concat('%',#{financeName},'%')
+		</if>
+		<if test="cname !=null">
+		and b.cname like concat('%',#{cname},'%')
+		</if>
+		<if test="pname !=null">
+		and b.commodity_name like concat('%',#{pname},'%')
+		</if>
+		<if test="status !=null">
+		and a.status= #{status}
+		</if>
+		order by a.status,a.create_time desc
+	  	<if test="page_sql!=null">
+				${page_sql}
+		</if>
+  </select>
+  
+   <select id="selectPaymentCount" resultType="java.lang.Integer">
+		select count(*)
+		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
+		left join t_order_mid d on b.order_no=d.order_no 
+		where 1=1
+		<if test="lvl==0">
+		and c.finance_id= #{aid}
+		</if>
+		<if test="lvl==1">
+		and c.finance_id in (select id from admin where superior_id= #{aid} )
+		</if>
+		<if test="contractNo !=null">
+		and c.contract_no like concat('%', #{contractNo},'%')
+		</if>
+		<if test="orderNo !=null">
+		and c.order_no like concat('%', #{orderNo} ,'%')
+		</if>
+		<if test="userName !=null">
+		and d.buyer_name like concat('%', #{userName},'%')
+		</if>
+		<if test="depId !=null">
+		and c.order_dep= #{depId}
+		</if>
+		<if test="aname !=null">
+		and a.aname like concat('%',#{aname},'%')
+		</if>
+		<if test="financeName !=null">
+		and d.finance_name like concat('%',#{financeName},'%')
+		</if>
+		<if test="cname !=null">
+		and b.cname like concat('%',#{cname},'%')
+		</if>
+		<if test="pname !=null">
+		and b.commodity_name like concat('%',#{pname},'%')
+		</if>
+		<if test="status !=null">
+		and a.status= #{status}
+		</if>
+  </select>
+ <select id="selectNodeList" resultType="com.goafanti.organization.bo.outNodeList">
+	  select c.contract_no contractNo,c.order_no orderNo,d.buyer_name userName,
+	b.cname,b.commodity_name pname,c.order_status orderStatus,b.project_status projectStatus,
+	b.set_up_amount projectAmount,e.cost_amount costAmount,e.party_amount partyAmount,b.task_receiver,
+	c.liquidation_status liquidationStatus,a.dun_type dunType,a.project_type projectType,
+	a.total_amount NodeAmount,date_format(a.start_time,'%Y-%m-%d %H:%i:%S')startTime,a.status
+	from payment_node a 
+	left join t_order_task b on a.tid=b.id 
+	left join t_order_new c on b.order_no=c.order_no
+	left join t_order_mid d on b.order_no=d.order_no
+	left join t_task_mid e on b.id=e.tid
+	where 1=1
+	<if test="lvl==0">
+	 and b.task_receiver= #{aid}
+	</if>
+	 <if test="lvl==1">
+	 and c.finance_id= #{aid}
+	</if>
+	 <if test="lvl==2">
+	  and c.finance_id in (select id from admin where superior_id= #{aid})
+	</if>
+	 <if test="userName != null">
+	 and d.buyer_name like concat('%',#{userName},'%')
+	</if>
+	 <if test="contractNo != null">
+	 and c.contract_no like concat('%',#{contractNo},'%')
+	</if>
+	 <if test="orderNo != null">
+	 and c.order_no like concat('%',#{orderNo},'%')
+	</if>
+	 <if test="cname !=null">
+	 and b.cname like concat('%',#{cname},'%')
+	</if>
+	 <if test="pname !=null">
+	 and b.commodity_name like concat('%',#{pname},'%')
+	</if>
+	 <if test="status !=null">
+	 and a.status= #{status}
+	</if>
+	 <if test="startTime !=null and endTime != null">
+	and a.start_time  between #{startTime} and #{endTime}
+	</if>
+	order by a.status ,a.create_time desc
+	<if test="page_sql!=null">
+				${page_sql}
+		</if>
+</select>
+  <select id="selectNodeCount" resultType="java.lang.Integer"> 
+	  select count(*)
+	from payment_node a 
+	left join t_order_task b on a.tid=b.id 
+	left join t_order_new c on b.order_no=c.order_no
+	left join t_order_mid d on b.order_no=d.order_no
+	where 1=1
+	<if test="lvl==0">
+	 and b.task_receiver= #{aid}
+	</if>
+	 <if test="lvl==1">
+	 and c.finance_id= #{aid}
+	</if>
+	 <if test="lvl==2">
+	  and c.finance_id in (select id from admin where superior_id= #{aid})
+	</if>
+	 <if test="userName != null">
+	 and d.buyer_name like concat('%',#{userName},'%')
+	</if>
+	 <if test="contractNo != null">
+	 and c.contract_no like concat('%',#{contractNo},'%')
+	</if>
+	 <if test="orderNo != null">
+	 and c.order_no like concat('%',#{orderNo},'%')
+	</if>
+	 <if test="cname !=null">
+	 and b.cname like concat('%',#{cname},'%')
+	</if>
+	 <if test="pname !=null">
+	 and b.commodity_name like concat('%',#{pname},'%')
+	</if>
+	 <if test="status !=null">
+	 and a.status= #{status}
+	</if>
+	 <if test="startTime !=null and endTime != null">
+	and a.start_time  between #{startTime} and #{endTime}
+	</if>
+</select>
 </mapper>

+ 68 - 45
src/main/java/com/goafanti/common/model/PaymentNode.java

@@ -7,84 +7,89 @@ public class PaymentNode {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.id
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.tid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.cid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.company_name
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.project_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.dun_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.unit_price
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private BigDecimal unitPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.quantity
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer quantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.total_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.party_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private BigDecimal partyAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.party_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Date partyTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.create_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.dun_status
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer dunStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.effective_count
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.start_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	private Date startTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.status
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
+	 */
+	private Integer status;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.id
 	 * @return  the value of payment_node.id
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -93,7 +98,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.id
 	 * @param id  the value for payment_node.id
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -102,7 +107,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.tid
 	 * @return  the value of payment_node.tid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -111,7 +116,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.tid
 	 * @param tid  the value for payment_node.tid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -120,7 +125,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.cid
 	 * @return  the value of payment_node.cid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -129,7 +134,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.cid
 	 * @param cid  the value for payment_node.cid
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -138,7 +143,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.company_name
 	 * @return  the value of payment_node.company_name
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -147,7 +152,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.company_name
 	 * @param companyName  the value for payment_node.company_name
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -156,7 +161,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.project_type
 	 * @return  the value of payment_node.project_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -165,7 +170,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.project_type
 	 * @param projectType  the value for payment_node.project_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -174,7 +179,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.dun_type
 	 * @return  the value of payment_node.dun_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -183,7 +188,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.dun_type
 	 * @param dunType  the value for payment_node.dun_type
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -192,7 +197,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.unit_price
 	 * @return  the value of payment_node.unit_price
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -201,7 +206,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.unit_price
 	 * @param unitPrice  the value for payment_node.unit_price
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -210,7 +215,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.quantity
 	 * @return  the value of payment_node.quantity
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -219,7 +224,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.quantity
 	 * @param quantity  the value for payment_node.quantity
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -228,7 +233,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.total_amount
 	 * @return  the value of payment_node.total_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -237,7 +242,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.total_amount
 	 * @param totalAmount  the value for payment_node.total_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -246,7 +251,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.party_amount
 	 * @return  the value of payment_node.party_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public BigDecimal getPartyAmount() {
 		return partyAmount;
@@ -255,7 +260,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.party_amount
 	 * @param partyAmount  the value for payment_node.party_amount
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setPartyAmount(BigDecimal partyAmount) {
 		this.partyAmount = partyAmount;
@@ -264,7 +269,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.party_time
 	 * @return  the value of payment_node.party_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Date getPartyTime() {
 		return partyTime;
@@ -273,7 +278,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.party_time
 	 * @param partyTime  the value for payment_node.party_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setPartyTime(Date partyTime) {
 		this.partyTime = partyTime;
@@ -282,7 +287,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.create_time
 	 * @return  the value of payment_node.create_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -291,7 +296,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.create_time
 	 * @param createTime  the value for payment_node.create_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -300,7 +305,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.dun_status
 	 * @return  the value of payment_node.dun_status
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getDunStatus() {
 		return dunStatus;
@@ -309,7 +314,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.dun_status
 	 * @param dunStatus  the value for payment_node.dun_status
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setDunStatus(Integer dunStatus) {
 		this.dunStatus = dunStatus;
@@ -318,7 +323,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.effective_count
 	 * @return  the value of payment_node.effective_count
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -327,7 +332,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.effective_count
 	 * @param effectiveCount  the value for payment_node.effective_count
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -336,7 +341,7 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.start_time
 	 * @return  the value of payment_node.start_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -345,9 +350,27 @@ public class PaymentNode {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.start_time
 	 * @param startTime  the value for payment_node.start_time
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.status
+	 * @return  the value of payment_node.status
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_node.status
+	 * @param status  the value for payment_node.status
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class PaymentNodeExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public PaymentNodeExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class PaymentNodeExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1073,11 +1073,71 @@ public class PaymentNodeExample {
 			addCriterion("start_time not between", value1, value2, "startTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andStatusIsNull() {
+			addCriterion("status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIsNotNull() {
+			addCriterion("status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusEqualTo(Integer value) {
+			addCriterion("status =", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotEqualTo(Integer value) {
+			addCriterion("status <>", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThan(Integer value) {
+			addCriterion("status >", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("status >=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThan(Integer value) {
+			addCriterion("status <", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("status <=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIn(List<Integer> values) {
+			addCriterion("status in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotIn(List<Integer> values) {
+			addCriterion("status not in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusBetween(Integer value1, Integer value2) {
+			addCriterion("status between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("status not between", value1, value2, "status");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table payment_node
-	 * @mbg.generated  Mon Jun 15 11:31:47 CST 2020
+	 * @mbg.generated  Tue Jul 07 13:58:53 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 85 - 39
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -7,74 +7,84 @@ public class TOrderMid {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +93,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +102,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -101,7 +111,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -110,7 +120,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -119,7 +129,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -128,7 +138,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -137,7 +147,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -146,7 +156,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getSalesmanName() {
 		return salesmanName;
@@ -155,7 +165,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setSalesmanName(String salesmanName) {
 		this.salesmanName = salesmanName;
@@ -164,7 +174,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getFinanceName() {
 		return financeName;
@@ -173,7 +183,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setFinanceName(String financeName) {
 		this.financeName = financeName;
@@ -182,7 +192,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
@@ -191,7 +201,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setFinalReceivables(BigDecimal finalReceivables) {
 		this.finalReceivables = finalReceivables;
@@ -200,7 +210,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public Date getFinalReceivablesTime() {
 		return finalReceivablesTime;
@@ -209,7 +219,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setFinalReceivablesTime(Date finalReceivablesTime) {
 		this.finalReceivablesTime = finalReceivablesTime;
@@ -218,7 +228,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -227,7 +237,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -236,7 +246,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -245,7 +255,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -254,7 +264,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getBuyerName() {
 		return buyerName;
@@ -263,7 +273,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setBuyerName(String buyerName) {
 		this.buyerName = buyerName;
@@ -272,7 +282,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public BigDecimal getOrderReceivables() {
 		return orderReceivables;
@@ -281,7 +291,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setOrderReceivables(BigDecimal orderReceivables) {
 		this.orderReceivables = orderReceivables;
@@ -290,7 +300,7 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public BigDecimal getOrderArrears() {
 		return orderArrears;
@@ -299,9 +309,45 @@ public class TOrderMid {
 	/**
 	 * 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  Fri Apr 10 15:06:35 CST 2020
+	 * @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;
+	}
 }

+ 146 - 16
src/main/java/com/goafanti/common/model/TOrderMidExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderMidExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public TOrderMidExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1003,11 +1003,141 @@ public class TOrderMidExample {
 			addCriterion("order_arrears not between", value1, value2, "orderArrears");
 			return (Criteria) this;
 		}
+
+		public Criteria andCostAmountIsNull() {
+			addCriterion("cost_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountIsNotNull() {
+			addCriterion("cost_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountEqualTo(BigDecimal value) {
+			addCriterion("cost_amount =", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountNotEqualTo(BigDecimal value) {
+			addCriterion("cost_amount <>", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountGreaterThan(BigDecimal value) {
+			addCriterion("cost_amount >", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("cost_amount >=", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountLessThan(BigDecimal value) {
+			addCriterion("cost_amount <", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("cost_amount <=", value, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountIn(List<BigDecimal> values) {
+			addCriterion("cost_amount in", values, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountNotIn(List<BigDecimal> values) {
+			addCriterion("cost_amount not in", values, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("cost_amount between", value1, value2, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCostAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("cost_amount not between", value1, value2, "costAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameIsNull() {
+			addCriterion("dep_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameIsNotNull() {
+			addCriterion("dep_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameEqualTo(String value) {
+			addCriterion("dep_name =", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameNotEqualTo(String value) {
+			addCriterion("dep_name <>", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameGreaterThan(String value) {
+			addCriterion("dep_name >", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameGreaterThanOrEqualTo(String value) {
+			addCriterion("dep_name >=", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameLessThan(String value) {
+			addCriterion("dep_name <", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameLessThanOrEqualTo(String value) {
+			addCriterion("dep_name <=", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameLike(String value) {
+			addCriterion("dep_name like", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameNotLike(String value) {
+			addCriterion("dep_name not like", value, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameIn(List<String> values) {
+			addCriterion("dep_name in", values, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameNotIn(List<String> values) {
+			addCriterion("dep_name not in", values, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameBetween(String value1, String value2) {
+			addCriterion("dep_name between", value1, value2, "depName");
+			return (Criteria) this;
+		}
+
+		public Criteria andDepNameNotBetween(String value1, String value2) {
+			addCriterion("dep_name not between", value1, value2, "depName");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 * @mbg.generated  Mon Jul 06 11:48:54 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 128 - 36
src/main/java/com/goafanti/common/model/TOrderPayment.java

@@ -7,69 +7,89 @@ public class TOrderPayment {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tid
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.node_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer nodeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_type
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer paymentType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.company_name
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.quantity
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer quantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer paymentStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_amount
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.remarks
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.create_time
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tpc_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private Integer tpcId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private BigDecimal applicationAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer chooseType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aname;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
 	 * @return  the value of t_order_payment.id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -78,7 +98,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
 	 * @param id  the value for t_order_payment.id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -87,7 +107,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
 	 * @return  the value of t_order_payment.tid
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -96,7 +116,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tid
 	 * @param tid  the value for t_order_payment.tid
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -105,7 +125,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.node_id
 	 * @return  the value of t_order_payment.node_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getNodeId() {
 		return nodeId;
@@ -114,7 +134,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.node_id
 	 * @param nodeId  the value for t_order_payment.node_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setNodeId(Integer nodeId) {
 		this.nodeId = nodeId;
@@ -123,7 +143,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_type
 	 * @return  the value of t_order_payment.payment_type
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getPaymentType() {
 		return paymentType;
@@ -132,7 +152,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_type
 	 * @param paymentType  the value for t_order_payment.payment_type
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setPaymentType(Integer paymentType) {
 		this.paymentType = paymentType;
@@ -141,7 +161,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.company_name
 	 * @return  the value of t_order_payment.company_name
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -150,7 +170,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.company_name
 	 * @param companyName  the value for t_order_payment.company_name
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -159,7 +179,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.quantity
 	 * @return  the value of t_order_payment.quantity
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -168,7 +188,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.quantity
 	 * @param quantity  the value for t_order_payment.quantity
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -177,7 +197,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_status
 	 * @return  the value of t_order_payment.payment_status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getPaymentStatus() {
 		return paymentStatus;
@@ -186,7 +206,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_status
 	 * @param paymentStatus  the value for t_order_payment.payment_status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setPaymentStatus(Integer paymentStatus) {
 		this.paymentStatus = paymentStatus;
@@ -195,7 +215,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.status
 	 * @return  the value of t_order_payment.status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -204,7 +224,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.status
 	 * @param status  the value for t_order_payment.status
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -213,7 +233,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_amount
 	 * @return  the value of t_order_payment.payment_amount
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -222,7 +242,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
 	 * @param paymentAmount  the value for t_order_payment.payment_amount
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -231,7 +251,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.remarks
 	 * @return  the value of t_order_payment.remarks
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -240,7 +260,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.remarks
 	 * @param remarks  the value for t_order_payment.remarks
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -249,7 +269,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.create_time
 	 * @return  the value of t_order_payment.create_time
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -258,7 +278,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.create_time
 	 * @param createTime  the value for t_order_payment.create_time
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -267,7 +287,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tpc_id
 	 * @return  the value of t_order_payment.tpc_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Integer getTpcId() {
 		return tpcId;
@@ -276,9 +296,81 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tpc_id
 	 * @param tpcId  the value for t_order_payment.tpc_id
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setTpcId(Integer tpcId) {
 		this.tpcId = tpcId;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
+	 * @return  the value of t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public BigDecimal getApplicationAmount() {
+		return applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
+	 * @param applicationAmount  the value for t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setApplicationAmount(BigDecimal applicationAmount) {
+		this.applicationAmount = applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
+	 * @return  the value of t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getChooseType() {
+		return chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
+	 * @param chooseType  the value for t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setChooseType(Integer chooseType) {
+		this.chooseType = chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
+	 * @return  the value of t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
+	 * @param aid  the value for t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
+	 * @return  the value of t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAname() {
+		return aname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
+	 * @param aname  the value for t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
 }

+ 276 - 16
src/main/java/com/goafanti/common/model/TOrderPaymentExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderPaymentExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public TOrderPaymentExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -903,11 +903,271 @@ public class TOrderPaymentExample {
 			addCriterion("tpc_id not between", value1, value2, "tpcId");
 			return (Criteria) this;
 		}
+
+		public Criteria andApplicationAmountIsNull() {
+			addCriterion("application_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountIsNotNull() {
+			addCriterion("application_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountEqualTo(BigDecimal value) {
+			addCriterion("application_amount =", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountNotEqualTo(BigDecimal value) {
+			addCriterion("application_amount <>", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountGreaterThan(BigDecimal value) {
+			addCriterion("application_amount >", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("application_amount >=", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountLessThan(BigDecimal value) {
+			addCriterion("application_amount <", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("application_amount <=", value, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountIn(List<BigDecimal> values) {
+			addCriterion("application_amount in", values, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountNotIn(List<BigDecimal> values) {
+			addCriterion("application_amount not in", values, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("application_amount between", value1, value2, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andApplicationAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("application_amount not between", value1, value2, "applicationAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeIsNull() {
+			addCriterion("choose_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeIsNotNull() {
+			addCriterion("choose_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeEqualTo(Integer value) {
+			addCriterion("choose_type =", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeNotEqualTo(Integer value) {
+			addCriterion("choose_type <>", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeGreaterThan(Integer value) {
+			addCriterion("choose_type >", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("choose_type >=", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeLessThan(Integer value) {
+			addCriterion("choose_type <", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("choose_type <=", value, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeIn(List<Integer> values) {
+			addCriterion("choose_type in", values, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeNotIn(List<Integer> values) {
+			addCriterion("choose_type not in", values, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeBetween(Integer value1, Integer value2) {
+			addCriterion("choose_type between", value1, value2, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andChooseTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("choose_type not between", value1, value2, "chooseType");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIsNull() {
+			addCriterion("aid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIsNotNull() {
+			addCriterion("aid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidEqualTo(String value) {
+			addCriterion("aid =", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotEqualTo(String value) {
+			addCriterion("aid <>", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidGreaterThan(String value) {
+			addCriterion("aid >", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidGreaterThanOrEqualTo(String value) {
+			addCriterion("aid >=", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLessThan(String value) {
+			addCriterion("aid <", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLessThanOrEqualTo(String value) {
+			addCriterion("aid <=", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLike(String value) {
+			addCriterion("aid like", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotLike(String value) {
+			addCriterion("aid not like", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIn(List<String> values) {
+			addCriterion("aid in", values, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotIn(List<String> values) {
+			addCriterion("aid not in", values, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidBetween(String value1, String value2) {
+			addCriterion("aid between", value1, value2, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotBetween(String value1, String value2) {
+			addCriterion("aid not between", value1, value2, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIsNull() {
+			addCriterion("aname is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIsNotNull() {
+			addCriterion("aname is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameEqualTo(String value) {
+			addCriterion("aname =", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotEqualTo(String value) {
+			addCriterion("aname <>", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameGreaterThan(String value) {
+			addCriterion("aname >", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameGreaterThanOrEqualTo(String value) {
+			addCriterion("aname >=", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLessThan(String value) {
+			addCriterion("aname <", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLessThanOrEqualTo(String value) {
+			addCriterion("aname <=", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLike(String value) {
+			addCriterion("aname like", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotLike(String value) {
+			addCriterion("aname not like", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIn(List<String> values) {
+			addCriterion("aname in", values, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotIn(List<String> values) {
+			addCriterion("aname not in", values, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameBetween(String value1, String value2) {
+			addCriterion("aname between", value1, value2, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotBetween(String value1, String value2) {
+			addCriterion("aname not between", value1, value2, "aname");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_payment
-	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -121,6 +121,7 @@ import com.goafanti.order.service.OrderService;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
+import com.goafanti.report.bo.DepartmentSalesReportBO;
 
 @Service
 @EnableAsync
@@ -382,6 +383,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tm.setSalesmanId(a.getId());
 			tm.setSalesmanName(a.getName());
 		}
+		tm.setDepName(tOrderMidMapper.selectDepNameByDepid(t.getOrderDep()));
 		if (tm.getId()!=null) {
 			tOrderMidMapper.updateByPrimaryKeySelective(tm);
 		}else {
@@ -1318,11 +1320,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				pn.setDunStatus(1);
 				paymentNodeMapper.updateByPrimaryKey(pn);
 //				orderProjectService.addNoticAndEmail(outPaymentNode, NoticeStatus.PAYMENT_DUN.getCode());
-				try {
-					Thread.sleep(2000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
 			}
 		}
 		if (o.getId()!=null) {

+ 84 - 0
src/main/java/com/goafanti/organization/bo/InputNodeList.java

@@ -0,0 +1,84 @@
+package com.goafanti.organization.bo;
+
+public class InputNodeList {
+	private String userName;
+	private String contractNo;
+	private String orderNo;
+	private String cname;
+	private String pname;
+	private Integer status;
+	private String startTime;
+	private String endTime;
+	private Integer pageSize;
+	private Integer pageNo;
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getPname() {
+		return pname;
+	}
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public Integer getPageSize() {
+		if (pageNo==null||pageNo<1) {
+			return 10;
+		}
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		if (pageNo==null||pageNo<1) {
+			return 1;
+		}
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	
+	
+
+	
+}

+ 92 - 0
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -0,0 +1,92 @@
+package com.goafanti.organization.bo;
+
+public class InputPaymentList {
+	private String contractNo;
+	private String orderNo; 
+	private String userName;
+	private String depId;
+	private String aname; 
+	private String financeName;
+	private String cname; 
+	private String pname; 
+	private Integer status;
+	private Integer pageSize;
+	private Integer pageNo;
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	
+	public String getAname() {
+		return aname;
+	}
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getPageSize() {
+		if (pageNo==null||pageNo<1) {
+			return 10;
+		}
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		if (pageNo==null||pageNo<1) {
+			return 1;
+		}
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		
+		this.pageNo = pageNo;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getDepId() {
+		return depId;
+	}
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
+	public String getPname() {
+		return pname;
+	}
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+	
+
+
+}

+ 117 - 0
src/main/java/com/goafanti/organization/bo/outNodeList.java

@@ -0,0 +1,117 @@
+package com.goafanti.organization.bo;
+
+public class outNodeList {
+	private String contractNo;
+	private String orderNo;
+	private String userName;
+	private String cname;
+	private String pname;
+	private String orderStatus;
+	private String projectStatus;
+	private String projectAmount;
+	private String costAmount;
+	private String partyAmount;
+	private String liquidationStatus;
+	private String dunType;
+	private String projectType;
+	private String NodeAmount;
+	private String startTime;
+	private String status;
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getPname() {
+		return pname;
+	}
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getProjectStatus() {
+		return projectStatus;
+	}
+	public void setProjectStatus(String projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	public String getProjectAmount() {
+		return projectAmount;
+	}
+	public void setProjectAmount(String projectAmount) {
+		this.projectAmount = projectAmount;
+	}
+	public String getCostAmount() {
+		return costAmount;
+	}
+	public void setCostAmount(String costAmount) {
+		this.costAmount = costAmount;
+	}
+	public String getPartyAmount() {
+		return partyAmount;
+	}
+	public void setPartyAmount(String partyAmount) {
+		this.partyAmount = partyAmount;
+	}
+	public String getLiquidationStatus() {
+		return liquidationStatus;
+	}
+	public void setLiquidationStatus(String liquidationStatus) {
+		this.liquidationStatus = liquidationStatus;
+	}
+	public String getDunType() {
+		return dunType;
+	}
+	public void setDunType(String dunType) {
+		this.dunType = dunType;
+	}
+	public String getProjectType() {
+		return projectType;
+	}
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
+	public String getNodeAmount() {
+		return NodeAmount;
+	}
+	public void setNodeAmount(String nodeAmount) {
+		NodeAmount = nodeAmount;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	} 
+	
+}

+ 110 - 0
src/main/java/com/goafanti/organization/bo/outPaymentList.java

@@ -0,0 +1,110 @@
+package com.goafanti.organization.bo;
+
+public class outPaymentList {
+		private String contractNo;
+		private String orderNo;
+		private String userName;
+		private String depName;
+		private String costAmount;
+		private String paymentType;
+		private String paymentAmount;
+		private String applicationAmount;
+		private String createTime;
+		private String aname;
+		private String financeName;
+		private String cname;
+		private String pname;
+		private Integer projectStatus;
+		private Integer status;
+		public String getContractNo() {
+			return contractNo;
+		}
+		public void setContractNo(String contractNo) {
+			this.contractNo = contractNo;
+		}
+		public String getOrderNo() {
+			return orderNo;
+		}
+		public void setOrderNo(String orderNo) {
+			this.orderNo = orderNo;
+		}
+		public String getUserName() {
+			return userName;
+		}
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+		public String getDepName() {
+			return depName;
+		}
+		public void setDepName(String depName) {
+			this.depName = depName;
+		}
+		public String getCostAmount() {
+			return costAmount;
+		}
+		public void setCostAmount(String costAmount) {
+			this.costAmount = costAmount;
+		}
+		public String getPaymentType() {
+			return paymentType;
+		}
+		public void setPaymentType(String paymentType) {
+			this.paymentType = paymentType;
+		}
+		public String getPaymentAmount() {
+			return paymentAmount;
+		}
+		public void setPaymentAmount(String paymentAmount) {
+			this.paymentAmount = paymentAmount;
+		}
+		public String getApplicationAmount() {
+			return applicationAmount;
+		}
+		public void setApplicationAmount(String applicationAmount) {
+			this.applicationAmount = applicationAmount;
+		}
+		public String getCreateTime() {
+			return createTime;
+		}
+		public void setCreateTime(String createTime) {
+			this.createTime = createTime;
+		}
+		public String getAname() {
+			return aname;
+		}
+		public void setAname(String aname) {
+			this.aname = aname;
+		}
+		public String getFinanceName() {
+			return financeName;
+		}
+		public void setFinanceName(String financeName) {
+			this.financeName = financeName;
+		}
+		public String getCname() {
+			return cname;
+		}
+		public void setCname(String cname) {
+			this.cname = cname;
+		}
+		public String getPname() {
+			return pname;
+		}
+		public void setPname(String pname) {
+			this.pname = pname;
+		}
+		public Integer getProjectStatus() {
+			return projectStatus;
+		}
+		public void setProjectStatus(Integer projectStatus) {
+			this.projectStatus = projectStatus;
+		}
+		public Integer getStatus() {
+			return status;
+		}
+		public void setStatus(Integer status) {
+			this.status = status;
+		}
+		
+}

+ 27 - 0
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -13,6 +13,8 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.organization.bo.InputNodeList;
+import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.bo.InuptFinancialPayment;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
@@ -298,4 +300,29 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		return res;
 	}
 	
+	/**
+	 * 财务付款列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectPaymentList" , method = RequestMethod.GET)
+	public Result selectPaymentList(InputPaymentList  i) {
+		Result res =new Result();
+		res.data(thirdPartyCompanyService.selectPaymentList(i));
+		return res;
+	}
+	
+	/**
+	 * 节点应收款列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectNodeList" , method = RequestMethod.GET)
+	public Result selectNodeList(InputNodeList  i) {
+		Result res =new Result();
+		res.data(thirdPartyCompanyService.selectPaymentList(i));
+		return res;
+	}
+	
+	
 }

+ 10 - 0
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -6,12 +6,18 @@ import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.organization.bo.InputNodeList;
+import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.bo.InuptFinancialPayment;
+import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.bo.OutPaymentLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
 import com.goafanti.organization.bo.outFinancialPayment;
+import com.goafanti.organization.bo.outNodeList;
+import com.goafanti.organization.bo.outPaymentList;
 import com.goafanti.organization.bo.outOrderPayment;
 
 public interface ThirdPartyCompanyService {
@@ -52,5 +58,9 @@ public interface ThirdPartyCompanyService {
 
 	boolean checkprojectDun(TOrderPayment p);
 
+	Pagination<outPaymentList> selectPaymentList(InputPaymentList i);
+
+	Pagination<outNodeList> selectPaymentList(InputNodeList i);
+
 
 }

+ 89 - 8
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -4,7 +4,9 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
@@ -24,7 +26,6 @@ import com.goafanti.common.dao.PaymentLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.TOrderPaymentMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
-import com.goafanti.common.dao.TTaskMidMapper;
 import com.goafanti.common.dao.ThirdPartyCompanyMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.CompanyLibrary;
@@ -32,15 +33,16 @@ import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.PaymentLog;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.TOrderPayment;
-import com.goafanti.common.model.TOrderTask;
-import com.goafanti.common.model.TTaskMid;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.enums.NewOrderDunType;
+import com.goafanti.organization.bo.InputNodeList;
+import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.bo.InuptFinancialPayment;
 import com.goafanti.organization.bo.NoticeInformationBo;
@@ -48,6 +50,8 @@ import com.goafanti.organization.bo.OutPaymentLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
 import com.goafanti.organization.bo.outFinancialPayment;
+import com.goafanti.organization.bo.outNodeList;
+import com.goafanti.organization.bo.outPaymentList;
 import com.goafanti.organization.bo.outOrderPayment;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
@@ -186,7 +190,25 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			addNoticAndSendEmail(ni,a,type);
 			PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),p.getRemarks(),a.getId(),a.getName());
 			paymentLogMapper.insertSelective(pl);
-			
+		}
+		if (p.getStatus()==3) {//如果确定支付
+			int flag=0;
+			TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
+			if (tp.getChooseType()==1) {
+				PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(tp.getNodeId());
+				BigDecimal count=pn.getTotalAmount();
+				BigDecimal party=pn.getPartyAmount();
+				party=party.add(p.getPaymentAmount());
+				if (party.compareTo(new BigDecimal(0))==0) {
+					flag=0;
+				}else if (party.compareTo(count)==0) {
+					flag=2;
+				}else if (party.compareTo(count)==-1) {
+					flag=1;
+				}
+				pn.setStatus(flag);
+				paymentNodeMapper.updateByPrimaryKeySelective(pn);
+			}
 		}
 		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
 	
@@ -254,10 +276,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public boolean checkPayment(TOrderPayment p) {
 		BigDecimal total=new BigDecimal(0);
-		BigDecimal a=p.getPaymentAmount();
-//		支付类型 0第三方 1催款
+		BigDecimal a=p.getApplicationAmount();
+//		类型 0第三方 1催款
 		List<outOrderPayment> list=new ArrayList<>();
-		if (p.getPaymentType()==0) {
+		if (p.getChooseType()==0) {
 			list=tOrderPaymentMapper.selectList(p.getTpcId(),null);
 		}else if (p.getPaymentType()==1) {
 			list=tOrderPaymentMapper.selectList(null,p.getNodeId());
@@ -265,7 +287,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		for (outOrderPayment o : list) {
 			a=a.add(o.getPaymentAmount());
 		}
-		if (p.getPaymentType()==0) {
+		if (p.getChooseType()==0) {
 			ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());
 			total=t.getTotalAmount();
 		}else if (p.getPaymentType()==1) {
@@ -326,5 +348,64 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<outPaymentList> selectPaymentList(InputPaymentList i) {
+		Map<String, Object> map =new HashMap<>();
+		map.put("aid", TokenManager.getAdminId());
+		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
+		if (i.getOrderNo()!=null)map.put("orderNo", i.getOrderNo());
+		if (i.getUserName()!=null)map.put("userName", i.getUserName());
+		if (i.getDepId()!=null)map.put("depId", i.getDepId());
+		if (i.getAname()!=null)map.put("aname", i.getAname());
+		if (i.getFinanceName()!=null)map.put("financeName", i.getFinanceName());
+		if (i.getCname()!=null)map.put("cname", i.getCname());
+		if (i.getPname()!=null)map.put("pname", i.getPname());
+		if (i.getStatus()!=null)map.put("status", i.getStatus());
+		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+			map.put("lvl", 1);
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
+				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
+			map.put("lvl", 2);
+		}else  {
+			map.put("lvl", 0);
+		}
+		return (Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
+				map,i.getPageNo(),i.getPageSize());
+	}
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<outNodeList> selectPaymentList(InputNodeList i) {
+		Map<String, Object> map =new HashMap<>();
+		map.put("aid", TokenManager.getAdminId());
+		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
+		if (i.getOrderNo()!=null)map.put("orderNo", i.getOrderNo());
+		if (i.getUserName()!=null)map.put("userName", i.getUserName());
+		if (i.getCname()!=null)map.put("cname", i.getCname());
+		if (i.getPname()!=null)map.put("pname", i.getPname());
+		if (i.getStatus()!=null)map.put("status", i.getStatus());
+		if (i.getStartTime()!=null&&i.getEndTime()!=null) {
+			map.put("startTime", DateUtils.StringToDate(i.getStartTime(), AFTConstants.YYYYMMDD));
+			map.put("endTime", DateUtils.StringToDate(i.getEndTime()+" 23:59:59", AFTConstants.YYYYMMDDHHMMSS));
+		}
+		if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+			map.put("lvl", 1);
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+			map.put("lvl", 2);
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
+					TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+					TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
+				map.put("lvl", 3);
+			}else  {
+			map.put("lvl", 0);
+		}
+		return (Pagination<outNodeList>)findPage("selectNodeList","selectNodeCount",
+				map,i.getPageNo(),i.getPageSize());
+	}
+
+
 	
 }

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570