Bladeren bron

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 jaren geleden
bovenliggende
commit
b8a246cd36

+ 2 - 2
src/main/java/com/goafanti/common/dao/CompanyLibraryMapper.java

@@ -73,9 +73,9 @@ public interface CompanyLibraryMapper {
 	 */
 	int updateByPrimaryKey(CompanyLibrary record);
 
-	List<CompanyLibrary> selectVague(@Param("name")String name, @Param("type")Integer type);
+	List<CompanyLibrary> selectVague(@Param("name")String name, @Param("type")Integer type, @Param("aid")String aid);
 
 	int insertSelectiveGetId(CompanyLibrary c);
 
-	List<Integer> selectName(String companyName);
+	List<Integer> selectName(@Param("companyName")String companyName, @Param("aid")String aid);
 }

+ 90 - 87
src/main/java/com/goafanti/common/dao/FinancialPaymentMapper.java

@@ -1,88 +1,91 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.FinancialPayment;
-import com.goafanti.common.model.FinancialPaymentExample;
-import com.goafanti.organization.bo.NoticeInformationBo;
-import com.goafanti.organization.bo.outFinancialPayment;
-
-import java.math.BigDecimal;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface FinancialPaymentMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	long countByExample(FinancialPaymentExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int deleteByExample(FinancialPaymentExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int insert(FinancialPayment record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int insertSelective(FinancialPayment record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	List<FinancialPayment> selectByExample(FinancialPaymentExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	FinancialPayment selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") FinancialPayment record,
-			@Param("example") FinancialPaymentExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int updateByExample(@Param("record") FinancialPayment record, @Param("example") FinancialPaymentExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int updateByPrimaryKeySelective(FinancialPayment record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
-	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
-	 */
-	int updateByPrimaryKey(FinancialPayment record);
-
-	List<outFinancialPayment> selectByPid(Integer id);
-
-
-	NoticeInformationBo selectBypidGetNotice(Integer pid);
-
-	void updateOrderCost(@Param("pid")Integer pid, @Param("partyAmount")BigDecimal partyAmount);
-	
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.FinancialPayment;
+import com.goafanti.common.model.FinancialPaymentExample;
+import com.goafanti.organization.bo.InuptFinancialPayment;
+import com.goafanti.organization.bo.NoticeInformationBo;
+import com.goafanti.organization.bo.outFinancialPayment;
+
+import java.math.BigDecimal;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface FinancialPaymentMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	long countByExample(FinancialPaymentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int deleteByExample(FinancialPaymentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int insert(FinancialPayment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int insertSelective(FinancialPayment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	List<FinancialPayment> selectByExample(FinancialPaymentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	FinancialPayment selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") FinancialPayment record,
+			@Param("example") FinancialPaymentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int updateByExample(@Param("record") FinancialPayment record, @Param("example") FinancialPaymentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int updateByPrimaryKeySelective(FinancialPayment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table financial_payment
+	 * @mbg.generated  Tue Jun 16 16:45:09 CST 2020
+	 */
+	int updateByPrimaryKey(FinancialPayment record);
+
+	List<outFinancialPayment> selectByPid(Integer id);
+
+
+	NoticeInformationBo selectBypidGetNotice(Integer pid);
+
+	void updateOrderCost(@Param("pid")Integer pid, @Param("partyAmount")BigDecimal partyAmount);
+
+	int insertSelectiveGetId(InuptFinancialPayment f);
+	
 }

+ 101 - 99
src/main/java/com/goafanti/common/dao/TTaskMidMapper.java

@@ -1,100 +1,102 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TTaskMid;
-import com.goafanti.common.model.TTaskMidExample;
-
-import java.math.BigDecimal;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TTaskMidMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    long countByExample(TTaskMidExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int deleteByExample(TTaskMidExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int insert(TTaskMid record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int insertSelective(TTaskMid record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    List<TTaskMid> selectByExample(TTaskMidExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    TTaskMid selectByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int updateByExampleSelective(@Param("record") TTaskMid record, @Param("example") TTaskMidExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int updateByExample(@Param("record") TTaskMid record, @Param("example") TTaskMidExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int updateByPrimaryKeySelective(TTaskMid record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_task_mid
-     *
-     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
-     */
-    int updateByPrimaryKey(TTaskMid record);
-
-	int updateCostAmount(@Param("tid")Integer tid, @Param("costAmount")BigDecimal costAmount, @Param("type")Integer type);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TTaskMid;
+import com.goafanti.common.model.TTaskMidExample;
+
+import java.math.BigDecimal;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TTaskMidMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    long countByExample(TTaskMidExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int deleteByExample(TTaskMidExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int insert(TTaskMid record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int insertSelective(TTaskMid record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    List<TTaskMid> selectByExample(TTaskMidExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    TTaskMid selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") TTaskMid record, @Param("example") TTaskMidExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int updateByExample(@Param("record") TTaskMid record, @Param("example") TTaskMidExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int updateByPrimaryKeySelective(TTaskMid record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_task_mid
+     *
+     * @mbg.generated Thu Jun 18 15:57:30 CST 2020
+     */
+    int updateByPrimaryKey(TTaskMid record);
+
+	int updateCostAmount(@Param("tid")Integer tid, @Param("costAmount")BigDecimal costAmount, @Param("type")Integer type);
+
+	int updatePaymentAmount(@Param("tid")Integer tid, @Param("paymentAmount")BigDecimal paymentAmount, @Param("type")Integer type);
 }

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

@@ -328,11 +328,14 @@
   <select id="selectName" resultType="java.lang.Integer">
   select id from  company_library
     where  company_name = #{companyName,jdbcType=VARCHAR}
+    <if test="aid != null">
+    and aid= #{aid}
+    </if>
   </select>
   
   <select id="selectVague" resultType="com.goafanti.common.model.CompanyLibrary">
   select id,company_name companyName from  company_library
     where  company_name like concat('%',#{name,jdbcType=VARCHAR},'%')
-    and type= #{type}
+    and type= #{type} and aid= #{aid}
   </select>
 </mapper>

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

@@ -1,304 +1,346 @@
-<?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.FinancialPaymentMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.FinancialPayment">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="pid" jdbcType="INTEGER" property="pid" />
-    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
-    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
-    <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 Tue Jun 16 16:45:09 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 Jun 16 16:45:09 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 Jun 16 16:45:09 CST 2020.
-    -->
-    id, pid, party_amount, payment_time, create_time
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from financial_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 Jun 16 16:45:09 CST 2020.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from financial_payment
-    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 Tue Jun 16 16:45:09 CST 2020.
-    -->
-    delete from financial_payment
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    delete from financial_payment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.FinancialPayment">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    insert into financial_payment (id, pid, party_amount, 
-      payment_time, create_time)
-    values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{partyAmount,jdbcType=DECIMAL}, 
-      #{paymentTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.FinancialPayment">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    insert into financial_payment
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="pid != null">
-        pid,
-      </if>
-      <if test="partyAmount != null">
-        party_amount,
-      </if>
-      <if test="paymentTime != null">
-        payment_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="pid != null">
-        #{pid,jdbcType=INTEGER},
-      </if>
-      <if test="partyAmount != null">
-        #{partyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="paymentTime != null">
-        #{paymentTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    select count(*) from financial_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 Jun 16 16:45:09 CST 2020.
-    -->
-    update financial_payment
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pid != null">
-        pid = #{record.pid,jdbcType=INTEGER},
-      </if>
-      <if test="record.partyAmount != null">
-        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.paymentTime != null">
-        payment_time = #{record.paymentTime,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 Tue Jun 16 16:45:09 CST 2020.
-    -->
-    update financial_payment
-    set id = #{record.id,jdbcType=INTEGER},
-      pid = #{record.pid,jdbcType=INTEGER},
-      party_amount = #{record.partyAmount,jdbcType=DECIMAL},
-      payment_time = #{record.paymentTime,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.FinancialPayment">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    update financial_payment
-    <set>
-      <if test="pid != null">
-        pid = #{pid,jdbcType=INTEGER},
-      </if>
-      <if test="partyAmount != null">
-        party_amount = #{partyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="paymentTime != null">
-        payment_time = #{paymentTime,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.FinancialPayment">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 16:45:09 CST 2020.
-    -->
-    update financial_payment
-    set pid = #{pid,jdbcType=INTEGER},
-      party_amount = #{partyAmount,jdbcType=DECIMAL},
-      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <select id="selectByPid" resultType="com.goafanti.organization.bo.outFinancialPayment">
-  select id,pid,party_amount partyAmount,date_format(payment_time,'%Y-%m-%d') paymentTimes 
-  from financial_payment where pid= #{id}
-  </select>
-  <select id="selectBypidGetNotice" resultType="com.goafanti.organization.bo.NoticeInformationBo">
-	select b.id pid,d.order_no orderNo,d.salesman_id salesmanId,d.salesman_name salesmanName , d.buyer_name buyerName,
-	d.finance_id financeId,d.finance_name financeName ,sa.email salesmanEmail,fa.email financeEmail
-	from  t_order_payment b left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no
-	left join admin sa on d.salesman_id=sa.id left join admin fa on d.finance_id=fa.id
-	where b.id= #{pid}
-  </select>
-  
-  <select id="updateOrderCost">
-  update t_order_mid x ,(select a.id,a.tid,b.order_no from t_order_payment a left join t_order_task b on a.tid=b.id 
-	where a.id=#{pid})y,t_task_mid z set x.cost_amount= x.cost_amount+ #{partyAmount}, z.party_amount=z.party_amount+ #{partyAmount}
-  where x.order_no=y.order_no and y.tid=z.tid
-  </select>
-  
+<?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.FinancialPaymentMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.FinancialPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
+    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
+    <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 Tue Jun 16 16:45:09 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 Jun 16 16:45:09 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 Jun 16 16:45:09 CST 2020.
+    -->
+    id, pid, party_amount, payment_time, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from financial_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 Jun 16 16:45:09 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from financial_payment
+    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 Tue Jun 16 16:45:09 CST 2020.
+    -->
+    delete from financial_payment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    delete from financial_payment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.FinancialPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    insert into financial_payment (id, pid, party_amount, 
+      payment_time, create_time)
+    values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{partyAmount,jdbcType=DECIMAL}, 
+      #{paymentTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.FinancialPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    insert into financial_payment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="partyAmount != null">
+        party_amount,
+      </if>
+      <if test="paymentTime != null">
+        payment_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="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="partyAmount != null">
+        #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  
+  
+  <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.FinancialPayment" useGeneratedKeys="true">
+    insert into financial_payment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="partyAmount != null">
+        party_amount,
+      </if>
+      <if test="paymentTime != null">
+        payment_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="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="partyAmount != null">
+        #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+     <selectKey keyProperty="id" order="AFTER" resultType="int">
+        SELECT LAST_INSERT_ID()
+    </selectKey>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.FinancialPaymentExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    select count(*) from financial_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 Jun 16 16:45:09 CST 2020.
+    -->
+    update financial_payment
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=INTEGER},
+      </if>
+      <if test="record.partyAmount != null">
+        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.paymentTime != null">
+        payment_time = #{record.paymentTime,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 Tue Jun 16 16:45:09 CST 2020.
+    -->
+    update financial_payment
+    set id = #{record.id,jdbcType=INTEGER},
+      pid = #{record.pid,jdbcType=INTEGER},
+      party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      payment_time = #{record.paymentTime,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.FinancialPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    update financial_payment
+    <set>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="partyAmount != null">
+        party_amount = #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentTime != null">
+        payment_time = #{paymentTime,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.FinancialPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 16:45:09 CST 2020.
+    -->
+    update financial_payment
+    set pid = #{pid,jdbcType=INTEGER},
+      party_amount = #{partyAmount,jdbcType=DECIMAL},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectByPid" resultType="com.goafanti.organization.bo.outFinancialPayment">
+  select id,pid,party_amount partyAmount,date_format(payment_time,'%Y-%m-%d') paymentTimes 
+  from financial_payment where pid= #{id}
+  </select>
+  <select id="selectBypidGetNotice" resultType="com.goafanti.organization.bo.NoticeInformationBo">
+	select b.id pid,d.order_no orderNo,d.salesman_id salesmanId,d.salesman_name salesmanName , d.buyer_name buyerName,
+	d.finance_id financeId,d.finance_name financeName ,sa.email salesmanEmail,fa.email financeEmail
+	from  t_order_payment b left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no
+	left join admin sa on d.salesman_id=sa.id left join admin fa on d.finance_id=fa.id
+	where b.id= #{pid}
+  </select>
+  
+  <select id="updateOrderCost">
+  update t_order_mid x ,(select a.id,a.tid,b.order_no from t_order_payment a left join t_order_task b on a.tid=b.id 
+	where a.id=#{pid})y,t_task_mid z set x.cost_amount= x.cost_amount+ #{partyAmount}, z.party_amount=z.party_amount+ #{partyAmount}
+  where x.order_no=y.order_no and y.tid=z.tid
+  </select>
+  
 </mapper>

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

@@ -595,7 +595,7 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
 	  b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount,d.finance_name financeName ,c.order_no orderNo
 	  ,a.application_amount applicationAmount
 	 from t_order_payment a left join payment_node b on a.node_id=b.id
-	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where 1=1
+	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where a.status !=4
 	 <if test="tpcId != null">
 	 and a.tpc_id= #{tpcId}
 	 </if>

File diff suppressed because it is too large
+ 1800 - 1800
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml


+ 306 - 296
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -1,297 +1,307 @@
-<?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.TTaskMidMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TTaskMid">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="tid" jdbcType="INTEGER" property="tid" />
-    <result column="cost_amount" jdbcType="DECIMAL" property="costAmount" />
-    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
-    <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 Thu Jun 18 15:57:30 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 Thu Jun 18 15:57:30 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 Thu Jun 18 15:57:30 CST 2020.
-    -->
-    id, tid, cost_amount, party_amount, create_time
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TTaskMidExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_task_mid
-    <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 Thu Jun 18 15:57:30 CST 2020.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from t_task_mid
-    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 Thu Jun 18 15:57:30 CST 2020.
-    -->
-    delete from t_task_mid
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TTaskMidExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    delete from t_task_mid
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TTaskMid">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    insert into t_task_mid (id, tid, cost_amount, 
-      party_amount, create_time)
-    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL}, 
-      #{partyAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMid">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    insert into t_task_mid
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="tid != null">
-        tid,
-      </if>
-      <if test="costAmount != null">
-        cost_amount,
-      </if>
-      <if test="partyAmount != null">
-        party_amount,
-      </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="costAmount != null">
-        #{costAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="partyAmount != null">
-        #{partyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TTaskMidExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    select count(*) from t_task_mid
-    <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 Thu Jun 18 15:57:30 CST 2020.
-    -->
-    update t_task_mid
-    <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.costAmount != null">
-        cost_amount = #{record.costAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.partyAmount != null">
-        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
-      </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 Thu Jun 18 15:57:30 CST 2020.
-    -->
-    update t_task_mid
-    set id = #{record.id,jdbcType=INTEGER},
-      tid = #{record.tid,jdbcType=INTEGER},
-      cost_amount = #{record.costAmount,jdbcType=DECIMAL},
-      party_amount = #{record.partyAmount,jdbcType=DECIMAL},
-      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.TTaskMid">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    update t_task_mid
-    <set>
-      <if test="tid != null">
-        tid = #{tid,jdbcType=INTEGER},
-      </if>
-      <if test="costAmount != null">
-        cost_amount = #{costAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="partyAmount != null">
-        party_amount = #{partyAmount,jdbcType=DECIMAL},
-      </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.TTaskMid">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 18 15:57:30 CST 2020.
-    -->
-    update t_task_mid
-    set tid = #{tid,jdbcType=INTEGER},
-      cost_amount = #{costAmount,jdbcType=DECIMAL},
-      party_amount = #{partyAmount,jdbcType=DECIMAL},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  
-  <update id="updateCostAmount">
-   update t_task_mid
-    <if test="type != 0">
-    set cost_amount = cost_amount + #{costAmount,jdbcType=DECIMAL}
-    </if>
-    <if test="type != 1">
-    set cost_amount = cost_amount - #{costAmount,jdbcType=DECIMAL}
-    </if>
-    where tid = #{tid,jdbcType=INTEGER}
-  </update>
+<?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.TTaskMidMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="cost_amount" jdbcType="DECIMAL" property="costAmount" />
+    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
+    <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 Thu Jun 18 15:57:30 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 Thu Jun 18 15:57:30 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 Thu Jun 18 15:57:30 CST 2020.
+    -->
+    id, tid, cost_amount, party_amount, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TTaskMidExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_task_mid
+    <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 Thu Jun 18 15:57:30 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_task_mid
+    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 Thu Jun 18 15:57:30 CST 2020.
+    -->
+    delete from t_task_mid
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TTaskMidExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    delete from t_task_mid
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    insert into t_task_mid (id, tid, cost_amount, 
+      party_amount, create_time)
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL}, 
+      #{partyAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    insert into t_task_mid
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="costAmount != null">
+        cost_amount,
+      </if>
+      <if test="partyAmount != null">
+        party_amount,
+      </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="costAmount != null">
+        #{costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyAmount != null">
+        #{partyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TTaskMidExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    select count(*) from t_task_mid
+    <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 Thu Jun 18 15:57:30 CST 2020.
+    -->
+    update t_task_mid
+    <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.costAmount != null">
+        cost_amount = #{record.costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.partyAmount != null">
+        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      </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 Thu Jun 18 15:57:30 CST 2020.
+    -->
+    update t_task_mid
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      cost_amount = #{record.costAmount,jdbcType=DECIMAL},
+      party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      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.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    update t_task_mid
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="costAmount != null">
+        cost_amount = #{costAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="partyAmount != null">
+        party_amount = #{partyAmount,jdbcType=DECIMAL},
+      </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.TTaskMid">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 18 15:57:30 CST 2020.
+    -->
+    update t_task_mid
+    set tid = #{tid,jdbcType=INTEGER},
+      cost_amount = #{costAmount,jdbcType=DECIMAL},
+      party_amount = #{partyAmount,jdbcType=DECIMAL},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <update id="updateCostAmount">
+   update t_task_mid
+    <if test="type == 0">
+    set cost_amount = cost_amount + #{costAmount,jdbcType=DECIMAL}
+    </if>
+    <if test="type == 1">
+    set cost_amount = cost_amount - #{costAmount,jdbcType=DECIMAL}
+    </if>
+    where tid = #{tid,jdbcType=INTEGER}
+  </update>
+  <update id="updatePaymentAmount">
+  	update t_task_mid
+    <if test="type == 0">
+    set party_amount = party_amount + #{paymentAmount,jdbcType=DECIMAL}
+    </if>
+    <if test="type == 1">
+    set party_amount = party_amount - #{paymentAmount,jdbcType=DECIMAL}
+    </if>
+    where tid = #{tid,jdbcType=INTEGER}
+  </update>
 </mapper>

+ 387 - 375
src/main/java/com/goafanti/common/model/TOrderPayment.java

@@ -1,376 +1,388 @@
-package com.goafanti.common.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class TOrderPayment {
-
-	/**
-	 * 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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	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
-	 */
-	private Integer tpcId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	private BigDecimal applicationAmount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	private Integer chooseType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	private String aname;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
-	 * @return  the value of t_order_payment.id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
-	 * @param id  the value for t_order_payment.id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
-	 * @return  the value of t_order_payment.tid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public Integer getTid() {
-		return tid;
-	}
-
-	/**
-	 * 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
-	 */
-	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_payment.node_id
-	 * @return  the value of t_order_payment.node_id
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public Integer getNodeId() {
-		return nodeId;
-	}
-
-	/**
-	 * 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
-	 */
-	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.payment_type
-	 * @return  the value of t_order_payment.payment_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public Integer getPaymentType() {
-		return paymentType;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setPaymentType(Integer paymentType) {
-		this.paymentType = paymentType;
-	}
-
-	/**
-	 * 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
-	 */
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	/**
-	 * 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
-	 */
-	public Integer getQuantity() {
-		return quantity;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setQuantity(Integer quantity) {
-		this.quantity = quantity;
-	}
-
-	/**
-	 * 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
-	 */
-	public Integer getPaymentStatus() {
-		return paymentStatus;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setPaymentStatus(Integer paymentStatus) {
-		this.paymentStatus = paymentStatus;
-	}
-
-	/**
-	 * 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
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-
-	/**
-	 * 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
-	 */
-	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.payment_amount
-	 * @return  the value of t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public BigDecimal getPaymentAmount() {
-		return paymentAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
-	 * @param paymentAmount  the value for t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setPaymentAmount(BigDecimal paymentAmount) {
-		this.paymentAmount = paymentAmount;
-	}
-
-	/**
-	 * 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
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	/**
-	 * 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
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * 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
-	 */
-	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
-	 */
-	public Integer getTpcId() {
-		return tpcId;
-	}
-
-	/**
-	 * 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
-	 */
-	public void setTpcId(Integer tpcId) {
-		this.tpcId = tpcId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
-	 * @return  the value of t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public BigDecimal getApplicationAmount() {
-		return applicationAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
-	 * @param applicationAmount  the value for t_order_payment.application_amount
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setApplicationAmount(BigDecimal applicationAmount) {
-		this.applicationAmount = applicationAmount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
-	 * @return  the value of t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public Integer getChooseType() {
-		return chooseType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
-	 * @param chooseType  the value for t_order_payment.choose_type
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setChooseType(Integer chooseType) {
-		this.chooseType = chooseType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
-	 * @return  the value of t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
-	 * @param aid  the value for t_order_payment.aid
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setAid(String aid) {
-		this.aid = aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
-	 * @return  the value of t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public String getAname() {
-		return aname;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
-	 * @param aname  the value for t_order_payment.aname
-	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
-	 */
-	public void setAname(String aname) {
-		this.aname = aname;
-	}
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TOrderPayment {
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private Integer tpcId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private BigDecimal applicationAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer chooseType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aname;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
+	 * @return  the value of t_order_payment.id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
+	 * @param id  the value for t_order_payment.id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
+	 * @return  the value of t_order_payment.tid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * 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
+	 */
+	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_payment.node_id
+	 * @return  the value of t_order_payment.node_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getNodeId() {
+		return nodeId;
+	}
+
+	/**
+	 * 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
+	 */
+	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.payment_type
+	 * @return  the value of t_order_payment.payment_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getPaymentType() {
+		return paymentType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setPaymentType(Integer paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setPaymentStatus(Integer paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * 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
+	 */
+	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.payment_amount
+	 * @return  the value of t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
+	 * @param paymentAmount  the value for t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	public Integer getTpcId() {
+		return tpcId;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTpcId(Integer tpcId) {
+		this.tpcId = tpcId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
+	 * @return  the value of t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public BigDecimal getApplicationAmount() {
+		return applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
+	 * @param applicationAmount  the value for t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setApplicationAmount(BigDecimal applicationAmount) {
+		this.applicationAmount = applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
+	 * @return  the value of t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getChooseType() {
+		return chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
+	 * @param chooseType  the value for t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setChooseType(Integer chooseType) {
+		this.chooseType = chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
+	 * @return  the value of t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
+	 * @param aid  the value for t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
+	 * @return  the value of t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAname() {
+		return aname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
+	 * @param aname  the value for t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+	
+	public String getAuditNotes() {
+		return auditNotes;
+	}
+
+	public void setAuditNotes(String auditNotes) {
+		this.auditNotes = auditNotes;
+	}
+
+	private String auditNotes;
+
+	
 }

+ 117 - 0
src/main/java/com/goafanti/order/bo/inuptTaskListBo.java

@@ -0,0 +1,117 @@
+package com.goafanti.order.bo;
+
+public class inuptTaskListBo {
+	private String name;
+	private String orderNo;
+	private String taskId;
+	private Integer taskStatus;
+	private String adminName;
+	private Integer specially;
+	private String depId;
+	private  String contractNo;
+	private Integer projectStatus;
+	private  Integer approval;
+	private Integer outsource;
+	private Integer outsourceStatus;
+	private String startTime;
+	private String endTime;
+	private Integer pageNo;
+	private Integer pageSize;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getTaskId() {
+		return taskId;
+	}
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+	public Integer getTaskStatus() {
+		return taskStatus;
+	}
+	public void setTaskStatus(Integer taskStatus) {
+		this.taskStatus = taskStatus;
+	}
+	public String getAdminName() {
+		return adminName;
+	}
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+	public Integer getSpecially() {
+		return specially;
+	}
+	public void setSpecially(Integer specially) {
+		this.specially = specially;
+	}
+	public String getDepId() {
+		return depId;
+	}
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public Integer getProjectStatus() {
+		return projectStatus;
+	}
+	public void setProjectStatus(Integer projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	public Integer getApproval() {
+		return approval;
+	}
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
+	public Integer getOutsource() {
+		return outsource;
+	}
+	public void setOutsource(Integer outsource) {
+		this.outsource = outsource;
+	}
+	public Integer getOutsourceStatus() {
+		return outsourceStatus;
+	}
+	public void setOutsourceStatus(Integer outsourceStatus) {
+		this.outsourceStatus = outsourceStatus;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	
+}

+ 24 - 7
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -21,6 +21,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.bo.inuptTaskHoursListBo;
+import com.goafanti.order.bo.inuptTaskListBo;
 import com.goafanti.order.service.OrderProjectService;
 
 @RestController
@@ -49,16 +50,13 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 任务派单列表
+	 * 任务派单列表   我的任务,我的外包任务
 	 * specially  0我的任务  1任务派单
 	 */
 	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
-	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,
-			String startTime,String endTime,Integer pageNo,Integer pageSize){
+	public Result orderTaskList(inuptTaskListBo ib){
 		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, 
-				projectStatus,approval, outsource, outsourceStatus,startTime,endTime,pageNo, pageSize));
+		res.setData(orderProjectService.orderTaskList(ib));
 		return res;
 	}
 	
@@ -232,7 +230,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	
 	/**
-	 * 我的任务列表导出xls
+	 * 我的工时列表导出xls
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
@@ -249,4 +247,23 @@ public class OrderProjectApiController extends CertifyApiController {
 	return res;
 		
 	}
+	
+	/**
+	 * 我的任务列表导出xls
+	 * @throws IOException 
+	 */
+	@RequestMapping(value = "/exporProjectList", method = RequestMethod.GET)
+	public Result exporProjectList(HttpServletResponse response,inuptTaskListBo ib) throws IOException{
+		Result res=new Result();
+		try {
+			orderProjectService.exporProjectList( response, ib);
+		} catch (Exception e) {
+			res.getError().add(buildError("格式不正确"));
+			e.printStackTrace();
+			return res;
+		}
+     res.data(1); 
+	return res;
+		
+	}
 }

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

@@ -13,14 +13,14 @@ import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskLogBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.bo.inuptTaskHoursListBo;
+import com.goafanti.order.bo.inuptTaskListBo;
 import com.goafanti.organization.bo.OutPaymentNode;
 
 public interface OrderProjectService {
 
 	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially, String remarks);
 
-	Pagination<TOrderTaskListBo> orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startTime,String endTime,Integer pageNo,Integer pageSize);
+	Pagination<TOrderTaskListBo> orderTaskList(inuptTaskListBo ib);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
 
@@ -55,4 +55,8 @@ public interface OrderProjectService {
 	List<TOrderTaskListBo> splitProjectList(Integer tid);
 
 	void addNoticAndEmail(OutPaymentNode pn, Integer code);
+
+	void exporProjectList(HttpServletResponse response, inuptTaskListBo ib)throws IOException;
+
+
 }

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

@@ -1322,7 +1322,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				paymentNodeMapper.updateByPrimaryKeySelective(pn);
 			}
 		}
-		if (o.getStartType()==1) {
+		if (o.getStartType()==1) {//供应商无需审核
 			o.setRefundStatus(1);
 		}
 		if (o.getId()!=null) {

+ 89 - 19
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -84,6 +84,7 @@ import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskLogBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.bo.inuptTaskHoursListBo;
+import com.goafanti.order.bo.inuptTaskListBo;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderDunProjectType;
@@ -223,25 +224,24 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderTaskListBo> orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startTime,String endTime,Integer pageNo,Integer pageSize) {
+	public Pagination<TOrderTaskListBo> orderTaskList(inuptTaskListBo ib) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if(pageSize==null||pageSize<0)pageSize=10;
-		if(pageNo==null||pageNo<0)pageNo=1;
-		params.put("outsource", outsource==null?0:outsource);
-		if (null!=specially) params.put("specially", specially);
-		if (StringUtils.isNotBlank(name)) params.put("name", name);
-		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
-		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
-		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
-		if (projectStatus !=null ) params.put("projectStatus", projectStatus);
-		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
-		if (approval !=null) params.put("approval", approval);
-		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
-		if (StringUtils.isNotBlank(startTime)) params.put("startTime", startTime);
-		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime);
-		if (null != taskStatus) params.put("taskStatus", taskStatus);
-		if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
+		if(ib.getPageSize()==null||ib.getPageSize()<0)ib.setPageSize(10);
+		if(ib.getPageNo()==null||ib.getPageNo()<0)ib.setPageNo(1);
+		params.put("outsource", ib.getOutsource()==null?0:ib.getOutsource());
+		if (null!=ib.getSpecially()) params.put("specially", ib.getSpecially());
+		if (StringUtils.isNotBlank(ib.getName())) params.put("name", ib.getName());
+		if (StringUtils.isNotBlank(ib.getDepId())) params.put("depId", ib.getDepId());
+		if (StringUtils.isNotBlank(ib.getOrderNo())) params.put("orderNo", ib.getOrderNo());
+		if (StringUtils.isNotBlank(ib.getContractNo())) params.put("contractNo", ib.getContractNo());
+		if (ib.getProjectStatus() !=null ) params.put("projectStatus", ib.getProjectStatus());
+		if (StringUtils.isNotBlank(ib.getTaskId())) params.put("taskId", ib.getTaskId());
+		if (ib.getApproval() !=null) params.put("approval", ib.getApproval());
+		if (StringUtils.isNotBlank(ib.getAdminName())) params.put("adminName", ib.getAdminName());
+		if (StringUtils.isNotBlank(ib.getStartTime())) params.put("startTime", ib.getStartTime());
+		if (StringUtils.isNotBlank(ib.getEndTime())) params.put("endTime", ib.getEndTime());
+		if (null != ib.getTaskStatus()) params.put("taskStatus", ib.getTaskStatus());
+		if (ib.getOutsourceStatus() !=null) params.put("outsourceStatus", ib.getOutsourceStatus());
 		List<String> fids=new ArrayList<>();
 		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
 				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
@@ -259,7 +259,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			params.put("role", 0);
 			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		} 
-		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, pageNo, pageSize);
+		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, ib.getPageNo(), ib.getPageSize());
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
 		for (TOrderTaskListBo t : list) {
 			if(t.getSplitStatus()==1) {
@@ -826,6 +826,76 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<TOrderTaskListBo> splitProjectList(Integer tid) {
 		return tOrderTaskMapper.splitProjectList(tid);
 	}
+
+
+
+	@Override
+	public void exporProjectList(HttpServletResponse response, inuptTaskListBo ib)
+			throws IOException {
+
+		OutputStream out = response.getOutputStream();
+		try {
+			if(ib.getPageSize()==null)ib.setPageSize(99999);
+			String str="项目任务列表";
+			if (ib.getOutsource()!=null&&ib.getOutsource()==1)str="外包项目任务";
+			@SuppressWarnings("unchecked")
+			List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderTaskList(ib).getList();
+    		String[] comment = {"项目编号","项目名称","项目数量","订单编号","合同编号","业务类别","客户名称(软著/下证数)","分配状态",
+    				"项目状态","外包审核","分配时间","订单部门","累计工时","项目金额","成本(万元)","已付(万元)" };
+    		String fileName =str+"记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
+    		//type 0 变更
+    		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,str);
+    		//根据列表编写文档
+    		XSSFSheet sheet =wb.getSheetAt(0);
+    		for (TOrderTaskListBo ob : (List<TOrderTaskListBo>)list) {
+    			//新增一行
+    			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
+    			for (int i = 0; i < comment.length; i++) {
+    				//当前列的只
+    				String o = "";
+    				switch (comment[i]) {
+//    {"项目编号","项目名称","项目数量","订单编号","合同编号","业务类别","客户名称(软著/下证数)","分配状态",
+//    				"项目状态","外包审核","分配时间","订单部门","累计工时","项目金额","成本(万元)","已付(万元)" };
+    				case "项目编号": o = ob.getId().toString(); break;
+    				case "项目名称": o = ob.getTaskName(); break;
+    				case "项目数量": o = ob.getCommodityQuantity().toString(); break;
+    				case "订单编号": o = ob.getOrderNo(); break;
+    				case "合同编号": o = ob.getContractNo(); break;
+    				case "业务类别": o =ob.getCname(); break;
+    				case "客户名称(软著/下证数)": o =ob.getUserName(); 
+    					break;
+    				case "分配状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
+    				case  "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
+    				case "外包审核": o = ob.getOutsource()==1?"是":"否"; break;
+    				case "分配时间": o = ob.getTaskDate(); break;
+    				case "订单部门": o =ob.getDepName(); break; 
+    				case "累计工时": o = ob.getHours().toString(); break;
+    				case "项目金额": o = ob.getCommodityPrice().toString(); break;
+    				case "成本(万元)": o = ob.getCostAmount(); break;
+    				case "已付(万元)": o = ob.getPartyAmount(); break;
+    				default: o = ""; break;
+    				}
+    				XSSFCell c = r.createCell(i);
+    				c.setCellValue(o);
+    			}
+    		}
+    		//返回名称及参数
+			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+			 response.setContentType("application/octet-stream;charset=utf-8");
+    		 // 返回数据流
+			 wb.write(out); 
+			 out.flush();
+			 out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			out.flush(); 
+			 out.close(); 
+		}
+		
+	
+		
+	}
 	
 	
 }

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

@@ -270,7 +270,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
             		ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
             return res;
         }
-		if (null==p.getTid()) {
+		if (null==p.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;
 		}
@@ -352,6 +352,22 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addfinancialPayment(f));
 		return res;
 	}
+	
+	/**
+	 * 删除财务付款
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteFinancialPayment" , method = RequestMethod.POST)
+	public Result deleteFinancialPayment(Integer id) {
+		Result res =new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.deleteFinancialPayment(id));
+		return res;
+	}
 	/**
 	 * 财务付款列表
 	 * @param t
@@ -369,7 +385,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	
 	/**
-	 * 财务付款列表
+	 * 付款列表
 	 * @param t
 	 * @return
 	 */

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

@@ -87,5 +87,7 @@ public interface ThirdPartyCompanyService {
 
 	List<OfficialFeePrice> listOfficialFeePrice(String name);
 
+	int deleteFinancialPayment(Integer id);
+
 
 }

+ 69 - 19
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -28,6 +28,7 @@ import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.SoftWritingPriceMapper;
 import com.goafanti.common.dao.TOrderPaymentMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.dao.TTaskMidMapper;
 import com.goafanti.common.dao.ThirdPartyCompanyMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.CompanyLibrary;
@@ -84,6 +85,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private SoftWritingPriceMapper	softWritingPriceMapper;
 	@Autowired
 	private OfficialFeePriceMapper	officialFeePriceMapper;
+	@Autowired
+	private TTaskMidMapper	tTaskMidMapper;
 	
 	
 
@@ -93,10 +96,11 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if(calculation==null)calculation=0;
 		if (calculation==0) {//0其他 1计算
 			CompanyLibrary c=new CompanyLibrary();
-			List<Integer> list=companyLibraryMapper.selectName(t.getCompanyName());
+			String aid=TokenManager.getAdminId();
+			List<Integer> list=companyLibraryMapper.selectName(t.getCompanyName(),aid);
 			if (list.size()<1) {
 				c.setCompanyName(t.getCompanyName());
-				c.setAid(TokenManager.getAdminId());
+				c.setAid(aid);
 				c.setType(1);//0系统 1录入
 				companyLibraryMapper.insertSelectiveGetId(c);
 				t.setCid(c.getId());
@@ -135,7 +139,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public List<CompanyLibrary> selectVague(String name,Integer type) {
 		if(type==null)type=1;
-		return companyLibraryMapper.selectVague(name,type);
+		return companyLibraryMapper.selectVague(name,type,TokenManager.getAdminId());
 	}
 
 
@@ -193,7 +197,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
 		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
-		PaymentLog pl=new PaymentLog(p.getId(),0,"发起付款",a.getId(),a.getName());
+		PaymentLog pl=new PaymentLog(p.getId(),0,"发起付款:"+p.getRemarks(),a.getId(),a.getName());
 		paymentLogMapper.insertSelective(pl);
 		return 1;
 	}
@@ -209,20 +213,48 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int updateOrderPayment(TOrderPayment p) {
+		TOrderPayment tp=new TOrderPayment();
+		tp.setId(p.getId());
+		tp.setRemarks(p.getRemarks());
+		tp.setStatus(p.getStatus());
 		Integer type=NoticeStatus.PAYMENT_NODE.getCode();
-		if (p.getStatus()==1)type= NoticeStatus.PAYMENT_YES.getCode();
-		else if(p.getStatus()==2)type= NoticeStatus.PAYMENT_NO.getCode();
+		String auditStr="重新发起付款:";
+		if (p.getStatus()==0) {
+			tp.setApplicationAmount(p.getApplicationAmount());
+			tp.setChooseType(p.getChooseType());
+			tp.setPaymentType(p.getPaymentType());
+			tp.setPaymentAmount(p.getPaymentAmount());
+			tp.setQuantity(p.getQuantity());
+			tp.setPaymentStatus(p.getPaymentStatus());
+			NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
+			AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+			addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
+			PaymentLog pl=new PaymentLog(p.getId(),0,auditStr+p.getAuditNotes()==null?"":p.getAuditNotes(),a.getId(),a.getName());
+			paymentLogMapper.insertSelective(pl);
+		}else if (p.getStatus()==1) {
+			type= NoticeStatus.PAYMENT_YES.getCode();
+			tp.setApplicationAmount(p.getApplicationAmount());
+			auditStr="审核通过:";
+		}else if(p.getStatus()==2) {
+			type= NoticeStatus.PAYMENT_NO.getCode();
+			tp.setApplicationAmount(p.getApplicationAmount());
+			auditStr="审核驳回:";
+		}else if (p.getStatus()==3) {
+			tp.setPaymentAmount(p.getPaymentAmount()==null?p.getPaymentAmount():p.getApplicationAmount());
+			confirmPayment(p);
+			auditStr="审核完成";
+		}else if(p.getStatus()==4) {
+			auditStr="付款取消";
+		}
 		if (p.getStatus()!=0) {
 			NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
 			AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			addNoticAndSendEmail(ni,a,type);
-			PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),p.getRemarks(),a.getId(),a.getName());
+			PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),auditStr+p.getAuditNotes()==null?"":p.getAuditNotes(),a.getId(),a.getName());
 			paymentLogMapper.insertSelective(pl);
 		}
-		if (p.getStatus()==3) {
-			confirmPayment(p);
-		}
-		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
+		
+		return tOrderPaymentMapper.updateByPrimaryKeySelective(tp);
 	
 	}
 
@@ -231,7 +263,12 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		//如果确定支付
 			int flag=0;
 			TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
-			ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
+			ThirdPartyCompany tpc=new ThirdPartyCompany();
+			
+			thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
+			if (p.getPaymentAmount()==null) {
+				p.setPaymentAmount(tp.getApplicationAmount());
+			}
 			if (tp.getChooseType()==1) {
 				PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(tp.getNodeId());
 				BigDecimal count=pn.getTotalAmount();
@@ -246,8 +283,14 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				}
 				pn.setStatus(flag);
 				paymentNodeMapper.updateByPrimaryKeySelective(pn);
+				tpc=thirdPartyCompanyMapper.selectByPrimaryKey(pn.getCid());
+			}else {
+				tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 			}
+			TOrderPayment used=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
 			tpc.setPartyAmount(tpc.getPartyAmount().add(p.getPaymentAmount()));
+			tTaskMidMapper.updatePaymentAmount(used.getTid(), tp.getPaymentAmount(), 0);
+			financialPaymentMapper.updateOrderCost(p.getId(),p.getPaymentAmount());
 			thirdPartyCompanyMapper.updateByPrimaryKeySelective(tpc);
 	}
 
@@ -267,11 +310,12 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public int addfinancialPayment(InuptFinancialPayment f) {
 		f.setPaymentTime(DateUtils.StringToDate(f.getPaymentTimes(), AFTConstants.YYYYMMDD));
-		financialPaymentMapper.updateOrderCost(f.getPid(),f.getPartyAmount());
-		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(f.getPid());
-		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_COMPLETE.getCode());
-		return financialPaymentMapper.insertSelective(f);
+//		financialPaymentMapper.updateOrderCost(f.getPid(),f.getPartyAmount());
+//		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(f.getPid());
+//		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+//		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_COMPLETE.getCode());
+		financialPaymentMapper.insertSelectiveGetId(f);
+		return f.getId(); 
 	}
 
 
@@ -450,7 +494,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int addSoftWritingPrice(SoftWritingPrice s) {
-		List<Integer> list=companyLibraryMapper.selectName(s.getCompanyName());
+		List<Integer> list=companyLibraryMapper.selectName(s.getCompanyName(),null);
 		if (list.size()<1) {
 			CompanyLibrary c=new CompanyLibrary();
 			c.setCompanyName(s.getCompanyName());
@@ -470,7 +514,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 	@Override
 	public Integer selectCid(String companyName) {
-			List<Integer> list=companyLibraryMapper.selectName(companyName);
+			List<Integer> list=companyLibraryMapper.selectName(companyName,null);
 			if (list.size()<1) {
 				CompanyLibrary c=new CompanyLibrary();
 				c.setCompanyName(companyName);
@@ -565,6 +609,12 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public int deleteFinancialPayment(Integer id) {
+		return financialPaymentMapper.deleteByPrimaryKey(id);
+	}
+
+