Преглед изворни кода

update

Signed-off-by: anderx <312518615@qq.com>
anderx пре 5 година
родитељ
комит
bd1833762c
21 измењених фајлова са 2451 додато и 1121 уклоњено
  1. 1 1
      GeneratorConfig.xml
  2. 1 1
      src/main/java/com/goafanti/common/dao/CompanyLibraryMapper.java
  3. 55 76
      src/main/java/com/goafanti/common/dao/OfficialFeePriceMapper.java
  4. 100 0
      src/main/java/com/goafanti/common/dao/PatentPriceMapper.java
  5. 5 1
      src/main/java/com/goafanti/common/mapper/CompanyLibraryMapper.xml
  6. 35 53
      src/main/java/com/goafanti/common/mapper/OfficialFeePriceMapper.xml
  7. 328 0
      src/main/java/com/goafanti/common/mapper/PatentPriceMapper.xml
  8. 1 1
      src/main/java/com/goafanti/common/mapper/PaymentNodeMapper.xml
  9. 3 3
      src/main/java/com/goafanti/common/mapper/SoftWritingPriceMapper.xml
  10. 1 1
      src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml
  11. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  12. 2 2
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  13. 127 219
      src/main/java/com/goafanti/common/model/OfficialFeePrice.java
  14. 612 723
      src/main/java/com/goafanti/common/model/OfficialFeePriceExample.java
  15. 255 0
      src/main/java/com/goafanti/common/model/PatentPrice.java
  16. 734 0
      src/main/java/com/goafanti/common/model/PatentPriceExample.java
  17. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java
  18. 2 2
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  19. 88 6
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  20. 15 4
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  21. 77 26
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -77,5 +77,5 @@ public interface CompanyLibraryMapper {
 
 	int insertSelectiveGetId(CompanyLibrary c);
 
-	List<Integer> selectName(@Param("companyName")String companyName, @Param("aid")String aid);
+	List<Integer> selectName(@Param("companyName")String companyName, @Param("type")Integer type, @Param("aid")String aid);
 }

+ 55 - 76
src/main/java/com/goafanti/common/dao/OfficialFeePriceMapper.java

@@ -7,92 +7,71 @@ 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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 10 11:49:00 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);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table official_fee_price
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	int updateByPrimaryKey(OfficialFeePrice record);
 
 	List<OfficialFeePrice> selectListByname(@Param("name")String name);
 }

+ 100 - 0
src/main/java/com/goafanti/common/dao/PatentPriceMapper.java

@@ -0,0 +1,100 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PatentPrice;
+import com.goafanti.common.model.PatentPriceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PatentPriceMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    long countByExample(PatentPriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int deleteByExample(PatentPriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int insert(PatentPrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int insertSelective(PatentPrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    List<PatentPrice> selectByExample(PatentPriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    PatentPrice selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") PatentPrice record, @Param("example") PatentPriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int updateByExample(@Param("record") PatentPrice record, @Param("example") PatentPriceExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int updateByPrimaryKeySelective(PatentPrice record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    int updateByPrimaryKey(PatentPrice record);
+
+	List<PatentPrice> selectlist(String name);
+
+	PatentPrice selectBycid(Integer cid);
+}

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

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

+ 35 - 53
src/main/java/com/goafanti/common/mapper/OfficialFeePriceMapper.xml

@@ -5,13 +5,12 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="type" jdbcType="INTEGER" property="type" />
     <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>
@@ -19,7 +18,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -53,7 +52,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -87,15 +86,15 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
-    id, name, amount, proportion85, proportion75, remarks, create_time
+    id, type, amount, proportion85, 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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     select
     <if test="distinct">
@@ -114,7 +113,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +124,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     delete from official_fee_price
     where id = #{id,jdbcType=INTEGER}
@@ -134,7 +133,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     delete from official_fee_price
     <if test="_parameter != null">
@@ -145,28 +144,28 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 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 into official_fee_price (id, type, amount, 
+      proportion85, remarks, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL}, 
+      #{proportion85,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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     insert into official_fee_price
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="name != null">
-        name,
+      <if test="type != null">
+        type,
       </if>
       <if test="amount != null">
         amount,
@@ -174,9 +173,6 @@
       <if test="proportion85 != null">
         proportion85,
       </if>
-      <if test="proportion75 != null">
-        proportion75,
-      </if>
       <if test="remarks != null">
         remarks,
       </if>
@@ -188,8 +184,8 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
       </if>
       <if test="amount != null">
         #{amount,jdbcType=DECIMAL},
@@ -197,9 +193,6 @@
       <if test="proportion85 != null">
         #{proportion85,jdbcType=DECIMAL},
       </if>
-      <if test="proportion75 != null">
-        #{proportion75,jdbcType=DECIMAL},
-      </if>
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
@@ -212,7 +205,7 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     select count(*) from official_fee_price
     <if test="_parameter != null">
@@ -223,15 +216,15 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 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 test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
       </if>
       <if test="record.amount != null">
         amount = #{record.amount,jdbcType=DECIMAL},
@@ -239,9 +232,6 @@
       <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>
@@ -257,14 +247,13 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     update official_fee_price
     set id = #{record.id,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
       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">
@@ -275,12 +264,12 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     update official_fee_price
     <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
       </if>
       <if test="amount != null">
         amount = #{amount,jdbcType=DECIMAL},
@@ -288,9 +277,6 @@
       <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>
@@ -304,23 +290,19 @@
     <!--
       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.
+      This element was generated on Thu Sep 10 11:49:00 CST 2020.
     -->
     update official_fee_price
-    set name = #{name,jdbcType=VARCHAR},
+    set type = #{type,jdbcType=INTEGER},
       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
+  <select id="selectListByname" resultType="com.goafanti.common.model.OfficialFeePrice">
+  select id,type,amount,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>

+ 328 - 0
src/main/java/com/goafanti/common/mapper/PatentPriceMapper.xml

@@ -0,0 +1,328 @@
+<?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.PatentPriceMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PatentPrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="utility_model" jdbcType="DECIMAL" property="utilityModel" />
+    <result column="appearance_patent" jdbcType="DECIMAL" property="appearancePatent" />
+    <result column="invention_patent" jdbcType="DECIMAL" property="inventionPatent" />
+    <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 10 14:32:54 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 10 14:32:54 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 10 14:32:54 CST 2020.
+    -->
+    id, cid, utility_model, appearance_patent, invention_patent, remarks, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PatentPriceExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from patent_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 10 14:32:54 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from patent_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 10 14:32:54 CST 2020.
+    -->
+    delete from patent_price
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PatentPriceExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    delete from patent_price
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PatentPrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    insert into patent_price (id, cid, utility_model, 
+      appearance_patent, invention_patent, remarks, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{utilityModel,jdbcType=DECIMAL}, 
+      #{appearancePatent,jdbcType=DECIMAL}, #{inventionPatent,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentPrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    insert into patent_price
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="utilityModel != null">
+        utility_model,
+      </if>
+      <if test="appearancePatent != null">
+        appearance_patent,
+      </if>
+      <if test="inventionPatent != null">
+        invention_patent,
+      </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="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="utilityModel != null">
+        #{utilityModel,jdbcType=DECIMAL},
+      </if>
+      <if test="appearancePatent != null">
+        #{appearancePatent,jdbcType=DECIMAL},
+      </if>
+      <if test="inventionPatent != null">
+        #{inventionPatent,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.PatentPriceExample" 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 10 14:32:54 CST 2020.
+    -->
+    select count(*) from patent_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 10 14:32:54 CST 2020.
+    -->
+    update patent_price
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.utilityModel != null">
+        utility_model = #{record.utilityModel,jdbcType=DECIMAL},
+      </if>
+      <if test="record.appearancePatent != null">
+        appearance_patent = #{record.appearancePatent,jdbcType=DECIMAL},
+      </if>
+      <if test="record.inventionPatent != null">
+        invention_patent = #{record.inventionPatent,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 10 14:32:54 CST 2020.
+    -->
+    update patent_price
+    set id = #{record.id,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      utility_model = #{record.utilityModel,jdbcType=DECIMAL},
+      appearance_patent = #{record.appearancePatent,jdbcType=DECIMAL},
+      invention_patent = #{record.inventionPatent,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.PatentPrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    update patent_price
+    <set>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="utilityModel != null">
+        utility_model = #{utilityModel,jdbcType=DECIMAL},
+      </if>
+      <if test="appearancePatent != null">
+        appearance_patent = #{appearancePatent,jdbcType=DECIMAL},
+      </if>
+      <if test="inventionPatent != null">
+        invention_patent = #{inventionPatent,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.PatentPrice">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 10 14:32:54 CST 2020.
+    -->
+    update patent_price
+    set cid = #{cid,jdbcType=INTEGER},
+      utility_model = #{utilityModel,jdbcType=DECIMAL},
+      appearance_patent = #{appearancePatent,jdbcType=DECIMAL},
+      invention_patent = #{inventionPatent,jdbcType=DECIMAL},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectlist" resultType="com.goafanti.common.model.PatentPrice">
+  select a.id,a.cid,b.company_name companyName,a.utility_model utilityModel,a.appearance_patent appearancePatent,
+  a.invention_patent inventionPatent,a.remarks,a.remarks,date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes
+	from patent_price a left join company_library b on a.cid=b.id
+	where 1=1
+	<if test="name !=null">
+	and 	b.company_name like concat('%',#{name},'%')
+	</if>
+  </select>
+</mapper>

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

@@ -459,7 +459,7 @@
   </update>
   
   <select id="selectByTid" resultType="com.goafanti.organization.bo.OutPaymentNode">
-  select id,tid,cid,company_name companyName,unit_price unitPrice,quantity,total_amount totalAmount,create_time createTime,
+  select id,tid,cid,company_name companyName,unit_price unitPrice,quantity,total_amount totalAmount,create_time createTime,status,
    party_amount partyAmount, date_format(party_time,'%Y-%m-%d')partyTimes,project_type projectType,dun_type dunType
    from payment_node where tid= #{tid}
    <if test="status !=null">

+ 3 - 3
src/main/java/com/goafanti/common/mapper/SoftWritingPriceMapper.xml

@@ -332,10 +332,10 @@
   </update>
   
   <select id="checkSoftWritingPrice" resultType="com.goafanti.common.model.SoftWritingPrice">
-    select a.id,a.cid,a.material,a.unit_price unitPrice,a.urgent,a.remarks,
+     select a.id,a.cid,a.material,a.unit_price unitPrice,a.urgent,a.remarks,
 	a.status,date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes 
-	from soft_writing_price a 
-	where a.cid= #{s.cid}
+	from soft_writing_price a where  status=0
+	and a.cid= #{s.cid}
 	and a.material=#{s.material}
 	and a.urgent=#{s.urgent}
   </select>

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

@@ -582,7 +582,7 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
   </select>
   
   <select id="selectByTid" resultType="com.goafanti.organization.bo.outOrderPayment">
- select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
+ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,choose_type chooseType,
 	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
 	  b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount,d.finance_name financeName ,c.order_no orderNo,
 	  date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,a.application_amount applicationAmount 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1422,9 +1422,9 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-	 select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name receiverName,a.project_status as projectStatus,e.contract_no contractNo,
+	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name receiverName,a.project_status as projectStatus,e.contract_no contractNo,
 a.task_receiver taskReceiver,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
-e.approval,l.refund_status outsourceStatus,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
+e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
 ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ifnull(ttm.cost_amount,0) costAmount,
 ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsource
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 

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

@@ -640,7 +640,7 @@
 	from soft_writing_price a left join company_library b on a.cid=b.id
 	where 1=1
 	<if test="s.companyName != null">
-	b.company_name like concat('%',#{s.companyName},'%')
+	and b.company_name like concat('%',#{s.companyName},'%')
 	</if>
 	<if test="s.material != null">
 	and a.material= #{s.material}
@@ -658,7 +658,7 @@
 	from soft_writing_price a left join company_library b on a.cid=b.id
 	where 1=1
 	<if test="s.companyName != null">
-	b.company_name like concat('%',#{s.companyName},'%')
+	and b.company_name like concat('%',#{s.companyName},'%')
 	</if>
 	<if test="s.material != null">
 	and a.material= #{s.material}

+ 127 - 219
src/main/java/com/goafanti/common/model/OfficialFeePrice.java

@@ -5,237 +5,145 @@ 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 field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.id
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.type
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.amount
+	 * @mbg.generated  Thu Sep 10 11:49:00 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 10 11:49:00 CST 2020
+	 */
+	private BigDecimal proportion85;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.remarks
+	 * @mbg.generated  Thu Sep 10 11:49:00 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 10 11:49:00 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 10 11:49:00 CST 2020
+	 */
+	public Integer getId() {
+		return 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.id
+	 * @param id  the value for official_fee_price.id
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    /**
-     * 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.type
+	 * @return  the value of official_fee_price.type
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
 
-    /**
-     * 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.type
+	 * @param type  the value for official_fee_price.type
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
 
-    /**
-     * 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.amount
+	 * @return  the value of official_fee_price.amount
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public BigDecimal getAmount() {
+		return 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.amount
+	 * @param amount  the value for official_fee_price.amount
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
 
-    /**
-     * 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.proportion85
+	 * @return  the value of official_fee_price.proportion85
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public BigDecimal getProportion85() {
+		return 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.proportion85
+	 * @param proportion85  the value for official_fee_price.proportion85
+	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 */
+	public void setProportion85(BigDecimal proportion85) {
+		this.proportion85 = proportion85;
+	}
 
-    /**
-     * 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 10 11:49:00 CST 2020
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
 
-    /**
-     * 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 10 11:49:00 CST 2020
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = 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 10 11:49:00 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
 
-    /**
-     * 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 10 11:49:00 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = 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() {
+	public String getCreateTimes() {
 		return createTimes;
 	}
 

Разлика између датотеке није приказан због своје велике величине
+ 612 - 723
src/main/java/com/goafanti/common/model/OfficialFeePriceExample.java


+ 255 - 0
src/main/java/com/goafanti/common/model/PatentPrice.java

@@ -0,0 +1,255 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class PatentPrice {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.id
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.cid
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private Integer cid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.utility_model
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private BigDecimal utilityModel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.appearance_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private BigDecimal appearancePatent;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.invention_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private BigDecimal inventionPatent;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.remarks
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private String remarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_price.create_time
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_price.id
+     *
+     * @return the value of patent_price.id
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.id
+     *
+     * @param id the value for patent_price.id
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price.cid
+     *
+     * @return the value of patent_price.cid
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public Integer getCid() {
+        return cid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.cid
+     *
+     * @param cid the value for patent_price.cid
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price.utility_model
+     *
+     * @return the value of patent_price.utility_model
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public BigDecimal getUtilityModel() {
+        return utilityModel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.utility_model
+     *
+     * @param utilityModel the value for patent_price.utility_model
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setUtilityModel(BigDecimal utilityModel) {
+        this.utilityModel = utilityModel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_price.appearance_patent
+     *
+     * @return the value of patent_price.appearance_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public BigDecimal getAppearancePatent() {
+        return appearancePatent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.appearance_patent
+     *
+     * @param appearancePatent the value for patent_price.appearance_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setAppearancePatent(BigDecimal appearancePatent) {
+        this.appearancePatent = appearancePatent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_price.invention_patent
+     *
+     * @return the value of patent_price.invention_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public BigDecimal getInventionPatent() {
+        return inventionPatent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.invention_patent
+     *
+     * @param inventionPatent the value for patent_price.invention_patent
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setInventionPatent(BigDecimal inventionPatent) {
+        this.inventionPatent = inventionPatent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_price.remarks
+     *
+     * @return the value of patent_price.remarks
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.remarks
+     *
+     * @param remarks the value for patent_price.remarks
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price.create_time
+     *
+     * @return the value of patent_price.create_time
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_price.create_time
+     *
+     * @param createTime the value for patent_price.create_time
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	private String companyName;
+	
+	private String createTimes;
+	
+}

+ 734 - 0
src/main/java/com/goafanti/common/model/PatentPriceExample.java

@@ -0,0 +1,734 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PatentPriceExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public PatentPriceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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 andCidIsNull() {
+            addCriterion("cid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIsNotNull() {
+            addCriterion("cid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidEqualTo(Integer value) {
+            addCriterion("cid =", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotEqualTo(Integer value) {
+            addCriterion("cid <>", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThan(Integer value) {
+            addCriterion("cid >", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("cid >=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThan(Integer value) {
+            addCriterion("cid <", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThanOrEqualTo(Integer value) {
+            addCriterion("cid <=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIn(List<Integer> values) {
+            addCriterion("cid in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotIn(List<Integer> values) {
+            addCriterion("cid not in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidBetween(Integer value1, Integer value2) {
+            addCriterion("cid between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotBetween(Integer value1, Integer value2) {
+            addCriterion("cid not between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelIsNull() {
+            addCriterion("utility_model is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelIsNotNull() {
+            addCriterion("utility_model is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelEqualTo(BigDecimal value) {
+            addCriterion("utility_model =", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelNotEqualTo(BigDecimal value) {
+            addCriterion("utility_model <>", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelGreaterThan(BigDecimal value) {
+            addCriterion("utility_model >", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("utility_model >=", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelLessThan(BigDecimal value) {
+            addCriterion("utility_model <", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("utility_model <=", value, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelIn(List<BigDecimal> values) {
+            addCriterion("utility_model in", values, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelNotIn(List<BigDecimal> values) {
+            addCriterion("utility_model not in", values, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("utility_model between", value1, value2, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtilityModelNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("utility_model not between", value1, value2, "utilityModel");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentIsNull() {
+            addCriterion("appearance_patent is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentIsNotNull() {
+            addCriterion("appearance_patent is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentEqualTo(BigDecimal value) {
+            addCriterion("appearance_patent =", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentNotEqualTo(BigDecimal value) {
+            addCriterion("appearance_patent <>", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentGreaterThan(BigDecimal value) {
+            addCriterion("appearance_patent >", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("appearance_patent >=", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentLessThan(BigDecimal value) {
+            addCriterion("appearance_patent <", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("appearance_patent <=", value, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentIn(List<BigDecimal> values) {
+            addCriterion("appearance_patent in", values, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentNotIn(List<BigDecimal> values) {
+            addCriterion("appearance_patent not in", values, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("appearance_patent between", value1, value2, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppearancePatentNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("appearance_patent not between", value1, value2, "appearancePatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentIsNull() {
+            addCriterion("invention_patent is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentIsNotNull() {
+            addCriterion("invention_patent is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentEqualTo(BigDecimal value) {
+            addCriterion("invention_patent =", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentNotEqualTo(BigDecimal value) {
+            addCriterion("invention_patent <>", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentGreaterThan(BigDecimal value) {
+            addCriterion("invention_patent >", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("invention_patent >=", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentLessThan(BigDecimal value) {
+            addCriterion("invention_patent <", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("invention_patent <=", value, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentIn(List<BigDecimal> values) {
+            addCriterion("invention_patent in", values, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentNotIn(List<BigDecimal> values) {
+            addCriterion("invention_patent not in", values, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("invention_patent between", value1, value2, "inventionPatent");
+            return (Criteria) this;
+        }
+
+        public Criteria andInventionPatentNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("invention_patent not between", value1, value2, "inventionPatent");
+            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 patent_price
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Sep 10 14:32:54 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 patent_price
+     *
+     * @mbg.generated Thu Sep 10 14:32:54 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);
+        }
+    }
+}

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -31,6 +31,7 @@ public class TOrderTaskListBo {
 	/** 外包部门 */
 	private String outsourceName;
 	private Integer outsourceStatus;
+	private Integer outsourceType;
 	private Integer splitStatus;
 	private String	splitSuper;
 	private Integer splitId;
@@ -254,6 +255,12 @@ public class TOrderTaskListBo {
 	public void setPartyAmount(String partyAmount) {
 		this.partyAmount = partyAmount;
 	}
+	public Integer getOutsourceType() {
+		return outsourceType;
+	}
+	public void setOutsourceType(Integer outsourceType) {
+		this.outsourceType = outsourceType;
+	}
 	
 	
 }

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

@@ -1294,8 +1294,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		o.setRefundStatus(0);
 		o.setCreateTime(new Date());
 		if(o.getAmount()==null)o.setAmount(new BigDecimal(0));
-		if(o.getPatentType()==null)o.setPatentType(0);
-		if (o.getPatentType()==0) {
+		if(o.getStartType()==null)o.setStartType(0);
+		if (o.getStartType()==0) {
 			List<String> aids = new ArrayList<>();
 			for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
 				aids.add(admin.getId());

+ 88 - 6
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -14,6 +14,7 @@ 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.PatentPrice;
 import com.goafanti.common.model.SoftWritingPrice;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
@@ -40,7 +41,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/addCompany" , method = RequestMethod.POST)
-	public Result addCompany(@Valid ThirdPartyCompany t,BindingResult bindingResult,Integer calculation) {
+	public Result addCompany(@Valid ThirdPartyCompany t,BindingResult bindingResult,
+			Integer calculation,Integer patentType) {
 		Result res =new Result();
 		if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -51,6 +53,15 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
 			return res;
 		}
+		if (calculation==1) {
+			thirdPartyCompanyService.calculationUnitPrice(t);
+		}else if (calculation==2) {
+			thirdPartyCompanyService.calculationPatentUnitPrice(t,patentType);
+		}
+		if (t.getUnitPrice()==null||t.getTotalAmount()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"单价","单价"));
+			return res;
+		}
 		if (!res.getError().isEmpty()) {
             return res;
         }
@@ -428,12 +439,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 				return res;
 		}
-		s.setCid(thirdPartyCompanyService.selectCid(s.getCompanyName()));
+		s.setCid(thirdPartyCompanyService.pushSelectByCid(s.getCompanyName(),0));
 		if (thirdPartyCompanyService.checkSoftWritingPrice(s)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"此规格","此规格"));
 			return res;
 		}
-		res.data(thirdPartyCompanyService.addSoftWritingPrice(s));
+		res.data(thirdPartyCompanyService.insertSoftWritingPrice(s));
 		return res;
 	}
 	
@@ -450,6 +461,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 				return res;
 		}
+		if(s.getCompanyName()!=null)s.setCid(thirdPartyCompanyService.pushSelectByCid(s.getCompanyName(),0));
 		if (thirdPartyCompanyService.checkSoftWritingPrice(s)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"此规格","此规格"));
 			return res;
@@ -515,12 +527,11 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	@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||
+		if (o.getType()==null||o.getProportion85()==null||
 				o.getAmount()==null) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
 				return res;
 		}
-		
 		res.data(thirdPartyCompanyService.addOfficialFeePrice(o));
 		return res;
 	}
@@ -538,7 +549,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 				return res;
 		}
-		if ( StringUtils.isBlank(o.getName())||o.getProportion75()==null||o.getProportion85()==null||
+		if (o.getType()==null||o.getProportion85()==null||
 				o.getAmount()==null) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
 				return res;
@@ -576,5 +587,76 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.listOfficialFeePrice(name));
 		return res;
 	}
+	
+	
+	
+	/**
+	 *  	新增专利信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/addPatentPrice" , method = RequestMethod.POST)
+	public Result addPatentPrice(PatentPrice  p) {
+		Result res =new Result();
+		if (p.getInventionPatent()==null||p.getInventionPatent()==null||p.getInventionPatent()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
+				return res;
+		}
+		if(p.getCompanyName()!=null)p.setCid(thirdPartyCompanyService.pushSelectByCid(p.getCompanyName(),2));
+		res.data(thirdPartyCompanyService.addpatentPrice(p));
+		return res;
+	}
+	
 
+	/**
+	 *  	修改专利信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/updatePatentPrice" , method = RequestMethod.POST)
+	public Result updatePatentPrice(PatentPrice  p) {
+		Result res =new Result();
+		if(p.getId()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+				return res;
+		}
+		if (p.getInventionPatent()==null||p.getInventionPatent()==null||p.getInventionPatent()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
+			return res;
+	}
+	if(p.getCompanyName()!=null)p.setCid(thirdPartyCompanyService.pushSelectByCid(p.getCompanyName(),2));
+		
+		res.data(thirdPartyCompanyService.updatepatentPrice(p));
+		return res;
+	}
+	/**
+	 *  删除专利信息
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/deletePatentPrice" , method = RequestMethod.POST)
+	public Result deletePatentPrice(Integer  id) {
+		Result res =new Result();
+		if (id==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+				return res;
+		}
+		
+		
+		res.data(thirdPartyCompanyService.deletepatentPrice(id));
+		return res;
+	}
+	
+	/**
+	 * 	 专利列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/listPatentPrice" , method = RequestMethod.GET)
+	public Result listPatentPrice(String name) {
+		Result res =new Result();
+		res.data(thirdPartyCompanyService.listpatentPrice(name));
+		return res;
+	}
+	
 }

+ 15 - 4
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -5,7 +5,7 @@ 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.PatentPrice;
 import com.goafanti.common.model.SoftWritingPrice;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
@@ -14,7 +14,6 @@ import com.goafanti.organization.bo.InputNodeList;
 import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
 import com.goafanti.organization.bo.InuptFinancialPayment;
-import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.bo.OutPaymentLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
@@ -65,7 +64,7 @@ public interface ThirdPartyCompanyService {
 
 	Pagination<outNodeList> selectPaymentList(InputNodeList i);
 
-	int addSoftWritingPrice(SoftWritingPrice s);
+	int insertSoftWritingPrice(SoftWritingPrice s);
 
 	int updateSoftWritingPrice(SoftWritingPrice s);
 
@@ -73,7 +72,7 @@ public interface ThirdPartyCompanyService {
 
 	int deleteSoftWritingPrice(Integer id);
 
-	Integer selectCid(String companyName);
+	Integer pushSelectByCid(String companyName, int i);
 
 	boolean checkSoftWritingPrice(SoftWritingPrice s);
 
@@ -91,5 +90,17 @@ public interface ThirdPartyCompanyService {
 
 	boolean addNodeCheck(InputPaymentNode p);
 
+	void calculationUnitPrice(ThirdPartyCompany t);
+
+	int addpatentPrice(PatentPrice p);
+
+	int updatepatentPrice(PatentPrice p);
+
+	int deletepatentPrice(Integer id);
+
+	List<PatentPrice> listpatentPrice(String name);
+
+	void calculationPatentUnitPrice(ThirdPartyCompany t, Integer patentType);
+
 
 }

+ 77 - 26
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -23,6 +23,7 @@ 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.PatentPriceMapper;
 import com.goafanti.common.dao.PaymentLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.SoftWritingPriceMapper;
@@ -34,6 +35,7 @@ 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.PatentPrice;
 import com.goafanti.common.model.PaymentLog;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.SoftWritingPrice;
@@ -87,6 +89,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private OfficialFeePriceMapper	officialFeePriceMapper;
 	@Autowired
 	private TTaskMidMapper	tTaskMidMapper;
+	@Autowired
+	private PatentPriceMapper	patentPriceMapper;
 	
 	
 
@@ -97,7 +101,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (calculation==0) {//0其他 1计算
 			CompanyLibrary c=new CompanyLibrary();
 			String aid=TokenManager.getAdminId();
-			List<Integer> list=companyLibraryMapper.selectName(t.getCompanyName(),aid);
+			List<Integer> list=companyLibraryMapper.selectName(t.getCompanyName(),1,aid);
 			if (list.size()<1) {
 				c.setCompanyName(t.getCompanyName());
 				c.setAid(aid);
@@ -108,15 +112,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				t.setCid(list.get(0));
 			}
 			t.setTotalAmount(t.getUnitPrice().multiply(new BigDecimal(t.getQuantity())));
-		}else if (calculation==1) {
-			SoftWritingPrice s=new SoftWritingPrice();
-			s.setCid(t.getCid());
-			s.setMaterial(t.getMaterial());
-			s.setUrgent(t.getUrgent());
-			List<SoftWritingPrice> list=softWritingPriceMapper.checkSoftWritingPrice(s);
-			for (SoftWritingPrice sw : list) {
-				t.setUnitPrice(sw.getUnitPrice().multiply(new BigDecimal(t.getQuantity())));
-			}
 		}
 		return thirdPartyCompanyMapper.insertSelective(t);
 	}
@@ -138,8 +133,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public List<CompanyLibrary> selectVague(String name,Integer type) {
+		String aid = null;
 		if(type==null)type=1;
-		return companyLibraryMapper.selectVague(name,type,TokenManager.getAdminId());
+		if (type==1) aid=TokenManager.getAdminId();
+		return companyLibraryMapper.selectVague(name,type,aid);
 	}
 
 
@@ -161,7 +158,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		List<OutPaymentNode> list=paymentNodeMapper.selectByTidAndCid(p.getTid(),p.getCid());
 		BigDecimal sum=p.getTotalAmount();
 		for (OutPaymentNode pn : list) {
-			if (pn.getId().equals(p.getId())) sum=sum.add(pn.getTotalAmount());
+			if (!pn.getId().equals(p.getId())) sum=sum.add(pn.getTotalAmount());
 		}
 		if (sum.compareTo(t.getTotalAmount())>0) {
 			return true;
@@ -293,8 +290,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			int flag=0;
 			TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
 			ThirdPartyCompany tpc=new ThirdPartyCompany();
-			System.out.println(p);
-			thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 			if (p.getPaymentAmount()==null||p.getPaymentAmount().compareTo(new BigDecimal(0))==0) {
 				p.setPaymentAmount(tp.getApplicationAmount());
 			}
@@ -523,16 +518,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 
 	@Override
-	public int addSoftWritingPrice(SoftWritingPrice s) {
-		List<Integer> list=companyLibraryMapper.selectName(s.getCompanyName(),null);
-		if (list.size()<1) {
-			CompanyLibrary c=new CompanyLibrary();
-			c.setCompanyName(s.getCompanyName());
-			companyLibraryMapper.insertSelectiveGetId(c);
-			s.setCid(c.getId());
-		}else {
-			s.setCid(list.get(0));
-		}
+	public int insertSoftWritingPrice(SoftWritingPrice s) {
+		
 		return softWritingPriceMapper.insertSelective(s);
 	}
 
@@ -543,8 +530,12 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		return softWritingPriceMapper.updateByPrimaryKeySelective(s);
 	}
 	@Override
-	public Integer selectCid(String companyName) {
-			List<Integer> list=companyLibraryMapper.selectName(companyName,null);
+	public Integer pushSelectByCid(String companyName,int i) {
+		String aid=null;
+		if (i==1) {
+			aid=TokenManager.getAdminId();
+		}
+			List<Integer> list=companyLibraryMapper.selectName(companyName,i,aid);
 			if (list.size()<1) {
 				CompanyLibrary c=new CompanyLibrary();
 				c.setCompanyName(companyName);
@@ -645,6 +636,66 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public void calculationUnitPrice(ThirdPartyCompany t) {
+		SoftWritingPrice s=new SoftWritingPrice();
+		int i=0;
+		s.setCid(t.getCid());
+		s.setMaterial(t.getMaterial());
+		s.setUrgent(t.getUrgent());
+		List<SoftWritingPrice> list=softWritingPriceMapper.checkSoftWritingPrice(s);
+		for (SoftWritingPrice sw : list) {
+			t.setUnitPrice(sw.getUnitPrice());
+			t.setTotalAmount(sw.getUnitPrice().multiply(new BigDecimal(t.getQuantity())));
+		}
+	}
+	
+	@Override
+	public void calculationPatentUnitPrice(ThirdPartyCompany t,Integer patentType) {
+		PatentPrice p=patentPriceMapper.selectBycid(t.getCid());
+//		专利名称 0实用新型 1发明专利 2外观专利 3 其他
+		BigDecimal unitPrice=null;
+		if (patentType==0) {
+			unitPrice=p.getUtilityModel();
+		}else if (patentType==1) {
+			unitPrice=p.getInventionPatent();
+		}else if (patentType==2) {
+			unitPrice=p.getAppearancePatent();
+		}
+		t.setUnitPrice(unitPrice);
+		t.setTotalAmount(unitPrice.multiply(new BigDecimal(t.getQuantity())));
+	}
+
+
+	@Override
+	public int addpatentPrice(PatentPrice p) {
+
+		return patentPriceMapper.insertSelective(p);
+	}
+
+
+	@Override
+	public int updatepatentPrice(PatentPrice p) {
+
+		return patentPriceMapper.updateByPrimaryKeySelective(p);
+	}
+
+
+	@Override
+	public int deletepatentPrice(Integer id) {
+		return patentPriceMapper.deleteByPrimaryKey(id);
+	}
+
+
+	@Override
+	public List<PatentPrice> listpatentPrice(String name) {
+		return patentPriceMapper.selectlist(name);
+	}
+
+
+
+
+