Browse Source

已付款逻辑修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
f85e8d4464

+ 1 - 1
GeneratorConfig.xml

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

+ 98 - 0
src/main/java/com/goafanti/common/dao/OfficialFeePriceMapper.java

@@ -0,0 +1,98 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OfficialFeePrice;
+import com.goafanti.common.model.OfficialFeePriceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OfficialFeePriceMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    long countByExample(OfficialFeePriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int deleteByExample(OfficialFeePriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int insert(OfficialFeePrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int insertSelective(OfficialFeePrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    List<OfficialFeePrice> selectByExample(OfficialFeePriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    OfficialFeePrice selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") OfficialFeePrice record, @Param("example") OfficialFeePriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int updateByExample(@Param("record") OfficialFeePrice record, @Param("example") OfficialFeePriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int updateByPrimaryKeySelective(OfficialFeePrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    int updateByPrimaryKey(OfficialFeePrice record);
+
+	List<OfficialFeePrice> selectListByname(@Param("name")String name);
+}

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

@@ -1,80 +1,80 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.ThirdPartyCompany;
-import com.goafanti.common.model.ThirdPartyCompanyExample;
-import com.goafanti.organization.bo.OutThirdPartyCompany;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface ThirdPartyCompanyMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	long countByExample(ThirdPartyCompanyExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int deleteByExample(ThirdPartyCompanyExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int insert(ThirdPartyCompany record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int insertSelective(ThirdPartyCompany record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	List<ThirdPartyCompany> selectByExample(ThirdPartyCompanyExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	ThirdPartyCompany selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") ThirdPartyCompany record,
-			@Param("example") ThirdPartyCompanyExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int updateByExample(@Param("record") ThirdPartyCompany record, @Param("example") ThirdPartyCompanyExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int updateByPrimaryKeySelective(ThirdPartyCompany record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
-	 */
-	int updateByPrimaryKey(ThirdPartyCompany record);
-
-	List<OutThirdPartyCompany> selectByTid(Integer tid);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.common.model.ThirdPartyCompanyExample;
+import com.goafanti.organization.bo.OutThirdPartyCompany;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ThirdPartyCompanyMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	long countByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int deleteByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int insert(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int insertSelective(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	List<ThirdPartyCompany> selectByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	ThirdPartyCompany selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") ThirdPartyCompany record,
+			@Param("example") ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int updateByExample(@Param("record") ThirdPartyCompany record, @Param("example") ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int updateByPrimaryKeySelective(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	int updateByPrimaryKey(ThirdPartyCompany record);
+
+	List<OutThirdPartyCompany> selectByTid(Integer tid);
 }

+ 326 - 0
src/main/java/com/goafanti/common/mapper/OfficialFeePriceMapper.xml

@@ -0,0 +1,326 @@
+<?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.OfficialFeePriceMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OfficialFeePrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="amount" jdbcType="DECIMAL" property="amount" />
+    <result column="proportion85" jdbcType="DECIMAL" property="proportion85" />
+    <result column="proportion75" jdbcType="DECIMAL" property="proportion75" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <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 Sep 03 15:51:31 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 Sep 03 15:51:31 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 Sep 03 15:51:31 CST 2020.
+    -->
+    id, name, amount, proportion85, proportion75, remarks, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OfficialFeePriceExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from official_fee_price
+    <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 Sep 03 15:51:31 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from official_fee_price
+    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 Sep 03 15:51:31 CST 2020.
+    -->
+    delete from official_fee_price
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OfficialFeePriceExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    delete from official_fee_price
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OfficialFeePrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    insert into official_fee_price (id, name, amount, 
+      proportion85, proportion75, remarks, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, 
+      #{proportion85,jdbcType=DECIMAL}, #{proportion75,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OfficialFeePrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    insert into official_fee_price
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="amount != null">
+        amount,
+      </if>
+      <if test="proportion85 != null">
+        proportion85,
+      </if>
+      <if test="proportion75 != null">
+        proportion75,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="proportion85 != null">
+        #{proportion85,jdbcType=DECIMAL},
+      </if>
+      <if test="proportion75 != null">
+        #{proportion75,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OfficialFeePriceExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    select count(*) from official_fee_price
+    <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 Sep 03 15:51:31 CST 2020.
+    -->
+    update official_fee_price
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.amount != null">
+        amount = #{record.amount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.proportion85 != null">
+        proportion85 = #{record.proportion85,jdbcType=DECIMAL},
+      </if>
+      <if test="record.proportion75 != null">
+        proportion75 = #{record.proportion75,jdbcType=DECIMAL},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </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 Sep 03 15:51:31 CST 2020.
+    -->
+    update official_fee_price
+    set id = #{record.id,jdbcType=INTEGER},
+      name = #{record.name,jdbcType=VARCHAR},
+      amount = #{record.amount,jdbcType=DECIMAL},
+      proportion85 = #{record.proportion85,jdbcType=DECIMAL},
+      proportion75 = #{record.proportion75,jdbcType=DECIMAL},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      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.OfficialFeePrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    update official_fee_price
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        amount = #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="proportion85 != null">
+        proportion85 = #{proportion85,jdbcType=DECIMAL},
+      </if>
+      <if test="proportion75 != null">
+        proportion75 = #{proportion75,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </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.OfficialFeePrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 03 15:51:31 CST 2020.
+    -->
+    update official_fee_price
+    set name = #{name,jdbcType=VARCHAR},
+      amount = #{amount,jdbcType=DECIMAL},
+      proportion85 = #{proportion85,jdbcType=DECIMAL},
+      proportion75 = #{proportion75,jdbcType=DECIMAL},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectListByname"  resultType="com.goafanti.common.model.OfficialFeePrice">
+  select id,name,amount,proportion75,proportion85,remarks,date_format(create_time, '%Y-%m-%d %H:%i:%S') createTimes
+	 from official_fee_price where 1=1
+	 <if test="name != null">
+	 and name like concat('%',#{name},'%')
+	 </if>
+  </select>
+</mapper>

+ 39 - 22
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -21,12 +21,13 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
   </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 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -60,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -94,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     id, tid, company_name, unit_price, quantity, total_amount, material, urgent, audit, 
-    assets, income, remarks, create_time, cid
+    assets, income, remarks, create_time, cid, party_amount
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     select
     <if test="distinct">
@@ -122,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -133,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     delete from third_party_company
     where id = #{id,jdbcType=INTEGER}
@@ -142,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     delete from third_party_company
     <if test="_parameter != null">
@@ -153,24 +154,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     insert into third_party_company (id, tid, company_name, 
       unit_price, quantity, total_amount, 
       material, urgent, audit, 
       assets, income, remarks, 
-      create_time, cid)
+      create_time, cid, party_amount
+      )
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
       #{unitPrice,jdbcType=DECIMAL}, #{quantity,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL}, 
       #{material,jdbcType=INTEGER}, #{urgent,jdbcType=INTEGER}, #{audit,jdbcType=INTEGER}, 
       #{assets,jdbcType=VARCHAR}, #{income,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{cid,jdbcType=INTEGER})
+      #{createTime,jdbcType=TIMESTAMP}, #{cid,jdbcType=INTEGER}, #{partyAmount,jdbcType=DECIMAL}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.ThirdPartyCompany">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     insert into third_party_company
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -216,6 +219,9 @@
       <if test="cid != null">
         cid,
       </if>
+      <if test="partyAmount != null">
+        party_amount,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -260,13 +266,16 @@
       <if test="cid != null">
         #{cid,jdbcType=INTEGER},
       </if>
+      <if test="partyAmount != null">
+        #{partyAmount,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" 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 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     select count(*) from third_party_company
     <if test="_parameter != null">
@@ -277,7 +286,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     update third_party_company
     <set>
@@ -323,6 +332,9 @@
       <if test="record.cid != null">
         cid = #{record.cid,jdbcType=INTEGER},
       </if>
+      <if test="record.partyAmount != null">
+        party_amount = #{record.partyAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -332,7 +344,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     update third_party_company
     set id = #{record.id,jdbcType=INTEGER},
@@ -348,7 +360,8 @@
       income = #{record.income,jdbcType=VARCHAR},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      cid = #{record.cid,jdbcType=INTEGER}
+      cid = #{record.cid,jdbcType=INTEGER},
+      party_amount = #{record.partyAmount,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -357,7 +370,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     update third_party_company
     <set>
@@ -400,6 +413,9 @@
       <if test="cid != null">
         cid = #{cid,jdbcType=INTEGER},
       </if>
+      <if test="partyAmount != null">
+        party_amount = #{partyAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -407,7 +423,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+      This element was generated on Thu Sep 03 17:15:07 CST 2020.
     -->
     update third_party_company
     set tid = #{tid,jdbcType=INTEGER},
@@ -422,7 +438,8 @@
       income = #{income,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      cid = #{cid,jdbcType=INTEGER}
+      cid = #{cid,jdbcType=INTEGER},
+      party_amount = #{partyAmount,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByTid" resultType="com.goafanti.organization.bo.OutThirdPartyCompany">
@@ -432,7 +449,7 @@
   </select>
    <select id="selectPaymentList" resultType="com.goafanti.organization.bo.outPaymentList">
 		select c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.cost_amount costAmount,
-		a.payment_type paymentType,a.payment_amount paymentAmount,a.application_amount applicationAmount,
+		a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname,
 		b.commodity_name pname,b.project_status projectStatus,a.status
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
@@ -520,7 +537,7 @@
 	  select c.contract_no contractNo,c.order_no orderNo,d.buyer_name userName,
 	b.cname,b.commodity_name pname,c.order_status orderStatus,b.project_status projectStatus,
 	b.set_up_amount projectAmount,e.cost_amount costAmount,e.party_amount partyAmount,b.task_receiver,
-	c.liquidation_status liquidationStatus,a.dun_type dunType,a.project_type projectType,
+	c.liquidation_status liquidationStatus,a.dun_type dunType,a.project_type projectType,a.tid,
 	a.total_amount NodeAmount,date_format(a.start_time,'%Y-%m-%d %H:%i:%S')startTime,a.status
 	from payment_node a 
 	left join t_order_task b on a.tid=b.id 

+ 247 - 0
src/main/java/com/goafanti/common/model/OfficialFeePrice.java

@@ -0,0 +1,247 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OfficialFeePrice {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.id
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.name
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.amount
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private BigDecimal amount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.proportion85
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private BigDecimal proportion85;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.proportion75
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private BigDecimal proportion75;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.remarks
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private String remarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column official_fee_price.create_time
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column official_fee_price.id
+     *
+     * @return the value of official_fee_price.id
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.id
+     *
+     * @param id the value for official_fee_price.id
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 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 official_fee_price.name
+     *
+     * @return the value of official_fee_price.name
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.name
+     *
+     * @param name the value for official_fee_price.name
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column official_fee_price.amount
+     *
+     * @return the value of official_fee_price.amount
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.amount
+     *
+     * @param amount the value for official_fee_price.amount
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column official_fee_price.proportion85
+     *
+     * @return the value of official_fee_price.proportion85
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public BigDecimal getProportion85() {
+        return proportion85;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.proportion85
+     *
+     * @param proportion85 the value for official_fee_price.proportion85
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setProportion85(BigDecimal proportion85) {
+        this.proportion85 = proportion85;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column official_fee_price.proportion75
+     *
+     * @return the value of official_fee_price.proportion75
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public BigDecimal getProportion75() {
+        return proportion75;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.proportion75
+     *
+     * @param proportion75 the value for official_fee_price.proportion75
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setProportion75(BigDecimal proportion75) {
+        this.proportion75 = proportion75;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column official_fee_price.remarks
+     *
+     * @return the value of official_fee_price.remarks
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.remarks
+     *
+     * @param remarks the value for official_fee_price.remarks
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 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 official_fee_price.create_time
+     *
+     * @return the value of official_fee_price.create_time
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column official_fee_price.create_time
+     *
+     * @param createTime the value for official_fee_price.create_time
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+    public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	private String createTimes;
+}

+ 744 - 0
src/main/java/com/goafanti/common/model/OfficialFeePriceExample.java

@@ -0,0 +1,744 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OfficialFeePriceExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public OfficialFeePriceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNull() {
+            addCriterion("amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNotNull() {
+            addCriterion("amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountEqualTo(BigDecimal value) {
+            addCriterion("amount =", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotEqualTo(BigDecimal value) {
+            addCriterion("amount <>", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThan(BigDecimal value) {
+            addCriterion("amount >", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount >=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThan(BigDecimal value) {
+            addCriterion("amount <", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount <=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIn(List<BigDecimal> values) {
+            addCriterion("amount in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotIn(List<BigDecimal> values) {
+            addCriterion("amount not in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount not between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85IsNull() {
+            addCriterion("proportion85 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85IsNotNull() {
+            addCriterion("proportion85 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85EqualTo(BigDecimal value) {
+            addCriterion("proportion85 =", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85NotEqualTo(BigDecimal value) {
+            addCriterion("proportion85 <>", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85GreaterThan(BigDecimal value) {
+            addCriterion("proportion85 >", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("proportion85 >=", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85LessThan(BigDecimal value) {
+            addCriterion("proportion85 <", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("proportion85 <=", value, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85In(List<BigDecimal> values) {
+            addCriterion("proportion85 in", values, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85NotIn(List<BigDecimal> values) {
+            addCriterion("proportion85 not in", values, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("proportion85 between", value1, value2, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion85NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("proportion85 not between", value1, value2, "proportion85");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75IsNull() {
+            addCriterion("proportion75 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75IsNotNull() {
+            addCriterion("proportion75 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75EqualTo(BigDecimal value) {
+            addCriterion("proportion75 =", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75NotEqualTo(BigDecimal value) {
+            addCriterion("proportion75 <>", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75GreaterThan(BigDecimal value) {
+            addCriterion("proportion75 >", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("proportion75 >=", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75LessThan(BigDecimal value) {
+            addCriterion("proportion75 <", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("proportion75 <=", value, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75In(List<BigDecimal> values) {
+            addCriterion("proportion75 in", values, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75NotIn(List<BigDecimal> values) {
+            addCriterion("proportion75 not in", values, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("proportion75 between", value1, value2, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andProportion75NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("proportion75 not between", value1, value2, "proportion75");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNull() {
+            addCriterion("remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNotNull() {
+            addCriterion("remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksEqualTo(String value) {
+            addCriterion("remarks =", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotEqualTo(String value) {
+            addCriterion("remarks <>", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThan(String value) {
+            addCriterion("remarks >", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("remarks >=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThan(String value) {
+            addCriterion("remarks <", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThanOrEqualTo(String value) {
+            addCriterion("remarks <=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLike(String value) {
+            addCriterion("remarks like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotLike(String value) {
+            addCriterion("remarks not like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIn(List<String> values) {
+            addCriterion("remarks in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotIn(List<String> values) {
+            addCriterion("remarks not in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksBetween(String value1, String value2) {
+            addCriterion("remarks between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotBetween(String value1, String value2) {
+            addCriterion("remarks not between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table official_fee_price
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Sep 03 15:51:31 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table official_fee_price
+     *
+     * @mbg.generated Thu Sep 03 15:51:31 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 67 - 44
src/main/java/com/goafanti/common/model/ThirdPartyCompany.java

@@ -15,83 +15,88 @@ public class ThirdPartyCompany {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.id
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.tid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.company_name
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.unit_price
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
-	@DecimalMax(value = "999999" , message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
+	@DecimalMax(value = "999999", message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
 	@DecimalMin(value = "0", message = "{" + ErrorConstants.DECIMAL_PARAM_MIN_ERROR + "}")
 	private BigDecimal unitPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.quantity
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer quantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.total_amount
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
-	@DecimalMax(value = "999999" , message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
+	@DecimalMax(value = "999999", message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
 	@DecimalMin(value = "0", message = "{" + ErrorConstants.DECIMAL_PARAM_MIN_ERROR + "}")
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.material
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer material;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.urgent
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer urgent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.audit
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer audit;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.assets
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private String assets;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.income
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private String income;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.remarks
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.create_time
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.cid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	private Integer cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.party_amount
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	private BigDecimal partyAmount;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.id
 	 * @return  the value of third_party_company.id
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -100,7 +105,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.id
 	 * @param id  the value for third_party_company.id
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -109,7 +114,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.tid
 	 * @return  the value of third_party_company.tid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -118,7 +123,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.tid
 	 * @param tid  the value for third_party_company.tid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -127,7 +132,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.company_name
 	 * @return  the value of third_party_company.company_name
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -136,7 +141,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.company_name
 	 * @param companyName  the value for third_party_company.company_name
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -145,7 +150,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.unit_price
 	 * @return  the value of third_party_company.unit_price
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -154,7 +159,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.unit_price
 	 * @param unitPrice  the value for third_party_company.unit_price
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -163,7 +168,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.quantity
 	 * @return  the value of third_party_company.quantity
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -172,7 +177,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.quantity
 	 * @param quantity  the value for third_party_company.quantity
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -181,7 +186,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.total_amount
 	 * @return  the value of third_party_company.total_amount
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -190,7 +195,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.total_amount
 	 * @param totalAmount  the value for third_party_company.total_amount
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -199,7 +204,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.material
 	 * @return  the value of third_party_company.material
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getMaterial() {
 		return material;
@@ -208,7 +213,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.material
 	 * @param material  the value for third_party_company.material
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setMaterial(Integer material) {
 		this.material = material;
@@ -217,7 +222,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.urgent
 	 * @return  the value of third_party_company.urgent
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getUrgent() {
 		return urgent;
@@ -226,7 +231,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.urgent
 	 * @param urgent  the value for third_party_company.urgent
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setUrgent(Integer urgent) {
 		this.urgent = urgent;
@@ -235,7 +240,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.audit
 	 * @return  the value of third_party_company.audit
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getAudit() {
 		return audit;
@@ -244,7 +249,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.audit
 	 * @param audit  the value for third_party_company.audit
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setAudit(Integer audit) {
 		this.audit = audit;
@@ -253,7 +258,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.assets
 	 * @return  the value of third_party_company.assets
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public String getAssets() {
 		return assets;
@@ -262,7 +267,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.assets
 	 * @param assets  the value for third_party_company.assets
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setAssets(String assets) {
 		this.assets = assets;
@@ -271,7 +276,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.income
 	 * @return  the value of third_party_company.income
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public String getIncome() {
 		return income;
@@ -280,7 +285,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.income
 	 * @param income  the value for third_party_company.income
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setIncome(String income) {
 		this.income = income;
@@ -289,7 +294,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.remarks
 	 * @return  the value of third_party_company.remarks
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -298,7 +303,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.remarks
 	 * @param remarks  the value for third_party_company.remarks
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -307,7 +312,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.create_time
 	 * @return  the value of third_party_company.create_time
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -316,7 +321,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.create_time
 	 * @param createTime  the value for third_party_company.create_time
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -325,7 +330,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.cid
 	 * @return  the value of third_party_company.cid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -334,9 +339,27 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.cid
 	 * @param cid  the value for third_party_company.cid
-	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.party_amount
+	 * @return  the value of third_party_company.party_amount
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	public BigDecimal getPartyAmount() {
+		return partyAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.party_amount
+	 * @param partyAmount  the value for third_party_company.party_amount
+	 * @mbg.generated  Thu Sep 03 17:15:07 CST 2020
+	 */
+	public void setPartyAmount(BigDecimal partyAmount) {
+		this.partyAmount = partyAmount;
+	}
 }

File diff suppressed because it is too large
+ 1202 - 1142
src/main/java/com/goafanti/common/model/ThirdPartyCompanyExample.java


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

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

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

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

+ 72 - 1
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OfficialFeePrice;
 import com.goafanti.common.model.SoftWritingPrice;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
@@ -467,7 +468,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	}
 	
 	/**
-	 *  删除软著价格表
+	 *  批量确认付款
 	 * @param t
 	 * @return
 	 */
@@ -482,4 +483,74 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		return res;
 	}
 	
+	/**
+	 *  	新增官费信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/addOfficialFeePrice" , method = RequestMethod.POST)
+	public Result addOfficialFeePrice(OfficialFeePrice  o) {
+		Result res =new Result();
+		if ( StringUtils.isBlank(o.getName())||o.getProportion75()==null||o.getProportion85()==null||
+				o.getAmount()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
+				return res;
+		}
+		
+		res.data(thirdPartyCompanyService.addOfficialFeePrice(o));
+		return res;
+	}
+	
+
+	/**
+	 *  	修改官费信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/updateOfficialFeePrice" , method = RequestMethod.POST)
+	public Result updateOfficialFeePrice(OfficialFeePrice  o) {
+		Result res =new Result();
+		if (o.getId()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+				return res;
+		}
+		if ( StringUtils.isBlank(o.getName())||o.getProportion75()==null||o.getProportion85()==null||
+				o.getAmount()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
+				return res;
+		}
+		
+		res.data(thirdPartyCompanyService.updateOfficialFeePrice(o));
+		return res;
+	}
+	/**
+	 *  删除官费信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteOfficialFeePrice" , method = RequestMethod.POST)
+	public Result deleteOfficialFeePrice(Integer  id) {
+		Result res =new Result();
+		if (id==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+				return res;
+		}
+		
+		
+		res.data(thirdPartyCompanyService.deleteOfficialFeePrice(id));
+		return res;
+	}
+	
+	/**
+	 * 	 官费列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/listOfficialFeePrice" , method = RequestMethod.GET)
+	public Result listOfficialFeePrice(String name) {
+		Result res =new Result();
+		res.data(thirdPartyCompanyService.listOfficialFeePrice(name));
+		return res;
+	}
+
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.OfficialFeePrice;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.SoftWritingPrice;
 import com.goafanti.common.model.TOrderPayment;
@@ -78,5 +79,13 @@ public interface ThirdPartyCompanyService {
 
 	Map<String ,Object> updateGroupPayment(String ids);
 
+	int addOfficialFeePrice(OfficialFeePrice o);
+
+	int updateOfficialFeePrice(OfficialFeePrice o);
+
+	int deleteOfficialFeePrice(Integer id);
+
+	List<OfficialFeePrice> listOfficialFeePrice(String name);
+
 
 }

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

@@ -22,6 +22,7 @@ import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CompanyLibraryMapper;
 import com.goafanti.common.dao.FinancialPaymentMapper;
 import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.OfficialFeePriceMapper;
 import com.goafanti.common.dao.PaymentLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.SoftWritingPriceMapper;
@@ -31,6 +32,7 @@ import com.goafanti.common.dao.ThirdPartyCompanyMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.Notice;
+import com.goafanti.common.model.OfficialFeePrice;
 import com.goafanti.common.model.PaymentLog;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.SoftWritingPrice;
@@ -80,6 +82,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private TOrderTaskMapper	tOrderTaskMapper;
 	@Autowired
 	private SoftWritingPriceMapper	softWritingPriceMapper;
+	@Autowired
+	private OfficialFeePriceMapper	officialFeePriceMapper;
 	
 	
 
@@ -215,9 +219,19 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),p.getRemarks(),a.getId(),a.getName());
 			paymentLogMapper.insertSelective(pl);
 		}
-		if (p.getStatus()==3) {//如果确定支付
+		if (p.getStatus()==3) {
+			confirmPayment(p);
+		}
+		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
+	
+	}
+
+
+	private void confirmPayment(TOrderPayment p) {
+		//如果确定支付
 			int flag=0;
 			TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
+			ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 			if (tp.getChooseType()==1) {
 				PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(tp.getNodeId());
 				BigDecimal count=pn.getTotalAmount();
@@ -233,9 +247,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				pn.setStatus(flag);
 				paymentNodeMapper.updateByPrimaryKeySelective(pn);
 			}
-		}
-		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
-	
+			tpc.setPartyAmount(tpc.getPartyAmount().add(p.getPaymentAmount()));
+			thirdPartyCompanyMapper.updateByPrimaryKeySelective(tpc);
 	}
 
 
@@ -514,6 +527,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			TOrderPayment top=tOrderPaymentMapper.selectByPrimaryKey(Integer.valueOf(s));
 			if (top!=null&&top.getStatus()==1) {
 				list.add(top.getId());
+				//做已付款金额计算
+				confirmPayment(top);
 			}else {
 				elist.add(Integer.valueOf(s));
 			}
@@ -526,6 +541,30 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public int addOfficialFeePrice(OfficialFeePrice o) {
+		return officialFeePriceMapper.insertSelective(o);
+	}
+
+
+	@Override
+	public int updateOfficialFeePrice(OfficialFeePrice o) {
+		return officialFeePriceMapper.updateByPrimaryKeySelective(o);
+	}
+
+
+	@Override
+	public int deleteOfficialFeePrice(Integer id) {
+		return officialFeePriceMapper.deleteByPrimaryKey(id);
+	}
+
+
+	@Override
+	public List<OfficialFeePrice> listOfficialFeePrice(String name) {
+		return officialFeePriceMapper.selectListByname(name);
+	}
+
+