Pārlūkot izejas kodu

成本核算开发

Signed-off-by: anderx <312518615@qq.com>
anderx 5 gadi atpakaļ
vecāks
revīzija
838ee5f744
19 mainītis faili ar 2961 papildinājumiem un 656 dzēšanām
  1. 1 1
      GeneratorConfig.xml
  2. 2 1
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  3. 78 0
      src/main/java/com/goafanti/common/dao/PaymentNodeMapper.java
  4. 11 11
      src/main/java/com/goafanti/common/dao/TOrderOutsourceMapper.java
  5. 4 0
      src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java
  6. 404 0
      src/main/java/com/goafanti/common/mapper/PaymentNodeMapper.xml
  7. 628 565
      src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml
  8. 5 0
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  9. 284 0
      src/main/java/com/goafanti/common/model/PaymentNode.java
  10. 993 0
      src/main/java/com/goafanti/common/model/PaymentNodeExample.java
  11. 137 45
      src/main/java/com/goafanti/common/model/TOrderOutsource.java
  12. 266 16
      src/main/java/com/goafanti/common/model/TOrderOutsourceExample.java
  13. 8 17
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  14. 17 0
      src/main/java/com/goafanti/organization/bo/InputPaymentNode.java
  15. 15 0
      src/main/java/com/goafanti/organization/bo/OutPaymentNode.java
  16. 7 0
      src/main/java/com/goafanti/organization/bo/OutThirdPartyCompany.java
  17. 51 0
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  18. 12 0
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  19. 38 0
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

+ 1 - 1
GeneratorConfig.xml

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

+ 2 - 1
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -130,8 +130,9 @@ public class ErrorConstants {
 	
 	public static final String ORDER_CAN_NOT_MODIFY					= "ORDER_CAN_NOT_MODIFY";
 	
+	/** 该订单已经被冻结*/
 	public static final String ORDER_ALREADY_FREEZE                 = "ORDER_ALREADY_FREEZE";
-	
+	/** 该订单已经被锁定*/
 	public static final String ORDER_ALREADY_REVOKE					= "ORDER_ALREADY_REVOKE";
 	
 	public static final String ORDER_NOT_EXIST						= "ORDER_NOT_EXIST";

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

@@ -0,0 +1,78 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PaymentNode;
+import com.goafanti.common.model.PaymentNodeExample;
+import com.goafanti.organization.bo.OutPaymentNode;
+
+import java.util.List;
+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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	long countByExample(PaymentNodeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int deleteByExample(PaymentNodeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int insert(PaymentNode record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int insertSelective(PaymentNode record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	PaymentNode selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int updateByPrimaryKeySelective(PaymentNode record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	int updateByPrimaryKey(PaymentNode record);
+
+	List<OutPaymentNode> selectByTid(Integer tid);
+}

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

@@ -10,68 +10,68 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderOutsourceMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	long countByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int deleteByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int insert(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int insertSelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	List<TOrderOutsource> selectByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	TOrderOutsource selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderOutsource record,
 			@Param("example") TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderOutsource record, @Param("example") TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderOutsource record);
 

+ 4 - 0
src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.model.ThirdPartyCompanyExample;
+import com.goafanti.organization.bo.OutThirdPartyCompany;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -73,4 +75,6 @@ public interface ThirdPartyCompanyMapper {
 	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
 	 */
 	int updateByPrimaryKey(ThirdPartyCompany record);
+
+	List<OutThirdPartyCompany> selectByTid(Integer tid);
 }

+ 404 - 0
src/main/java/com/goafanti/common/mapper/PaymentNodeMapper.xml

@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.PaymentNodeMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PaymentNode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="project_type" jdbcType="INTEGER" property="projectType" />
+    <result column="dun_type" jdbcType="INTEGER" property="dunType" />
+    <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
+    <result column="quantity" jdbcType="INTEGER" property="quantity" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
+    <result column="party_time" jdbcType="TIMESTAMP" property="partyTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </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 12 13:55:18 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    id, tid, cid, company_name, project_type, dun_type, unit_price, quantity, total_amount, 
+    party_amount, party_time, create_time
+  </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 Fri Jun 12 13:55:18 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from payment_node
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from payment_node
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    delete from payment_node
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PaymentNodeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    delete from payment_node
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" 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 Fri Jun 12 13:55:18 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
+      )
+    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}
+      )
+  </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 Fri Jun 12 13:55:18 CST 2020.
+    -->
+    insert into payment_node
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="projectType != null">
+        project_type,
+      </if>
+      <if test="dunType != null">
+        dun_type,
+      </if>
+      <if test="unitPrice != null">
+        unit_price,
+      </if>
+      <if test="quantity != null">
+        quantity,
+      </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
+      <if test="partyAmount != null">
+        party_amount,
+      </if>
+      <if test="partyTime != null">
+        party_time,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="projectType != null">
+        #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="unitPrice != null">
+        #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        #{quantity,jdbcType=INTEGER},
+      </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyAmount != null">
+        #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyTime != null">
+        #{partyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </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 Fri Jun 12 13:55:18 CST 2020.
+    -->
+    select count(*) from payment_node
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    update payment_node
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectType != null">
+        project_type = #{record.projectType,jdbcType=INTEGER},
+      </if>
+      <if test="record.dunType != null">
+        dun_type = #{record.dunType,jdbcType=INTEGER},
+      </if>
+      <if test="record.unitPrice != null">
+        unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.quantity != null">
+        quantity = #{record.quantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.partyAmount != null">
+        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.partyTime != null">
+        party_time = #{record.partyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 12 13:55:18 CST 2020.
+    -->
+    update payment_node
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      project_type = #{record.projectType,jdbcType=INTEGER},
+      dun_type = #{record.dunType,jdbcType=INTEGER},
+      unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      quantity = #{record.quantity,jdbcType=INTEGER},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      party_time = #{record.partyTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" 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 Fri Jun 12 13:55:18 CST 2020.
+    -->
+    update payment_node
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="projectType != null">
+        project_type = #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        dun_type = #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="unitPrice != null">
+        unit_price = #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        quantity = #{quantity,jdbcType=INTEGER},
+      </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyAmount != null">
+        party_amount = #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyTime != null">
+        party_time = #{partyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" 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 Fri Jun 12 13:55:18 CST 2020.
+    -->
+    update payment_node
+    set tid = #{tid,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=INTEGER},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      project_type = #{projectType,jdbcType=INTEGER},
+      dun_type = #{dunType,jdbcType=INTEGER},
+      unit_price = #{unitPrice,jdbcType=DECIMAL},
+      quantity = #{quantity,jdbcType=INTEGER},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      party_amount = #{partyAmount,jdbcType=DECIMAL},
+      party_time = #{partyTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectByTid" resultType="com.goafanti.organization.bo.OutPaymentNode">
+  select id,tid,cid,company_name companyName,unit_price unitPrice,quantity,total_amount totalAmount,
+   party_amount partyAmount, date_format(party_time,'%Y-%m-%d')partyTimes,project_type projectType,dun_type dunType
+   from payment_node where tid= #{tid}
+  </select>
+</mapper>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 628 - 565
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml


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

@@ -425,4 +425,9 @@
       cid = #{cid,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectByTid" resultType="com.goafanti.organization.bo.OutThirdPartyCompany">
+   select id,tid,company_name companyName,unit_price unitPrice,quantity,total_amount totalAmount,material,urgent,audit,assets,
+   income,remarks,cid
+   from third_party_company where tid= #{tid}
+  </select>
 </mapper>

+ 284 - 0
src/main/java/com/goafanti/common/model/PaymentNode.java

@@ -0,0 +1,284 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class PaymentNode {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.id
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.tid
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.cid
+	 * @mbg.generated  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	private BigDecimal unitPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column payment_node.quantity
+	 * @mbg.generated  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	private Date createTime;
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_node.tid
+	 * @return  the value of payment_node.tid
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getDunType() {
+		return dunType;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setDunType(Integer dunType) {
+		this.dunType = dunType;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public BigDecimal getUnitPrice() {
+		return unitPrice;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setUnitPrice(BigDecimal unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public BigDecimal getPartyAmount() {
+		return partyAmount;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setPartyAmount(BigDecimal partyAmount) {
+		this.partyAmount = partyAmount;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Date getPartyTime() {
+		return partyTime;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setPartyTime(Date partyTime) {
+		this.partyTime = partyTime;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

+ 993 - 0
src/main/java/com/goafanti/common/model/PaymentNodeExample.java

@@ -0,0 +1,993 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+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  Fri Jun 12 13:55:18 CST 2020
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public PaymentNodeExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIsNull() {
+			addCriterion("tid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIsNotNull() {
+			addCriterion("tid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidEqualTo(Integer value) {
+			addCriterion("tid =", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotEqualTo(Integer value) {
+			addCriterion("tid <>", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThan(Integer value) {
+			addCriterion("tid >", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("tid >=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThan(Integer value) {
+			addCriterion("tid <", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThanOrEqualTo(Integer value) {
+			addCriterion("tid <=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIn(List<Integer> values) {
+			addCriterion("tid in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotIn(List<Integer> values) {
+			addCriterion("tid not in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidBetween(Integer value1, Integer value2) {
+			addCriterion("tid between", value1, value2, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotBetween(Integer value1, Integer value2) {
+			addCriterion("tid not between", value1, value2, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNull() {
+			addCriterion("cid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNotNull() {
+			addCriterion("cid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidEqualTo(Integer value) {
+			addCriterion("cid =", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotEqualTo(Integer value) {
+			addCriterion("cid <>", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThan(Integer value) {
+			addCriterion("cid >", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("cid >=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThan(Integer value) {
+			addCriterion("cid <", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThanOrEqualTo(Integer value) {
+			addCriterion("cid <=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIn(List<Integer> values) {
+			addCriterion("cid in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotIn(List<Integer> values) {
+			addCriterion("cid not in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidBetween(Integer value1, Integer value2) {
+			addCriterion("cid between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotBetween(Integer value1, Integer value2) {
+			addCriterion("cid not between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameIsNull() {
+			addCriterion("company_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameIsNotNull() {
+			addCriterion("company_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameEqualTo(String value) {
+			addCriterion("company_name =", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotEqualTo(String value) {
+			addCriterion("company_name <>", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameGreaterThan(String value) {
+			addCriterion("company_name >", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+			addCriterion("company_name >=", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLessThan(String value) {
+			addCriterion("company_name <", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+			addCriterion("company_name <=", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLike(String value) {
+			addCriterion("company_name like", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotLike(String value) {
+			addCriterion("company_name not like", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameIn(List<String> values) {
+			addCriterion("company_name in", values, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotIn(List<String> values) {
+			addCriterion("company_name not in", values, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameBetween(String value1, String value2) {
+			addCriterion("company_name between", value1, value2, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotBetween(String value1, String value2) {
+			addCriterion("company_name not between", value1, value2, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeIsNull() {
+			addCriterion("project_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeIsNotNull() {
+			addCriterion("project_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeEqualTo(Integer value) {
+			addCriterion("project_type =", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeNotEqualTo(Integer value) {
+			addCriterion("project_type <>", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeGreaterThan(Integer value) {
+			addCriterion("project_type >", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("project_type >=", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeLessThan(Integer value) {
+			addCriterion("project_type <", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("project_type <=", value, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeIn(List<Integer> values) {
+			addCriterion("project_type in", values, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeNotIn(List<Integer> values) {
+			addCriterion("project_type not in", values, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeBetween(Integer value1, Integer value2) {
+			addCriterion("project_type between", value1, value2, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("project_type not between", value1, value2, "projectType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeIsNull() {
+			addCriterion("dun_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeIsNotNull() {
+			addCriterion("dun_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeEqualTo(Integer value) {
+			addCriterion("dun_type =", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeNotEqualTo(Integer value) {
+			addCriterion("dun_type <>", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeGreaterThan(Integer value) {
+			addCriterion("dun_type >", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("dun_type >=", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeLessThan(Integer value) {
+			addCriterion("dun_type <", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("dun_type <=", value, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeIn(List<Integer> values) {
+			addCriterion("dun_type in", values, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeNotIn(List<Integer> values) {
+			addCriterion("dun_type not in", values, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeBetween(Integer value1, Integer value2) {
+			addCriterion("dun_type between", value1, value2, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andDunTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("dun_type not between", value1, value2, "dunType");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceIsNull() {
+			addCriterion("unit_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceIsNotNull() {
+			addCriterion("unit_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceEqualTo(BigDecimal value) {
+			addCriterion("unit_price =", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotEqualTo(BigDecimal value) {
+			addCriterion("unit_price <>", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceGreaterThan(BigDecimal value) {
+			addCriterion("unit_price >", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("unit_price >=", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceLessThan(BigDecimal value) {
+			addCriterion("unit_price <", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("unit_price <=", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceIn(List<BigDecimal> values) {
+			addCriterion("unit_price in", values, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotIn(List<BigDecimal> values) {
+			addCriterion("unit_price not in", values, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("unit_price between", value1, value2, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("unit_price not between", value1, value2, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityIsNull() {
+			addCriterion("quantity is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityIsNotNull() {
+			addCriterion("quantity is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityEqualTo(Integer value) {
+			addCriterion("quantity =", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityNotEqualTo(Integer value) {
+			addCriterion("quantity <>", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityGreaterThan(Integer value) {
+			addCriterion("quantity >", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityGreaterThanOrEqualTo(Integer value) {
+			addCriterion("quantity >=", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityLessThan(Integer value) {
+			addCriterion("quantity <", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityLessThanOrEqualTo(Integer value) {
+			addCriterion("quantity <=", value, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityIn(List<Integer> values) {
+			addCriterion("quantity in", values, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityNotIn(List<Integer> values) {
+			addCriterion("quantity not in", values, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityBetween(Integer value1, Integer value2) {
+			addCriterion("quantity between", value1, value2, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andQuantityNotBetween(Integer value1, Integer value2) {
+			addCriterion("quantity not between", value1, value2, "quantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountIsNull() {
+			addCriterion("total_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountIsNotNull() {
+			addCriterion("total_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountEqualTo(BigDecimal value) {
+			addCriterion("total_amount =", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountNotEqualTo(BigDecimal value) {
+			addCriterion("total_amount <>", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountGreaterThan(BigDecimal value) {
+			addCriterion("total_amount >", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("total_amount >=", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountLessThan(BigDecimal value) {
+			addCriterion("total_amount <", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("total_amount <=", value, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountIn(List<BigDecimal> values) {
+			addCriterion("total_amount in", values, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountNotIn(List<BigDecimal> values) {
+			addCriterion("total_amount not in", values, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("total_amount between", value1, value2, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("total_amount not between", value1, value2, "totalAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountIsNull() {
+			addCriterion("party_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountIsNotNull() {
+			addCriterion("party_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountEqualTo(BigDecimal value) {
+			addCriterion("party_amount =", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountNotEqualTo(BigDecimal value) {
+			addCriterion("party_amount <>", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountGreaterThan(BigDecimal value) {
+			addCriterion("party_amount >", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("party_amount >=", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountLessThan(BigDecimal value) {
+			addCriterion("party_amount <", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("party_amount <=", value, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountIn(List<BigDecimal> values) {
+			addCriterion("party_amount in", values, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountNotIn(List<BigDecimal> values) {
+			addCriterion("party_amount not in", values, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("party_amount between", value1, value2, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("party_amount not between", value1, value2, "partyAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeIsNull() {
+			addCriterion("party_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeIsNotNull() {
+			addCriterion("party_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeEqualTo(Date value) {
+			addCriterion("party_time =", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeNotEqualTo(Date value) {
+			addCriterion("party_time <>", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeGreaterThan(Date value) {
+			addCriterion("party_time >", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("party_time >=", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeLessThan(Date value) {
+			addCriterion("party_time <", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeLessThanOrEqualTo(Date value) {
+			addCriterion("party_time <=", value, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeIn(List<Date> values) {
+			addCriterion("party_time in", values, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeNotIn(List<Date> values) {
+			addCriterion("party_time not in", values, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeBetween(Date value1, Date value2) {
+			addCriterion("party_time between", value1, value2, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPartyTimeNotBetween(Date value1, Date value2) {
+			addCriterion("party_time not between", value1, value2, "partyTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table payment_node
+	 * @mbg.generated  Fri Jun 12 13:55:18 CST 2020
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table payment_node
+     *
+     * @mbg.generated do_not_delete_during_merge Fri Jun 12 09:19:20 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 137 - 45
src/main/java/com/goafanti/common/model/TOrderOutsource.java

@@ -7,84 +7,104 @@ public class TOrderOutsource {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.id
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.order_no
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.refund_status
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Integer refundStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.create_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.attachment_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String attachmentUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.picture_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String pictureUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.amount
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private BigDecimal amount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.company_name
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.audit_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Date auditTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_price
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private BigDecimal unitPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_number
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Integer unitNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.outsource_remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private String outsourceRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.type
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.tid
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.start_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	private Integer startType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	private Integer patentNameType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	private String patentName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	private Integer patentType;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.id
 	 * @return  the value of t_order_outsource.id
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -93,7 +113,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.id
 	 * @param id  the value for t_order_outsource.id
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -102,7 +122,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.order_no
 	 * @return  the value of t_order_outsource.order_no
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -111,7 +131,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.order_no
 	 * @param orderNo  the value for t_order_outsource.order_no
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -120,7 +140,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.refund_status
 	 * @return  the value of t_order_outsource.refund_status
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Integer getRefundStatus() {
 		return refundStatus;
@@ -129,7 +149,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.refund_status
 	 * @param refundStatus  the value for t_order_outsource.refund_status
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setRefundStatus(Integer refundStatus) {
 		this.refundStatus = refundStatus;
@@ -138,7 +158,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.create_time
 	 * @return  the value of t_order_outsource.create_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -147,7 +167,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.create_time
 	 * @param createTime  the value for t_order_outsource.create_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -156,7 +176,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.remarks
 	 * @return  the value of t_order_outsource.remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -165,7 +185,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.remarks
 	 * @param remarks  the value for t_order_outsource.remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -174,7 +194,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.attachment_url
 	 * @return  the value of t_order_outsource.attachment_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -183,7 +203,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.attachment_url
 	 * @param attachmentUrl  the value for t_order_outsource.attachment_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;
@@ -192,7 +212,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.picture_url
 	 * @return  the value of t_order_outsource.picture_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getPictureUrl() {
 		return pictureUrl;
@@ -201,7 +221,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.picture_url
 	 * @param pictureUrl  the value for t_order_outsource.picture_url
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setPictureUrl(String pictureUrl) {
 		this.pictureUrl = pictureUrl;
@@ -210,7 +230,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.amount
 	 * @return  the value of t_order_outsource.amount
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public BigDecimal getAmount() {
 		return amount;
@@ -219,7 +239,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.amount
 	 * @param amount  the value for t_order_outsource.amount
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
@@ -228,7 +248,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.company_name
 	 * @return  the value of t_order_outsource.company_name
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -237,7 +257,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.company_name
 	 * @param companyName  the value for t_order_outsource.company_name
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -246,7 +266,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.audit_time
 	 * @return  the value of t_order_outsource.audit_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Date getAuditTime() {
 		return auditTime;
@@ -255,7 +275,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.audit_time
 	 * @param auditTime  the value for t_order_outsource.audit_time
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setAuditTime(Date auditTime) {
 		this.auditTime = auditTime;
@@ -264,7 +284,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_price
 	 * @return  the value of t_order_outsource.unit_price
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -273,7 +293,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_price
 	 * @param unitPrice  the value for t_order_outsource.unit_price
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -282,7 +302,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_number
 	 * @return  the value of t_order_outsource.unit_number
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Integer getUnitNumber() {
 		return unitNumber;
@@ -291,7 +311,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_number
 	 * @param unitNumber  the value for t_order_outsource.unit_number
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setUnitNumber(Integer unitNumber) {
 		this.unitNumber = unitNumber;
@@ -300,7 +320,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.outsource_remarks
 	 * @return  the value of t_order_outsource.outsource_remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getOutsourceRemarks() {
 		return outsourceRemarks;
@@ -309,7 +329,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.outsource_remarks
 	 * @param outsourceRemarks  the value for t_order_outsource.outsource_remarks
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setOutsourceRemarks(String outsourceRemarks) {
 		this.outsourceRemarks = outsourceRemarks;
@@ -318,7 +338,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.type
 	 * @return  the value of t_order_outsource.type
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -327,7 +347,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.type
 	 * @param type  the value for t_order_outsource.type
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -336,7 +356,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.tid
 	 * @return  the value of t_order_outsource.tid
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -345,9 +365,81 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.tid
 	 * @param tid  the value for t_order_outsource.tid
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.start_type
+	 * @return  the value of t_order_outsource.start_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public Integer getStartType() {
+		return startType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.start_type
+	 * @param startType  the value for t_order_outsource.start_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public void setStartType(Integer startType) {
+		this.startType = startType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name_type
+	 * @return  the value of t_order_outsource.patent_name_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public Integer getPatentNameType() {
+		return patentNameType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name_type
+	 * @param patentNameType  the value for t_order_outsource.patent_name_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public void setPatentNameType(Integer patentNameType) {
+		this.patentNameType = patentNameType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name
+	 * @return  the value of t_order_outsource.patent_name
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public String getPatentName() {
+		return patentName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name
+	 * @param patentName  the value for t_order_outsource.patent_name
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_type
+	 * @return  the value of t_order_outsource.patent_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_type
+	 * @param patentType  the value for t_order_outsource.patent_type
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
+	 */
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
 }

+ 266 - 16
src/main/java/com/goafanti/common/model/TOrderOutsourceExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderOutsourceExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public TOrderOutsourceExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1123,11 +1123,261 @@ public class TOrderOutsourceExample {
 			addCriterion("tid not between", value1, value2, "tid");
 			return (Criteria) this;
 		}
+
+		public Criteria andStartTypeIsNull() {
+			addCriterion("start_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeIsNotNull() {
+			addCriterion("start_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeEqualTo(Integer value) {
+			addCriterion("start_type =", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotEqualTo(Integer value) {
+			addCriterion("start_type <>", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeGreaterThan(Integer value) {
+			addCriterion("start_type >", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("start_type >=", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeLessThan(Integer value) {
+			addCriterion("start_type <", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("start_type <=", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeIn(List<Integer> values) {
+			addCriterion("start_type in", values, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotIn(List<Integer> values) {
+			addCriterion("start_type not in", values, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeBetween(Integer value1, Integer value2) {
+			addCriterion("start_type between", value1, value2, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("start_type not between", value1, value2, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeIsNull() {
+			addCriterion("patent_name_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeIsNotNull() {
+			addCriterion("patent_name_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeEqualTo(Integer value) {
+			addCriterion("patent_name_type =", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotEqualTo(Integer value) {
+			addCriterion("patent_name_type <>", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeGreaterThan(Integer value) {
+			addCriterion("patent_name_type >", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("patent_name_type >=", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeLessThan(Integer value) {
+			addCriterion("patent_name_type <", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("patent_name_type <=", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeIn(List<Integer> values) {
+			addCriterion("patent_name_type in", values, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotIn(List<Integer> values) {
+			addCriterion("patent_name_type not in", values, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeBetween(Integer value1, Integer value2) {
+			addCriterion("patent_name_type between", value1, value2, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("patent_name_type not between", value1, value2, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameIsNull() {
+			addCriterion("patent_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameIsNotNull() {
+			addCriterion("patent_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameEqualTo(String value) {
+			addCriterion("patent_name =", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameNotEqualTo(String value) {
+			addCriterion("patent_name <>", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameGreaterThan(String value) {
+			addCriterion("patent_name >", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameGreaterThanOrEqualTo(String value) {
+			addCriterion("patent_name >=", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameLessThan(String value) {
+			addCriterion("patent_name <", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameLessThanOrEqualTo(String value) {
+			addCriterion("patent_name <=", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameLike(String value) {
+			addCriterion("patent_name like", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameNotLike(String value) {
+			addCriterion("patent_name not like", value, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameIn(List<String> values) {
+			addCriterion("patent_name in", values, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameNotIn(List<String> values) {
+			addCriterion("patent_name not in", values, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameBetween(String value1, String value2) {
+			addCriterion("patent_name between", value1, value2, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameNotBetween(String value1, String value2) {
+			addCriterion("patent_name not between", value1, value2, "patentName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeIsNull() {
+			addCriterion("patent_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeIsNotNull() {
+			addCriterion("patent_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeEqualTo(Integer value) {
+			addCriterion("patent_type =", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeNotEqualTo(Integer value) {
+			addCriterion("patent_type <>", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeGreaterThan(Integer value) {
+			addCriterion("patent_type >", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("patent_type >=", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeLessThan(Integer value) {
+			addCriterion("patent_type <", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("patent_type <=", value, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeIn(List<Integer> values) {
+			addCriterion("patent_type in", values, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeNotIn(List<Integer> values) {
+			addCriterion("patent_type not in", values, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeBetween(Integer value1, Integer value2) {
+			addCriterion("patent_type between", value1, value2, "patentType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("patent_type not between", value1, value2, "patentType");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_outsource
-	 * @mbg.generated  Wed Mar 04 11:31:18 CST 2020
+	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 8 - 17
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -283,18 +283,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			contactBook.setMobile(t.getContactMobile());
 			organizationContactBookMapper.insertSelective(contactBook);
 		}
-		if (t.getServiceStatus()==1) {
-			TOrderExtend te=new TOrderExtend();
-			te.setOrderNo(t.getOrderNo());
-			te.setServiceStatus(t.getServiceStatus());
-			te.setPaymentMethod(t.getPaymentMethod());
-			te.setPaymentRatio(t.getPaymentRatio());
-			te.setServiceAmount(t.getServiceAmount());
-			te.setServiceName(t.getServiceName());
-			te.setServiceRemarks(t.getServiceRemarks());
-			te.setPaymentStatus(1);//设定为已发起
-			tOrderExtendMapper.updateByPrimaryKeySelective(te);
-		}
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		}
@@ -1283,12 +1271,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public int pushOutsourceProjectAudit(TOrderOutsource o) {
 		o.setRefundStatus(0);
 		o.setCreateTime(new Date());
-		List<String> aids = new ArrayList<>();
-		for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
-			aids.add(admin.getId());
+		if(o.getPatentType()==null)o.setPatentType(0);
+		if (o.getPatentType()==0) {
+			List<String> aids = new ArrayList<>();
+			for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
+				aids.add(admin.getId());
+			}
+			TOrderNew t2= checkDeleteSign(o.getOrderNo());
+			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.PROJECT_OUTSOURCE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		}
-		TOrderNew t2= checkDeleteSign(o.getOrderNo());
-		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.PROJECT_OUTSOURCE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		if (o.getId()!=null) {
 			tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 		}else {

+ 17 - 0
src/main/java/com/goafanti/organization/bo/InputPaymentNode.java

@@ -0,0 +1,17 @@
+package com.goafanti.organization.bo;
+
+import com.goafanti.common.model.PaymentNode;
+
+public class InputPaymentNode extends PaymentNode{
+	
+	private String partyTimes;
+
+	public String getPartyTimes() {
+		return partyTimes;
+	}
+
+	public void setPartyTimes(String partyTimes) {
+		this.partyTimes = partyTimes;
+	}
+
+}

+ 15 - 0
src/main/java/com/goafanti/organization/bo/OutPaymentNode.java

@@ -0,0 +1,15 @@
+package com.goafanti.organization.bo;
+
+import com.goafanti.common.model.PaymentNode;
+
+public class OutPaymentNode extends PaymentNode{
+	private String partyTimes;
+
+	public String getPartyTimes() {
+		return partyTimes;
+	}
+
+	public void setPartyTimes(String partyTimes) {
+		this.partyTimes = partyTimes;
+	}
+}

+ 7 - 0
src/main/java/com/goafanti/organization/bo/OutThirdPartyCompany.java

@@ -0,0 +1,7 @@
+package com.goafanti.organization.bo;
+
+import com.goafanti.common.model.ThirdPartyCompany;
+
+public class OutThirdPartyCompany  extends ThirdPartyCompany{
+
+}

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

@@ -10,8 +10,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
 
@@ -48,6 +50,18 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		return res;
 	}
 	
+	@RequestMapping(value = "/selectCompany" , method = RequestMethod.GET)
+	public Result selectCompany(Integer tid) {
+		Result res =new Result();
+		if (null==tid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.selectCompany(tid));
+		return res;
+	}
+	
+	
 	@RequestMapping(value = "/selectVague" , method = RequestMethod.GET)
 	public Result selectVague(String  name) {
 		Result res =new Result();
@@ -59,4 +73,41 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		return res;
 	}
 	
+	@RequestMapping(value = "/addPaymentNode" , method = RequestMethod.POST)
+	public Result addPaymentNode(InputPaymentNode p) {
+		Result res =new Result();
+		if (null==p.getTid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"项目编号","项目编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.addPaymentNode(p));
+		return res;
+	}
+	
+	@RequestMapping(value = "/updatePaymentNode" , method = RequestMethod.POST)
+	public Result updatePaymentNode(InputPaymentNode p) {
+		Result res =new Result();
+		if (null==p.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		if (null==p.getTid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"项目编号","项目编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.updatePaymentNode(p));
+		return res;
+	}
+	
+	@RequestMapping(value = "/selectPaymentNode" , method = RequestMethod.GET)
+	public Result selectPaymentNode(Integer tid) {
+		Result res =new Result();
+		if (null==tid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.selectPaymentNode(tid));
+		return res;
+	}
+	
 }

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

@@ -3,7 +3,11 @@ package com.goafanti.organization.service;
 import java.util.List;
 
 import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.organization.bo.InputPaymentNode;
+import com.goafanti.organization.bo.OutPaymentNode;
+import com.goafanti.organization.bo.OutThirdPartyCompany;
 
 public interface ThirdPartyCompanyService {
 
@@ -13,4 +17,12 @@ public interface ThirdPartyCompanyService {
 
 	int updateCompany(ThirdPartyCompany t);
 
+	int addPaymentNode(InputPaymentNode p);
+
+	int updatePaymentNode(InputPaymentNode p);
+
+	List<OutThirdPartyCompany> selectCompany(Integer tid);
+
+	List<OutPaymentNode> selectPaymentNode(Integer tid);
+
 }

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

@@ -5,12 +5,18 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.CompanyLibraryMapper;
+import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.ThirdPartyCompanyMapper;
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.organization.bo.InputPaymentNode;
+import com.goafanti.organization.bo.OutPaymentNode;
+import com.goafanti.organization.bo.OutThirdPartyCompany;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
 @Service
@@ -20,6 +26,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private ThirdPartyCompanyMapper	thirdPartyCompanyMapper;
 	@Autowired
 	private CompanyLibraryMapper	companyLibraryMapper;
+	@Autowired
+	private PaymentNodeMapper	paymentNodeMapper;
 	
 
 
@@ -60,5 +68,35 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public int addPaymentNode(InputPaymentNode p) {
+		if (p.getPartyTimes()!=null) {
+			p.setPartyTime(DateUtils.StringToDate(p.getPartyTimes(), AFTConstants.YYYYMMDD));
+		}
+		return paymentNodeMapper.insertSelective(p);
+	}
+
+
+	@Override
+	public int updatePaymentNode(InputPaymentNode p) {
+		if (p.getPartyTimes()!=null) {
+			p.setPartyTime(DateUtils.StringToDate(p.getPartyTimes(), AFTConstants.YYYYMMDD));
+		}
+		return paymentNodeMapper.updateByPrimaryKeySelective(p);
+	}
+
+
+	@Override
+	public List<OutThirdPartyCompany> selectCompany(Integer tid) {
+		return thirdPartyCompanyMapper.selectByTid(tid);
+	}
+
+
+	@Override
+	public List<OutPaymentNode> selectPaymentNode(Integer tid) {
+		return paymentNodeMapper.selectByTid(tid);
+	}
+
+
 
 }