Explorar el Código

getpatentType修改

anderx hace 4 años
padre
commit
67063919ee

+ 1 - 1
GeneratorConfig.xml

@@ -45,7 +45,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="payment_log"
+    <table schema="aft" tableName="t_order_payment"
 	enableCountByExample="false" enableUpdateByExample="false"
 	enableDeleteByExample="false" enableSelectByExample="false"
 	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"

+ 6 - 6
src/main/java/com/goafanti/common/dao/PaymentLogMapper.java

@@ -10,37 +10,37 @@ import org.apache.ibatis.annotations.Param;
 public interface PaymentLogMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	int insert(PaymentLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	int insertSelective(PaymentLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	PaymentLog selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	int updateByPrimaryKeySelective(PaymentLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	int updateByPrimaryKey(PaymentLog record);
 

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

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

+ 5 - 3
src/main/java/com/goafanti/common/enums/OfficialPatentType.java

@@ -62,9 +62,11 @@ public enum OfficialPatentType {
 		List<Map<Object, Object>> list=new ArrayList<Map<Object,Object>>();
 		for(OfficialPatentType o:OfficialPatentType.values()){
 			Map<Object, Object> map=new LinkedHashMap<Object, Object>();
-			map.put("id", o.getCode());
-			map.put("name", o.getDesc());
-			list.add(map);
+			if (o.getCode()!=OfficialPatentType.NOT.getCode()) {
+				map.put("id", o.getCode());
+				map.put("name", o.getDesc());
+				list.add(map);
+			}
 		}
 		return list;
 	}

+ 12 - 23
src/main/java/com/goafanti/common/mapper/PaymentLogMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="pid" jdbcType="INTEGER" property="pid" />
@@ -14,21 +14,20 @@
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="aname" jdbcType="VARCHAR" property="aname" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
-    id, pid, `status`, remarks, aid, aname, create_time, process_status
+    id, pid, `status`, remarks, aid, aname, create_time
   </sql>
   <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 Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -39,7 +38,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     delete from payment_log
     where id = #{id,jdbcType=INTEGER}
@@ -48,20 +47,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     insert into payment_log (id, pid, `status`, 
       remarks, aid, aname, 
-      create_time, process_status)
+      create_time)
     values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
       #{remarks,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{processStatus,jdbcType=INTEGER})
+      #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PaymentLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     insert into payment_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -86,9 +85,6 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="processStatus != null">
-        process_status,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -112,16 +108,13 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="processStatus != null">
-        #{processStatus,jdbcType=INTEGER},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PaymentLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     update payment_log
     <set>
@@ -143,9 +136,6 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="processStatus != null">
-        process_status = #{processStatus,jdbcType=INTEGER},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -153,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 19 17:20:00 CST 2021.
+      This element was generated on Tue Jul 20 09:16:06 CST 2021.
     -->
     update payment_log
     set pid = #{pid,jdbcType=INTEGER},
@@ -161,8 +151,7 @@
       remarks = #{remarks,jdbcType=VARCHAR},
       aid = #{aid,jdbcType=VARCHAR},
       aname = #{aname,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      process_status = #{processStatus,jdbcType=INTEGER}
+      create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

+ 70 - 255
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -5,126 +5,41 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="node_id" jdbcType="INTEGER" property="nodeId" />
+    <result column="choose_type" jdbcType="INTEGER" property="chooseType" />
     <result column="payment_type" jdbcType="INTEGER" property="paymentType" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="quantity" jdbcType="INTEGER" property="quantity" />
     <result column="payment_status" jdbcType="INTEGER" property="paymentStatus" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="application_amount" jdbcType="DECIMAL" property="applicationAmount" />
     <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="tpc_id" jdbcType="INTEGER" property="tpcId" />
-    <result column="application_amount" jdbcType="DECIMAL" property="applicationAmount" />
-    <result column="choose_type" jdbcType="INTEGER" property="chooseType" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="aname" jdbcType="VARCHAR" property="aname" />
+    <result column="tpc_id" jdbcType="INTEGER" property="tpcId" />
+    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
   </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 Tue Jul 07 11:46:04 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 Tue Jul 07 11:46:04 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 Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
-    id, tid, node_id, payment_type, company_name, quantity, payment_status, status, payment_amount, 
-    remarks, create_time, tpc_id, application_amount, choose_type, aid, aname
+    id, tid, node_id, choose_type, payment_type, company_name, quantity, payment_status, 
+    `status`, application_amount, payment_amount, remarks, create_time, aid, aname, tpc_id, 
+    process_status
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_order_payment
-    <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 Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -135,46 +50,35 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     delete from t_order_payment
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
-    -->
-    delete from t_order_payment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TOrderPayment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     insert into t_order_payment (id, tid, node_id, 
-      payment_type, company_name, quantity, 
-      payment_status, status, payment_amount, 
-      remarks, create_time, tpc_id, 
-      application_amount, choose_type, aid, 
-      aname)
+      choose_type, payment_type, company_name, 
+      quantity, payment_status, `status`, 
+      application_amount, payment_amount, remarks, 
+      create_time, aid, aname, 
+      tpc_id, process_status)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, 
-      #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, 
-      #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{paymentAmount,jdbcType=DECIMAL}, 
-      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{tpcId,jdbcType=INTEGER}, 
-      #{applicationAmount,jdbcType=DECIMAL}, #{chooseType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
-      #{aname,jdbcType=VARCHAR})
+      #{chooseType,jdbcType=INTEGER}, #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
+      #{quantity,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{applicationAmount,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
+      #{tpcId,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderPayment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     insert into t_order_payment
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,6 +91,9 @@
       <if test="nodeId != null">
         node_id,
       </if>
+      <if test="chooseType != null">
+        choose_type,
+      </if>
       <if test="paymentType != null">
         payment_type,
       </if>
@@ -200,7 +107,10 @@
         payment_status,
       </if>
       <if test="status != null">
-        status,
+        `status`,
+      </if>
+      <if test="applicationAmount != null">
+        application_amount,
       </if>
       <if test="paymentAmount != null">
         payment_amount,
@@ -211,21 +121,18 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="tpcId != null">
-        tpc_id,
-      </if>
-      <if test="applicationAmount != null">
-        application_amount,
-      </if>
-      <if test="chooseType != null">
-        choose_type,
-      </if>
       <if test="aid != null">
         aid,
       </if>
       <if test="aname != null">
         aname,
       </if>
+      <if test="tpcId != null">
+        tpc_id,
+      </if>
+      <if test="processStatus != null">
+        process_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -237,6 +144,9 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=INTEGER},
       </if>
+      <if test="chooseType != null">
+        #{chooseType,jdbcType=INTEGER},
+      </if>
       <if test="paymentType != null">
         #{paymentType,jdbcType=INTEGER},
       </if>
@@ -252,6 +162,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="applicationAmount != null">
+        #{applicationAmount,jdbcType=DECIMAL},
+      </if>
       <if test="paymentAmount != null">
         #{paymentAmount,jdbcType=DECIMAL},
       </if>
@@ -261,127 +174,25 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="tpcId != null">
-        #{tpcId,jdbcType=INTEGER},
-      </if>
-      <if test="applicationAmount != null">
-        #{applicationAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chooseType != null">
-        #{chooseType,jdbcType=INTEGER},
-      </if>
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
       <if test="aname != null">
         #{aname,jdbcType=VARCHAR},
       </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
-    -->
-    select count(*) from t_order_payment
-    <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 Tue Jul 07 11:46:04 CST 2020.
-    -->
-    update t_order_payment
-    <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.nodeId != null">
-        node_id = #{record.nodeId,jdbcType=INTEGER},
-      </if>
-      <if test="record.paymentType != null">
-        payment_type = #{record.paymentType,jdbcType=INTEGER},
-      </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.quantity != null">
-        quantity = #{record.quantity,jdbcType=INTEGER},
-      </if>
-      <if test="record.paymentStatus != null">
-        payment_status = #{record.paymentStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.paymentAmount != null">
-        payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.tpcId != null">
-        tpc_id = #{record.tpcId,jdbcType=INTEGER},
-      </if>
-      <if test="record.applicationAmount != null">
-        application_amount = #{record.applicationAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.chooseType != null">
-        choose_type = #{record.chooseType,jdbcType=INTEGER},
-      </if>
-      <if test="record.aid != null">
-        aid = #{record.aid,jdbcType=VARCHAR},
+      <if test="tpcId != null">
+        #{tpcId,jdbcType=INTEGER},
       </if>
-      <if test="record.aname != null">
-        aname = #{record.aname,jdbcType=VARCHAR},
+      <if test="processStatus != null">
+        #{processStatus,jdbcType=INTEGER},
       </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 Tue Jul 07 11:46:04 CST 2020.
-    -->
-    update t_order_payment
-    set id = #{record.id,jdbcType=INTEGER},
-      tid = #{record.tid,jdbcType=INTEGER},
-      node_id = #{record.nodeId,jdbcType=INTEGER},
-      payment_type = #{record.paymentType,jdbcType=INTEGER},
-      company_name = #{record.companyName,jdbcType=VARCHAR},
-      quantity = #{record.quantity,jdbcType=INTEGER},
-      payment_status = #{record.paymentStatus,jdbcType=INTEGER},
-      status = #{record.status,jdbcType=INTEGER},
-      payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      tpc_id = #{record.tpcId,jdbcType=INTEGER},
-      application_amount = #{record.applicationAmount,jdbcType=DECIMAL},
-      choose_type = #{record.chooseType,jdbcType=INTEGER},
-      aid = #{record.aid,jdbcType=VARCHAR},
-      aname = #{record.aname,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
+    </trim>
+  </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderPayment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     update t_order_payment
     <set>
@@ -391,6 +202,9 @@
       <if test="nodeId != null">
         node_id = #{nodeId,jdbcType=INTEGER},
       </if>
+      <if test="chooseType != null">
+        choose_type = #{chooseType,jdbcType=INTEGER},
+      </if>
       <if test="paymentType != null">
         payment_type = #{paymentType,jdbcType=INTEGER},
       </if>
@@ -404,7 +218,10 @@
         payment_status = #{paymentStatus,jdbcType=INTEGER},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="applicationAmount != null">
+        application_amount = #{applicationAmount,jdbcType=DECIMAL},
       </if>
       <if test="paymentAmount != null">
         payment_amount = #{paymentAmount,jdbcType=DECIMAL},
@@ -415,21 +232,18 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="tpcId != null">
-        tpc_id = #{tpcId,jdbcType=INTEGER},
-      </if>
-      <if test="applicationAmount != null">
-        application_amount = #{applicationAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chooseType != null">
-        choose_type = #{chooseType,jdbcType=INTEGER},
-      </if>
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
       <if test="aname != null">
         aname = #{aname,jdbcType=VARCHAR},
       </if>
+      <if test="tpcId != null">
+        tpc_id = #{tpcId,jdbcType=INTEGER},
+      </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -437,24 +251,25 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 07 11:46:04 CST 2020.
+      This element was generated on Tue Jul 20 09:16:18 CST 2021.
     -->
     update t_order_payment
     set tid = #{tid,jdbcType=INTEGER},
       node_id = #{nodeId,jdbcType=INTEGER},
+      choose_type = #{chooseType,jdbcType=INTEGER},
       payment_type = #{paymentType,jdbcType=INTEGER},
       company_name = #{companyName,jdbcType=VARCHAR},
       quantity = #{quantity,jdbcType=INTEGER},
       payment_status = #{paymentStatus,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
+      application_amount = #{applicationAmount,jdbcType=DECIMAL},
       payment_amount = #{paymentAmount,jdbcType=DECIMAL},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      tpc_id = #{tpcId,jdbcType=INTEGER},
-      application_amount = #{applicationAmount,jdbcType=DECIMAL},
-      choose_type = #{chooseType,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
-      aname = #{aname,jdbcType=VARCHAR}
+      aname = #{aname,jdbcType=VARCHAR},
+      tpc_id = #{tpcId,jdbcType=INTEGER},
+      process_status = #{processStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -605,7 +420,7 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
   <update id="updateByids">
   	 update t_order_payment set status=3
 	 where id in 
-  <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+  <foreach close=")" collection="list" index="" item="item" open="(" separator=",">
        #{item}
      </foreach>
   </update>

+ 25 - 48
src/main/java/com/goafanti/common/model/PaymentLog.java

@@ -6,54 +6,49 @@ import java.io.Serializable;
 public class PaymentLog implements Serializable {
     /**
 	 * Database Column Remarks: 编号 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.id
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private Integer id;
 	/**
-	 * Database Column Remarks: 项目id This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.pid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * Database Column Remarks: 付款编号 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.pid
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private Integer pid;
 	/**
 	 * Database Column Remarks: 0发起 1通过 2驳回 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private Integer status;
 	/**
 	 * Database Column Remarks: 备注 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.remarks
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * Database Column Remarks: 操作人 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.aid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private String aid;
 	/**
 	 * Database Column Remarks: 操作名称 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.aname
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private String aname;
 	/**
 	 * Database Column Remarks: 创建时间 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.create_time
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private Date createTime;
 	/**
-	 * Database Column Remarks: 流程状态 0发起 1咨询师管理员 2财务 This field was generated by MyBatis Generator. This field corresponds to the database column payment_log.process_status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
-	 */
-	private Integer processStatus;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.id
 	 * @return  the value of payment_log.id
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -62,7 +57,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.id
 	 * @param id  the value for payment_log.id
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -71,7 +66,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.pid
 	 * @return  the value of payment_log.pid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public Integer getPid() {
 		return pid;
@@ -80,7 +75,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.pid
 	 * @param pid  the value for payment_log.pid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setPid(Integer pid) {
 		this.pid = pid;
@@ -89,7 +84,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.status
 	 * @return  the value of payment_log.status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -98,7 +93,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.status
 	 * @param status  the value for payment_log.status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -107,7 +102,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.remarks
 	 * @return  the value of payment_log.remarks
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -116,7 +111,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.remarks
 	 * @param remarks  the value for payment_log.remarks
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -125,7 +120,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.aid
 	 * @return  the value of payment_log.aid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -134,7 +129,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.aid
 	 * @param aid  the value for payment_log.aid
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -143,7 +138,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.aname
 	 * @return  the value of payment_log.aname
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public String getAname() {
 		return aname;
@@ -152,7 +147,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.aname
 	 * @param aname  the value for payment_log.aname
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setAname(String aname) {
 		this.aname = aname == null ? null : aname.trim();
@@ -161,7 +156,7 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.create_time
 	 * @return  the value of payment_log.create_time
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -170,33 +165,15 @@ public class PaymentLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.create_time
 	 * @param createTime  the value for payment_log.create_time
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column payment_log.process_status
-	 * @return  the value of payment_log.process_status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
-	 */
-	public Integer getProcessStatus() {
-		return processStatus;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column payment_log.process_status
-	 * @param processStatus  the value for payment_log.process_status
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
-	 */
-	public void setProcessStatus(Integer processStatus) {
-		this.processStatus = processStatus;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table payment_log
-	 * @mbg.generated  Mon Jul 19 17:20:00 CST 2021
+	 * @mbg.generated  Tue Jul 20 09:16:06 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -211,7 +188,6 @@ public class PaymentLog implements Serializable {
 		sb.append(", aid=").append(aid);
 		sb.append(", aname=").append(aname);
 		sb.append(", createTime=").append(createTime);
-		sb.append(", processStatus=").append(processStatus);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();
@@ -224,6 +200,7 @@ public class PaymentLog implements Serializable {
     	this.aid=aid;
     	this.aname=aname;
     }
+	public PaymentLog() {}
     
    
 }

+ 177 - 116
src/main/java/com/goafanti/common/model/TOrderPayment.java

@@ -2,94 +2,105 @@ package com.goafanti.common.model;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.io.Serializable;
 
-public class TOrderPayment {
+public class TOrderPayment implements Serializable {
 
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.id
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer id;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 项目编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tid
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer tid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.node_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 节点编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.node_id
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer nodeId;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 支付种类 0第三方 1催款 2官费 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	private Integer chooseType;
+	/**
+	 * Database Column Remarks: 支付类型 0第三方 1官费(废弃) This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_type
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer paymentType;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.company_name
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 公司名称 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.company_name
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private String companyName;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.quantity
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 数量 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.quantity
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer quantity;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 支付状态 0半款 1全款 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_status
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer paymentStatus;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 状态 0审核 1驳回 2待支付 3已支付 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.status
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Integer status;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 申请金额 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	private BigDecimal applicationAmount;
+	/**
+	 * Database Column Remarks: 支付金额 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private BigDecimal paymentAmount;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.remarks
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 备注 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.remarks
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private String remarks;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.create_time
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 创建时间 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.create_time
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tpc_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 负责人 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	private Integer tpcId;
+	private String aid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 负责名称 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	private BigDecimal applicationAmount;
+	private String aname;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 第三方机构编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	private Integer chooseType;
+	private Integer tpcId;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * Database Column Remarks: 流程状态 0发起 1咨询师管理员 2财务 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.process_status
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	private String aid;
+	private Integer processStatus;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	private String aname;
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
 	 * @return  the value of t_order_payment.id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -98,7 +109,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
 	 * @param id  the value for t_order_payment.id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -107,7 +118,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
 	 * @return  the value of t_order_payment.tid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getTid() {
 		return tid;
@@ -116,7 +127,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tid
 	 * @param tid  the value for t_order_payment.tid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -125,7 +136,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.node_id
 	 * @return  the value of t_order_payment.node_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getNodeId() {
 		return nodeId;
@@ -134,16 +145,34 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.node_id
 	 * @param nodeId  the value for t_order_payment.node_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setNodeId(Integer nodeId) {
 		this.nodeId = nodeId;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
+	 * @return  the value of t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	public Integer getChooseType() {
+		return chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
+	 * @param chooseType  the value for t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	public void setChooseType(Integer chooseType) {
+		this.chooseType = chooseType;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_type
 	 * @return  the value of t_order_payment.payment_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getPaymentType() {
 		return paymentType;
@@ -152,7 +181,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_type
 	 * @param paymentType  the value for t_order_payment.payment_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setPaymentType(Integer paymentType) {
 		this.paymentType = paymentType;
@@ -161,7 +190,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.company_name
 	 * @return  the value of t_order_payment.company_name
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -170,16 +199,16 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.company_name
 	 * @param companyName  the value for t_order_payment.company_name
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
+		this.companyName = companyName == null ? null : companyName.trim();
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.quantity
 	 * @return  the value of t_order_payment.quantity
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -188,7 +217,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.quantity
 	 * @param quantity  the value for t_order_payment.quantity
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -197,7 +226,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_status
 	 * @return  the value of t_order_payment.payment_status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getPaymentStatus() {
 		return paymentStatus;
@@ -206,7 +235,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_status
 	 * @param paymentStatus  the value for t_order_payment.payment_status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setPaymentStatus(Integer paymentStatus) {
 		this.paymentStatus = paymentStatus;
@@ -215,7 +244,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.status
 	 * @return  the value of t_order_payment.status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -224,16 +253,34 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.status
 	 * @param status  the value for t_order_payment.status
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
+	 * @return  the value of t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	public BigDecimal getApplicationAmount() {
+		return applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
+	 * @param applicationAmount  the value for t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
+	 */
+	public void setApplicationAmount(BigDecimal applicationAmount) {
+		this.applicationAmount = applicationAmount;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_amount
 	 * @return  the value of t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -242,7 +289,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
 	 * @param paymentAmount  the value for t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -251,7 +298,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.remarks
 	 * @return  the value of t_order_payment.remarks
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -260,16 +307,16 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.remarks
 	 * @param remarks  the value for t_order_payment.remarks
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setRemarks(String remarks) {
-		this.remarks = remarks;
+		this.remarks = remarks == null ? null : remarks.trim();
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.create_time
 	 * @return  the value of t_order_payment.create_time
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -278,102 +325,116 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.create_time
 	 * @param createTime  the value for t_order_payment.create_time
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tpc_id
-	 * @return  the value of t_order_payment.tpc_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
+	 * @return  the value of t_order_payment.aid
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public Integer getTpcId() {
-		return tpcId;
+	public String getAid() {
+		return aid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tpc_id
-	 * @param tpcId  the value for t_order_payment.tpc_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
+	 * @param aid  the value for t_order_payment.aid
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public void setTpcId(Integer tpcId) {
-		this.tpcId = tpcId;
+	public void setAid(String aid) {
+		this.aid = aid == null ? null : aid.trim();
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
-	 * @return  the value of t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
+	 * @return  the value of t_order_payment.aname
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public BigDecimal getApplicationAmount() {
-		return applicationAmount;
+	public String getAname() {
+		return aname;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
-	 * @param applicationAmount  the value for t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
+	 * @param aname  the value for t_order_payment.aname
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public void setApplicationAmount(BigDecimal applicationAmount) {
-		this.applicationAmount = applicationAmount;
+	public void setAname(String aname) {
+		this.aname = aname == null ? null : aname.trim();
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
-	 * @return  the value of t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tpc_id
+	 * @return  the value of t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public Integer getChooseType() {
-		return chooseType;
+	public Integer getTpcId() {
+		return tpcId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
-	 * @param chooseType  the value for t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tpc_id
+	 * @param tpcId  the value for t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public void setChooseType(Integer chooseType) {
-		this.chooseType = chooseType;
+	public void setTpcId(Integer tpcId) {
+		this.tpcId = tpcId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
-	 * @return  the value of t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.process_status
+	 * @return  the value of t_order_payment.process_status
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public String getAid() {
-		return aid;
+	public Integer getProcessStatus() {
+		return processStatus;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
-	 * @param aid  the value for t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.process_status
+	 * @param processStatus  the value for t_order_payment.process_status
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public void setAid(String aid) {
-		this.aid = aid;
+	public void setProcessStatus(Integer processStatus) {
+		this.processStatus = processStatus;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
-	 * @return  the value of t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
+	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
 	 */
-	public String getAname() {
-		return aname;
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(getClass().getSimpleName());
+		sb.append(" [");
+		sb.append("Hash = ").append(hashCode());
+		sb.append(", id=").append(id);
+		sb.append(", tid=").append(tid);
+		sb.append(", nodeId=").append(nodeId);
+		sb.append(", chooseType=").append(chooseType);
+		sb.append(", paymentType=").append(paymentType);
+		sb.append(", companyName=").append(companyName);
+		sb.append(", quantity=").append(quantity);
+		sb.append(", paymentStatus=").append(paymentStatus);
+		sb.append(", status=").append(status);
+		sb.append(", applicationAmount=").append(applicationAmount);
+		sb.append(", paymentAmount=").append(paymentAmount);
+		sb.append(", remarks=").append(remarks);
+		sb.append(", createTime=").append(createTime);
+		sb.append(", aid=").append(aid);
+		sb.append(", aname=").append(aname);
+		sb.append(", tpcId=").append(tpcId);
+		sb.append(", processStatus=").append(processStatus);
+		sb.append(", serialVersionUID=").append(serialVersionUID);
+		sb.append("]");
+		return sb.toString();
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
-	 * @param aname  the value for t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setAname(String aname) {
-		this.aname = aname;
-	}
-	
 	public String getAuditNotes() {
 		return auditNotes;
 	}

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

@@ -197,13 +197,15 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	@Override
 	public int updateSuperAdminReject(Integer id) {
 		TOrderOutsource tto=tOrderOutsourceMapper.selectByPrimaryKey(id);
+		TOrderTask tt=new TOrderTask();
+		tt.setId(tto.getTid());
 		//start_type 0外包 1供应商
 		if (tto.getStartType()==0) {
-			TOrderTask tt=new TOrderTask();
-			tt.setId(tto.getTid());
 			tt.setOutsource(0);
-			tOrderTaskMapper.updateByPrimaryKeySelective(tt);
+		}else {
+			tt.setCheckStatus(0);
 		}
+		tOrderTaskMapper.updateByPrimaryKeySelective(tt);
 		OutsourceLog ol=new OutsourceLog();
 		ol.setTid(tto.getTid());
 		ol.setAid(TokenManager.getAdminId());

+ 3 - 0
src/main/java/com/goafanti/organization/bo/OutPaymentLog.java

@@ -8,6 +8,9 @@ public class OutPaymentLog extends PaymentLog{
     public OutPaymentLog(Integer pid, Integer status, String remarks, String aid, String aname) {
 		super(pid, status, remarks, aid, aname);
 	}
+    public OutPaymentLog() {
+		
+	}
 
 	/**
 	 * 

+ 2 - 5
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -4,7 +4,6 @@ package com.goafanti.organization.controller;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -25,13 +24,11 @@ import com.goafanti.common.model.SoftWritingPrice;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.organization.bo.InputNodeList;
 import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.bo.InuptFinancialPayment;
 import com.goafanti.organization.bo.ThirdPartyError;
-import com.goafanti.organization.bo.outPaymentList;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
 
@@ -288,7 +285,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			return res;
 		}
 		if (i==-2) {
-			res.getError().add(buildError("官费数量超出限制,请核对可输入数量。","官费数量超出限制,请核对可输入数量。"));
+			res.getError().add(buildError("官费数量不能超过项目数量。","官费数量不能超过项目数量。"));
 			return res;
 		}
 		if (!res.getError().isEmpty()) {
@@ -707,7 +704,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	@RequestMapping(value = "/paymentExamine", method = RequestMethod.POST)
 	public Result paymentExamine(PaymentLog in){
 		Result res= new Result();
-		res.data(thirdPartyCompanyService.paymentExamine(in));
+		res.data(thirdPartyCompanyService.pushPaymentExamine(in));
 		return res;
 		
 	}

+ 2 - 1
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -114,7 +114,8 @@ public interface ThirdPartyCompanyService {
 
 	boolean checkOfficialFeePrice(OfficialFeePrice o);
 
-	int paymentExamine(PaymentLog in);
+	int pushPaymentExamine(PaymentLog in);
+
 
 
 	

+ 3 - 10
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -270,6 +270,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public int addOrderPayment(TOrderPayment p) {
 		p.setStatus(0);
+		p.setProcessStatus(0);
 		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		p.setAid(a.getId());
 		p.setAname(a.getName());
@@ -303,15 +304,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			op.setInitialUnitPrice(pn.getUnitPrice().toString());
 			op.setInitialPaymentAmount(pn.getPartyAmount().toString());
 		}else if (type==2) {
-			TOrderTask tk=tOrderTaskMapper.selectByPrimaryKey(tp.getTid());
-			OrderOutsourceDtails out=tOrderOutsourceMapper.selectByOrderNo(null, tp.getTid().toString());
-			OfficialFeePrice of=officialFeePriceMapper.selectBytype(out.getPatentNameType());
-			 if (tk.getCostReduction()==0) {
-				op.setInitialUnitPrice(of.getAmount().toString());
-			}else {
-				op.setInitialUnitPrice(of.getProportion85().toString());
-			}
-			 op.setInitialTotalAmount(new BigDecimal( op.getInitialUnitPrice()).multiply(new BigDecimal(op.getInitialQuantity())).toString());
+			
 		}
 	if (!TokenManager.hasRole(AFTConstants.FINANCE)&&
 			!TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)&&
@@ -965,7 +958,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 
 	@Override
-	public int paymentExamine(PaymentLog in) {
+	public int pushPaymentExamine(PaymentLog in) {
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
 		in.setAid(TokenManager.getAdminId());
 		in.setAname(a.getName());