Bladeren bron

付款申请修改

anderx 4 jaren geleden
bovenliggende
commit
1a396aba80
22 gewijzigde bestanden met toevoegingen van 1151 en 462 verwijderingen
  1. 10 35
      src/main/java/com/goafanti/common/dao/OfficialFeePriceMapper.java
  2. 7 7
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  3. 87 0
      src/main/java/com/goafanti/common/enums/OfficialPatentType.java
  4. 65 0
      src/main/java/com/goafanti/common/enums/OfficialType.java
  5. 30 179
      src/main/java/com/goafanti/common/mapper/OfficialFeePriceMapper.xml
  6. 92 24
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  7. 36 3
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  8. 95 26
      src/main/java/com/goafanti/common/model/OfficialFeePrice.java
  9. 200 176
      src/main/java/com/goafanti/common/model/TOrderTask.java
  10. 102 0
      src/main/java/com/goafanti/order/bo/OutProjectCheck.java
  11. 18 0
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  12. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  13. 58 0
      src/main/java/com/goafanti/order/controller/InputProjectCheck.java
  14. 27 0
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  15. 3 0
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  16. 16 0
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  17. 7 0
      src/main/java/com/goafanti/organization/bo/InputPaymentList.java
  18. 38 0
      src/main/java/com/goafanti/organization/bo/outPaymentList.java
  19. 190 0
      src/main/java/com/goafanti/organization/bo/outPaymentListPatent.java
  20. 8 8
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  21. 9 1
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  22. 46 3
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

+ 10 - 35
src/main/java/com/goafanti/common/dao/OfficialFeePriceMapper.java

@@ -8,71 +8,46 @@ 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 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 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 10 11:49:00 CST 2020
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
-	 */
-	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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
-	 */
-	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 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	int updateByPrimaryKey(OfficialFeePrice record);
 
+
 	List<OfficialFeePrice> selectListByname(@Param("name")String name);
 
 

+ 7 - 7
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -12,43 +12,43 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
+	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 87 - 0
src/main/java/com/goafanti/common/enums/OfficialPatentType.java

@@ -0,0 +1,87 @@
+package com.goafanti.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
+
+public enum OfficialPatentType {
+	/* 专利分类 0申请 1变更 2复审 3优先权 4恢复请求权 5无效宣告请求费 6强制许可请求费 7 强制许可使用裁决请求费 8登录、印刷费、印花税 */
+	SQ(0,"申请"),
+	BG(1,"变更"),
+	FS(2,"复审"),
+	YXQ(3,"优先权"),
+	HFQQQ(4,"恢复请求权"),
+	WXXGQQF(5,"无效宣告请求费"),
+	QZXKQQF(6,"强制许可请求费"),
+	QZXKSYCJQQF(7,"强制许可使用裁决请求费"),
+	DLYSFYHS(8,"登录、印刷费、印花税"),
+	NOT(99,"未知");
+	
+	private OfficialPatentType(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, OfficialPatentType> status = new HashMap<Integer, OfficialPatentType>();
+
+	static {
+		for (OfficialPatentType value : OfficialPatentType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	
+	public static String getValueByCode(Integer code){
+        for(OfficialPatentType o:OfficialPatentType.values()){
+            if(code.equals(o.getCode())){
+                return o.getDesc();
+            }
+        }
+        return  NOT.getDesc();
+    }
+	public static OfficialPatentType getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return NOT;
+	}
+
+	public static OfficialPatentType getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return NOT;
+	}
+
+	public static List<Map<Object, Object>> getStatus() {
+		List<Map<Object, Object>> list=new ArrayList<Map<Object,Object>>();
+		for(OfficialPatentType o:OfficialPatentType.values()){
+			Map<Object, Object> map=new LinkedHashMap<Object, Object>();
+			map.put("id", o.getCode());
+			map.put("name", o.getDesc());
+			list.add(map);
+		}
+		return list;
+	}
+	
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	} 
+
+}

+ 65 - 0
src/main/java/com/goafanti/common/enums/OfficialType.java

@@ -0,0 +1,65 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum OfficialType {
+	/* 0实用新型 1外观专利 2发明专利 */
+	SYXX(0,"实用新型"),
+	WGZL(1,"外观专利"),
+	FMZL(2,"发明专利"),
+	NOT(99,"未知");
+	
+	private OfficialType(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, OfficialType> status = new HashMap<Integer, OfficialType>();
+
+	static {
+		for (OfficialType value : OfficialType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static String getValueByCode(Integer code){
+        for(OfficialType o:OfficialType.values()){
+            if(code.equals(o.getCode())){
+                return o.getDesc();
+            }
+        }
+        return  NOT.getDesc();
+    }
+	public static OfficialType getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return NOT;
+	}
+
+	public static OfficialType getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return NOT;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	} 
+
+}

+ 30 - 179
src/main/java/com/goafanti/common/mapper/OfficialFeePriceMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="type" jdbcType="INTEGER" property="type" />
@@ -13,107 +13,21 @@
     <result column="proportion85" jdbcType="DECIMAL" property="proportion85" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="patent_type" jdbcType="INTEGER" property="patentType" />
   </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 11:49:00 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 11:49:00 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 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
-    id, type, amount, proportion85, remarks, create_time
+    id, `type`, amount, proportion85, remarks, create_time, patent_type
   </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 10 11:49:00 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from official_fee_price
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -124,40 +38,29 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     delete from official_fee_price
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OfficialFeePriceExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
-    -->
-    delete from official_fee_price
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.OfficialFeePrice">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
-    insert into official_fee_price (id, type, amount, 
-      proportion85, remarks, create_time
-      )
+    insert into official_fee_price (id, `type`, amount, 
+      proportion85, remarks, create_time, 
+      patent_type)
     values (#{id,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL}, 
-      #{proportion85,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{proportion85,jdbcType=DECIMAL}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{patentType,jdbcType=INTEGER})
   </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 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     insert into official_fee_price
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -165,7 +68,7 @@
         id,
       </if>
       <if test="type != null">
-        type,
+        `type`,
       </if>
       <if test="amount != null">
         amount,
@@ -179,6 +82,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="patentType != null">
+        patent_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -199,77 +105,21 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="patentType != null">
+        #{patentType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.OfficialFeePriceExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
-    -->
-    select count(*) from official_fee_price
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 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.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.amount != null">
-        amount = #{record.amount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.proportion85 != null">
-        proportion85 = #{record.proportion85,jdbcType=DECIMAL},
-      </if>
-      <if test="record.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 11:49:00 CST 2020.
-    -->
-    update official_fee_price
-    set id = #{record.id,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=INTEGER},
-      amount = #{record.amount,jdbcType=DECIMAL},
-      proportion85 = #{record.proportion85,jdbcType=DECIMAL},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OfficialFeePrice">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     update official_fee_price
     <set>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        `type` = #{type,jdbcType=INTEGER},
       </if>
       <if test="amount != null">
         amount = #{amount,jdbcType=DECIMAL},
@@ -283,6 +133,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="patentType != null">
+        patent_type = #{patentType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -290,21 +143,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 10 11:49:00 CST 2020.
+      This element was generated on Fri Jul 16 11:30:10 CST 2021.
     -->
     update official_fee_price
-    set type = #{type,jdbcType=INTEGER},
+    set `type` = #{type,jdbcType=INTEGER},
       amount = #{amount,jdbcType=DECIMAL},
       proportion85 = #{proportion85,jdbcType=DECIMAL},
       remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      patent_type = #{patentType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
-  <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
-  </select>
+  
     <select id="selectBytype" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     
     select 

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -63,12 +63,13 @@
     <result column="certification_corporate" jdbcType="VARCHAR" property="certificationCorporate" />
     <result column="if_publicity" jdbcType="INTEGER" property="ifPublicity" />
     <result column="check_status" jdbcType="INTEGER" property="checkStatus" />
+    <result column="patent_type" jdbcType="INTEGER" property="patentType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
     <result column="time_record" jdbcType="LONGVARCHAR" property="timeRecord" />
@@ -77,7 +78,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
@@ -88,13 +89,13 @@
     split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch, 
     cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status, high_tech_status, 
     special_comment, if_certification_fee, certification_fee, certification_corporate, 
-    if_publicity, check_status
+    if_publicity, check_status, patent_type
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     attachment_url, time_record
   </sql>
@@ -102,7 +103,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -115,7 +116,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -124,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -144,8 +145,8 @@
       official_cost, set_up_status, set_up_time, 
       spot_check_status, high_tech_status, special_comment, 
       if_certification_fee, certification_fee, certification_corporate, 
-      if_publicity, check_status, attachment_url, 
-      time_record)
+      if_publicity, check_status, patent_type, 
+      attachment_url, time_record)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -164,14 +165,14 @@
       #{officialCost,jdbcType=INTEGER}, #{setUpStatus,jdbcType=INTEGER}, #{setUpTime,jdbcType=TIMESTAMP}, 
       #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER}, #{specialComment,jdbcType=VARCHAR}, 
       #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL}, #{certificationCorporate,jdbcType=VARCHAR}, 
-      #{ifPublicity,jdbcType=INTEGER}, #{checkStatus,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR}, 
-      #{timeRecord,jdbcType=LONGVARCHAR})
+      #{ifPublicity,jdbcType=INTEGER}, #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR}, #{timeRecord,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -343,6 +344,9 @@
       <if test="checkStatus != null">
         check_status,
       </if>
+      <if test="patentType != null">
+        patent_type,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -519,6 +523,9 @@
       <if test="checkStatus != null">
         #{checkStatus,jdbcType=INTEGER},
       </if>
+      <if test="patentType != null">
+        #{patentType,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -531,7 +538,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     update t_order_task
     <set>
@@ -700,6 +707,9 @@
       <if test="checkStatus != null">
         check_status = #{checkStatus,jdbcType=INTEGER},
       </if>
+      <if test="patentType != null">
+        patent_type = #{patentType,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -713,7 +723,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -771,6 +781,7 @@
       certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
       if_publicity = #{ifPublicity,jdbcType=INTEGER},
       check_status = #{checkStatus,jdbcType=INTEGER},
+      patent_type = #{patentType,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       time_record = #{timeRecord,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
@@ -779,7 +790,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 14 15:27:49 CST 2021.
+      This element was generated on Fri Jul 16 15:11:11 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -836,15 +847,16 @@
       certification_fee = #{certificationFee,jdbcType=DECIMAL},
       certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
       if_publicity = #{ifPublicity,jdbcType=INTEGER},
-      check_status = #{checkStatus,jdbcType=INTEGER}
+      check_status = #{checkStatus,jdbcType=INTEGER},
+      patent_type = #{patentType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <!-- 记得返回id -->
-  <!-- &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
-  		&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
+  <!-- &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
+  		&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
         SELECT LAST_INSERT_ID()
-    &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt; -->
+    &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt; -->
   <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
      insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1204,7 +1216,7 @@
     </selectKey>
   </insert>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
-	select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
+		select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
 	a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
 	e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
 	c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,
@@ -1212,7 +1224,8 @@
 	a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
 	a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus, 
 	a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
-	a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch
+	a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
+	a.patent_type patentType 
 	from t_order_task a left join business_project b on a.commodity_id=b.id
 	left join t_order_new e on a.order_no=e.order_no
 	left join admin f on e.salesman_id=f.id left join department g on
@@ -1376,7 +1389,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-  select  
+  	 select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
 	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
 	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
@@ -1388,7 +1401,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
 	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,
 	a.if_certification_fee ifCertificationFee , a.certification_corporate certificationCorporate ,a.certification_fee certificationFee ,a.time_record timeRecord,
 	a.cost_reduction costReduction,  a.official_cost officialCost,a.set_up_status setUpStatus ,date_format(a.set_up_time,'%Y-%m-%d') setUpTime ,a.high_tech_status highTechStatus ,
-	a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,
+	a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,a.check_status checkStatus, 
 	ttm.authorize_count authorizeCount ,ttm.end_count endCount,ttm.accept_count acceptCount,a.commodity_price  commodityPrice,a.commodity_quantity commodityQuantity
 	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
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
@@ -2052,4 +2065,59 @@ left join department de on x.department_id=de.id left join business_category bc
 	left join t_order_task b on a.order_no =b.order_no 
 	where a.buyer_id = #{uid}
   </select>
+  
+  <select id="selectProjectCheck" resultType="com.goafanti.order.bo.OutProjectCheck">
+    select a.id,a.commodity_name commodityName ,b.order_no orderNo,b.contract_no contractNo,a.commodity_quantity  commodityQuantity,
+    c.buyer_name userName ,e.cname  ,a.task_distribution_time  taskDistributionTime,f.name depName ,a.check_status checkStatus ,
+    a.main ,a.commodity_price commodityPrice ,a.task_comment taskComment 
+    from t_order_task a left join t_order_new b on a.order_no =b.order_no
+    left join t_order_mid c on a.order_no =c.order_no 
+    left join business_project d on a.commodity_id =d.id 
+    left join business_category e on d.cid =e.id
+    left join department f on b.order_dep =f.id
+    where check_status =1
+    <if test="name !=null">
+    and c.buyer_name like concat('%',#{name},'%')
+    </if>
+    <if test="orderNo !=null">
+    and a.order_no = #{orderNo}
+    </if>
+    <if test="contractNo !=null">
+    and b.contract_no = #{contractNo}
+    </if>
+    <if test="pname !=null">
+    and a.commodity_name like concat('%',#{pname},'%')
+    </if>
+    <if test="depId !=null">
+    and b.order_dep = #{depId}
+    </if>
+      <if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+    <select id="countProjectCheck" resultType="java.lang.Integer">
+  select count(*)
+    from t_order_task a left join t_order_new b on a.order_no =b.order_no
+    left join t_order_mid c on a.order_no =c.order_no 
+    left join business_project d on a.commodity_id =d.id 
+    left join business_category e on d.cid =e.id
+    left join department f on b.order_dep =f.id
+    where check_status =1
+    <if test="name !=null">
+    and c.buyer_name like concat('%',#{name},'%')
+    </if>
+    <if test="orderNo !=null">
+    and a.order_no = #{orderNo}
+    </if>
+    <if test="contractNo !=null">
+    and b.contract_no = #{contractNo}
+    </if>
+    <if test="pname !=null">
+    and a.commodity_name like concat('%',#{pname},'%')
+    </if>
+    <if test="depId !=null">
+    and b.order_dep = #{depId}
+    </if>
+  </select>
 </mapper>

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

@@ -536,10 +536,11 @@
   </select>
   
    <select id="selectPaymentList" resultType="com.goafanti.organization.bo.outPaymentList">
-		select a.id, c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.party_amount costAmount,
+		    select a.id, c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.party_amount costAmount,
 		a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,a.company_name companyName, 
-		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname,
-		b.commodity_name pname,b.project_status projectStatus,a.status,bp.`type` projectType
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname, b.commodity_name pname,
+		b.project_status projectStatus,a.status,bp.`type` projectType,b.cost_reduction costReduction ,b.official_cost  officialCost,c.total_amount totalAmount,
+		c.settlement_amount settlementAmount 
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
 		left join business_project bp on b.commodity_id=bp.id
 		left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
@@ -553,6 +554,9 @@
 		<if test="lvl==3">
 		and b.task_receiver= #{aid}
 		</if>
+		<if test="lvl==4">
+		and choose_type =2
+		</if>
 		<if test="contractNo !=null">
 		and c.contract_no like concat('%', #{contractNo},'%')
 		</if>
@@ -600,6 +604,9 @@
 		<if test="lvl==3">
 		and b.task_receiver= #{aid}
 		</if>
+		<if test="lvl==4">
+		and choose_type =2
+		</if>
 		<if test="contractNo !=null">
 		and c.contract_no like concat('%', #{contractNo},'%')
 		</if>
@@ -748,5 +755,31 @@
 	</if>
   </select>
   
+  <select id="selectListOfficialFeePrice" resultType="com.goafanti.common.model.OfficialFeePrice">
+  select id,type,patent_type patentType,amount,proportion85,remarks,date_format(create_time, '%Y-%m-%d %H:%i:%S') createTimes
+	 from official_fee_price where 1=1
+	 <if test="type != null">
+	 and type= #{type}
+	 </if>
+	 <if test="patentType != null">
+	 and patent_type= #{patentType}
+	 </if>
+	order by patent_type
+	 <if test="page_sql!=null">
+	${page_sql}
+	</if>
+  </select>
+  
+   <select id="countListOfficialFeePrice" resultType="java.lang.Integer" >
+  select count(*)
+	  from official_fee_price where 1=1
+	 <if test="type != null">
+	 and type= #{type}
+	 </if>
+	 <if test="patentType != null">
+	 and patent_type= #{patentType}
+	 </if>
+  </select>
+  
   
 </mapper>

+ 95 - 26
src/main/java/com/goafanti/common/model/OfficialFeePrice.java

@@ -3,42 +3,57 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class OfficialFeePrice {
+import com.goafanti.common.enums.OfficialPatentType;
+import com.goafanti.common.enums.OfficialType;
+
+import java.io.Serializable;
+
+public class OfficialFeePrice implements Serializable {
     /**
-	 * 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
+	 * Database Column Remarks: 编号 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.id
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * Database Column Remarks: 0实用新型 1外观专利 2发明专利 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.type
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * Database Column Remarks: 金额 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.amount
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * Database Column Remarks: 减缴比例85% This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.proportion85
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * Database Column Remarks: 备注 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.remarks
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	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
+	 * Database Column Remarks: 创建时间 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.create_time
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	private Date createTime;
+	/**
+	 * Database Column Remarks: 专利分类 0申请 1变更 2复审 3优先权 4恢复请求权 5无效宣告请求费 6强制许可请求费 7 强制许可使用裁决请求费 8登录、印刷费、印花税 This field was generated by MyBatis Generator. This field corresponds to the database column official_fee_price.patent_type
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
+	 */
+	private Integer patentType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table official_fee_price
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
+	 */
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -47,7 +62,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -56,7 +71,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public Integer getType() {
 		return type;
@@ -65,7 +80,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -74,7 +89,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public BigDecimal getAmount() {
 		return amount;
@@ -83,7 +98,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
@@ -92,7 +107,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public BigDecimal getProportion85() {
 		return proportion85;
@@ -101,7 +116,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setProportion85(BigDecimal proportion85) {
 		this.proportion85 = proportion85;
@@ -110,7 +125,7 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -119,16 +134,16 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setRemarks(String remarks) {
-		this.remarks = remarks;
+		this.remarks = remarks == null ? null : remarks.trim();
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column official_fee_price.create_time
 	 * @return  the value of official_fee_price.create_time
-	 * @mbg.generated  Thu Sep 10 11:49:00 CST 2020
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -137,12 +152,52 @@ public class OfficialFeePrice {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column official_fee_price.patent_type
+	 * @return  the value of official_fee_price.patent_type
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
+	 */
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column official_fee_price.patent_type
+	 * @param patentType  the value for official_fee_price.patent_type
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
+	 */
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table official_fee_price
+	 * @mbg.generated  Fri Jul 16 11:30:10 CST 2021
+	 */
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(getClass().getSimpleName());
+		sb.append(" [");
+		sb.append("Hash = ").append(hashCode());
+		sb.append(", id=").append(id);
+		sb.append(", type=").append(type);
+		sb.append(", amount=").append(amount);
+		sb.append(", proportion85=").append(proportion85);
+		sb.append(", remarks=").append(remarks);
+		sb.append(", createTime=").append(createTime);
+		sb.append(", patentType=").append(patentType);
+		sb.append(", serialVersionUID=").append(serialVersionUID);
+		sb.append("]");
+		return sb.toString();
+	}
+
 	public String getCreateTimes() {
 		return createTimes;
 	}
@@ -150,6 +205,20 @@ public class OfficialFeePrice {
 	public void setCreateTimes(String createTimes) {
 		this.createTimes = createTimes;
 	}
+	
+	public String getTypeName() {
+		if (getType()!=null) {
+			return OfficialType.getValueByCode(getType());
+		}
+		return OfficialType.NOT.getDesc();
+	}
+	
+	public String getTypePatentName() {
+		if (getType()!=null) {
+			return OfficialPatentType.getValueByCode(getPatentType());
+		}
+		return OfficialPatentType.NOT.getDesc();
+	}
 
 	private String createTimes;
 }

File diff suppressed because it is too large
+ 200 - 176
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 102 - 0
src/main/java/com/goafanti/order/bo/OutProjectCheck.java

@@ -0,0 +1,102 @@
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+public class OutProjectCheck {
+
+	private Integer id;
+	private String commodityName;
+	private Integer commodityQuantity;
+	private String orderNo;
+	private String contractNo;
+	private String userName;
+	private String cname;
+	private String taskDistributionTime;
+	private String depName;
+	private Integer checkStatus;
+	private Integer main;
+	private BigDecimal commodityPrice; 
+	private String taskComment;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getTaskDistributionTime() {
+		return taskDistributionTime;
+	}
+	public void setTaskDistributionTime(String taskDistributionTime) {
+		this.taskDistributionTime = taskDistributionTime;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public Integer getCheckStatus() {
+		return checkStatus;
+	}
+	public void setCheckStatus(Integer checkStatus) {
+		this.checkStatus = checkStatus;
+	}
+	public Integer getCommodityQuantity() {
+		return commodityQuantity;
+	}
+	public void setCommodityQuantity(Integer commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
+	public Integer getMain() {
+		return main;
+	}
+	public void setMain(Integer main) {
+		this.main = main;
+	}
+	public BigDecimal getCommodityPrice() {
+		return commodityPrice;
+	}
+	public void setCommodityPrice(BigDecimal commodityPrice) {
+		this.commodityPrice = commodityPrice;
+	}
+	public String getTaskComment() {
+		return taskComment;
+	}
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+	
+	
+	
+	
+}

+ 18 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -35,9 +35,27 @@ public class TOrderTaskBo extends TOrderTask{
 	
 	private BigDecimal appropriationRatio;
 	
+	private Integer patentType;
+	
 	@Excel(name = "项目状态",sort = 13)
 	private String projectStatusName;
 	
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
+
+	public String getProjectStatusName() {
+		return projectStatusName;
+	}
+
+	public void setProjectStatusName(String projectStatusName) {
+		this.projectStatusName = projectStatusName;
+	}
+
 	public String getProjectSatusName() {
 		return projectStatusName;
 	}

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

@@ -112,6 +112,7 @@ public class TOrderTaskDetailBo {
 	private Integer	commodityQuantity;
 	private String timeRecord;
 	
+	private Integer	checkStatus;
 	
 	
 	
@@ -519,6 +520,12 @@ public class TOrderTaskDetailBo {
 	public void setTimeRecord(String timeRecord) {
 		this.timeRecord = timeRecord;
 	}
+	public Integer getCheckStatus() {
+		return checkStatus;
+	}
+	public void setCheckStatus(Integer checkStatus) {
+		this.checkStatus = checkStatus;
+	}
 	
 	
 }

+ 58 - 0
src/main/java/com/goafanti/order/controller/InputProjectCheck.java

@@ -0,0 +1,58 @@
+package com.goafanti.order.controller;
+
+public class InputProjectCheck {
+	private String name;
+	private String orderNo;
+	private String contractNo;
+	private String pname;
+	private String depId;
+	private Integer pageSize;
+	private Integer pageNo;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
+	public String getDepId() {
+		return depId;
+	}
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	public String getPname() {
+		return pname;
+	}
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+	
+	
+	
+	
+}

+ 27 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -21,6 +21,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.OfficialPatentType;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
@@ -412,5 +413,31 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	
+	/**
+	 * 	获取专利分类
+	 * @param tid
+	 * @return
+	 */
+	@RequestMapping(value = "/getPatentType",method = RequestMethod.GET)
+	public Result getPatentType() {
+		Result res =new Result();
+		res.data(OfficialPatentType.getStatus());
+		return res;
+	}
+	
+	/**
+	 * 	核对列表
+	 * @param tid
+	 * @return
+	 */
+	@RequestMapping(value = "/selectProjectCheck",method = RequestMethod.GET)
+	public Result selectProjectCheck(InputProjectCheck in) {
+		Result res =new Result();
+		res.data(orderProjectService.selectProjectCheck(in));
+		return res;
+	}
+	
+	
+	
 	
 }

+ 3 - 0
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -15,6 +15,7 @@ import com.goafanti.order.bo.inuptTaskHoursListBo;
 import com.goafanti.order.bo.inuptTaskListBo;
 import com.goafanti.order.bo.managerListBo;
 import com.goafanti.order.bo.taskAttributionLogBo;
+import com.goafanti.order.controller.InputProjectCheck;
 import com.goafanti.organization.bo.OutPaymentNode;
 
 public interface OrderProjectService {
@@ -83,5 +84,7 @@ public interface OrderProjectService {
 
 	Object projectCheckLog(Integer tid);
 
+	Object selectProjectCheck(InputProjectCheck in);
+
 
 }

+ 16 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 
 import javax.mail.MessagingException;
 
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,6 +88,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.OutProjectCheck;
 import com.goafanti.order.bo.OutProjectCheckLog;
 import com.goafanti.order.bo.OutTaskProgressLog;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -99,6 +101,7 @@ import com.goafanti.order.bo.inuptTaskHoursListBo;
 import com.goafanti.order.bo.inuptTaskListBo;
 import com.goafanti.order.bo.managerListBo;
 import com.goafanti.order.bo.taskAttributionLogBo;
+import com.goafanti.order.controller.InputProjectCheck;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.NewProjectStatus;
@@ -1013,5 +1016,18 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<OutProjectCheckLog> projectCheckLog(Integer tid) {
 		return projcetCheckLogMapper.projectCheckLog(tid);
 	}
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Object selectProjectCheck(InputProjectCheck in) {
+		Map<String, Object> map=new HashedMap<String, Object>();
+		if (in.getName()!=null) map.put("name", in.getName());
+		if (in.getOrderNo()!=null) map.put("orderNo", in.getOrderNo());
+		if (in.getContractNo()!=null) map.put("contartNo", in.getContractNo());
+		if (in.getPname()!=null) map.put("pname", in.getPname());
+		if (in.getDepId()!=null) map.put("depId", in.getDepId());
+		return (Pagination<OutProjectCheck>)findPage("selectProjectCheck", "countProjectCheck", map, in.getPageNo(), in.getPageSize());
+	}
 	
 }

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

@@ -10,6 +10,7 @@ public class InputPaymentList {
 	private String cname; 
 	private String pname; 
 	private Integer status;
+	private Integer chooseType;
 	private Integer pageSize;
 	private Integer pageNo;
 	public String getContractNo() {
@@ -86,6 +87,12 @@ public class InputPaymentList {
 	public void setPname(String pname) {
 		this.pname = pname;
 	}
+	public Integer getChooseType() {
+		return chooseType;
+	}
+	public void setChooseType(Integer chooseType) {
+		this.chooseType = chooseType;
+	}
 	
 
 

+ 38 - 0
src/main/java/com/goafanti/organization/bo/outPaymentList.java

@@ -42,7 +42,21 @@ public class outPaymentList {
 		private Integer status;
 		@Excel(name = "创建时间")
 		private String createTime;
+		private Integer costReduction;
+		private Integer officialCost;
 		private Integer projectType;
+		private BigDecimal totalAmount;
+		private BigDecimal settlementAmount;
+		@Excel(name= "官费")
+		private String officialName;
+		
+		
+		public String getOfficialName() {
+			return officialName;
+		}
+		public void setOfficialName(String officialName) {
+			this.officialName = officialName;
+		}
 		public String getContractNo() {
 			return contractNo;
 		}
@@ -158,5 +172,29 @@ public class outPaymentList {
 		public void setCompanyName(String companyName) {
 			this.companyName = companyName;
 		}
+		public Integer getCostReduction() {
+			return costReduction;
+		}
+		public void setCostReduction(Integer costReduction) {
+			this.costReduction = costReduction;
+		}
+		public Integer getOfficialCost() {
+			return officialCost;
+		}
+		public void setOfficialCost(Integer officialCost) {
+			this.officialCost = officialCost;
+		}
+		public BigDecimal getTotalAmount() {
+			return totalAmount;
+		}
+		public void setTotalAmount(BigDecimal totalAmount) {
+			this.totalAmount = totalAmount;
+		}
+		public BigDecimal getSettlementAmount() {
+			return settlementAmount;
+		}
+		public void setSettlementAmount(BigDecimal settlementAmount) {
+			this.settlementAmount = settlementAmount;
+		}
 		
 }

+ 190 - 0
src/main/java/com/goafanti/organization/bo/outPaymentListPatent.java

@@ -0,0 +1,190 @@
+package com.goafanti.organization.bo;
+
+import java.math.BigDecimal;
+
+import com.goafanti.common.utils.excel.Excel;
+import com.goafanti.common.utils.excel.ExcelConstant;
+
+public class outPaymentListPatent {
+		
+		@Excel(name = "支付编号")
+		private Integer id;
+		@Excel(name = "项目编号")
+		private Integer tid;
+		@Excel(name = "项目名称")
+		private String pname;
+		@Excel(name = "项目状态",readConverterExp = ExcelConstant.NewProjectStatusStr)
+		private Integer projectStatus;
+		@Excel(name = "分类名称")
+		private String cname;
+		@Excel(name = "合同编号")
+		private String contractNo;
+		@Excel(name = "订单编号")
+		private String orderNo;
+		@Excel(name = "客户名称")
+		private String userName;
+		@Excel(name = "部门名称")
+		private String depName;
+		@Excel(name = "第三方机构名称")
+		private String companyName;
+		private String costAmount;
+		@Excel(name = "付款类型",readConverterExp = ExcelConstant.chooseTypeStr)
+		private Integer chooseType;
+		@Excel(name = "本次申请金额",scale = 6)
+		private BigDecimal applicationAmount;
+		@Excel(name = "已支付",scale = 6)
+		private BigDecimal paymentAmount;
+		@Excel(name = "申请人")
+		private String aname;
+		@Excel(name = "财务名称")
+		private String financeName;
+		@Excel(name = "状态",readConverterExp = ExcelConstant.paymentStatusStr)
+		private Integer status;
+		@Excel(name = "创建时间")
+		private String createTime;
+		private Integer costReduction;
+		private Integer officialCost;
+		private Integer projectType;
+		private BigDecimal totalAmount;
+		private BigDecimal settlementAmount; 
+		public String getContractNo() {
+			return contractNo;
+		}
+		public void setContractNo(String contractNo) {
+			this.contractNo = contractNo;
+		}
+		public String getOrderNo() {
+			return orderNo;
+		}
+		public void setOrderNo(String orderNo) {
+			this.orderNo = orderNo;
+		}
+		public String getUserName() {
+			return userName;
+		}
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+		public String getDepName() {
+			return depName;
+		}
+		public void setDepName(String depName) {
+			this.depName = depName;
+		}
+		public String getCostAmount() {
+			return costAmount;
+		}
+		public void setCostAmount(String costAmount) {
+			this.costAmount = costAmount;
+		}
+		
+		public BigDecimal getPaymentAmount() {
+			return paymentAmount;
+		}
+		public void setPaymentAmount(BigDecimal paymentAmount) {
+			this.paymentAmount = paymentAmount;
+		}
+		public BigDecimal getApplicationAmount() {
+			return applicationAmount;
+		}
+		public void setApplicationAmount(BigDecimal applicationAmount) {
+			this.applicationAmount = applicationAmount;
+		}
+		public String getCreateTime() {
+			return createTime;
+		}
+		public void setCreateTime(String createTime) {
+			this.createTime = createTime;
+		}
+		public String getAname() {
+			return aname;
+		}
+		public void setAname(String aname) {
+			this.aname = aname;
+		}
+		public String getFinanceName() {
+			return financeName;
+		}
+		public void setFinanceName(String financeName) {
+			this.financeName = financeName;
+		}
+		public String getCname() {
+			return cname;
+		}
+		public void setCname(String cname) {
+			this.cname = cname;
+		}
+		public String getPname() {
+			return pname;
+		}
+		public void setPname(String pname) {
+			this.pname = pname;
+		}
+		public Integer getProjectStatus() {
+			return projectStatus;
+		}
+		public void setProjectStatus(Integer projectStatus) {
+			this.projectStatus = projectStatus;
+		}
+		public Integer getStatus() {
+			return status;
+		}
+		public void setStatus(Integer status) {
+			this.status = status;
+		}
+		public Integer getTid() {
+			return tid;
+		}
+		public void setTid(Integer tid) {
+			this.tid = tid;
+		}
+		public Integer getChooseType() {
+			return chooseType;
+		}
+		public void setChooseType(Integer chooseType) {
+			this.chooseType = chooseType;
+		}
+		public Integer getProjectType() {
+			return projectType;
+		}
+		public void setProjectType(Integer projectType) {
+			this.projectType = projectType;
+		}
+		public Integer getId() {
+			return id;
+		}
+		public void setId(Integer id) {
+			this.id = id;
+		}
+		public String getCompanyName() {
+			return companyName;
+		}
+		public void setCompanyName(String companyName) {
+			this.companyName = companyName;
+		}
+		public Integer getCostReduction() {
+			return costReduction;
+		}
+		public void setCostReduction(Integer costReduction) {
+			this.costReduction = costReduction;
+		}
+		public Integer getOfficialCost() {
+			return officialCost;
+		}
+		public void setOfficialCost(Integer officialCost) {
+			this.officialCost = officialCost;
+		}
+		public BigDecimal getTotalAmount() {
+			return totalAmount;
+		}
+		public void setTotalAmount(BigDecimal totalAmount) {
+			this.totalAmount = totalAmount;
+		}
+		public BigDecimal getSettlementAmount() {
+			return settlementAmount;
+		}
+		public void setSettlementAmount(BigDecimal settlementAmount) {
+			this.settlementAmount = settlementAmount;
+		}
+		
+}

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

@@ -596,9 +596,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/listOfficialFeePrice" , method = RequestMethod.GET)
-	public Result listOfficialFeePrice(String name) {
+	public Result listOfficialFeePrice(Integer type,Integer patentType,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
-		res.data(thirdPartyCompanyService.listOfficialFeePrice(name));
+		res.data(thirdPartyCompanyService.listOfficialFeePrice(type,patentType, pageSize, pageNo));
 		return res;
 	}
 	
@@ -676,15 +676,15 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	
 	/**
 	 * 	导出付款审核表
-	 * @throws IOException 
+	 * @throws IOException
+	 * type 0财务 1专利管理员 
 	 */
 	@RequestMapping(value = "/exportPaymentList", method = RequestMethod.GET)
-	public Result exportPaymentList(HttpServletResponse response,InputPaymentList ip){
-		@SuppressWarnings("unchecked")
-		List<outPaymentList> list=(List<outPaymentList>) thirdPartyCompanyService.selectPaymentList(ip).getList();
-		NewExcelUtil<outPaymentList> excelUtil=new NewExcelUtil<>(outPaymentList.class);
-		return excelUtil.exportExcel(list, "财务成本列表", response);
+	public Result exportPaymentList(HttpServletResponse response,InputPaymentList ip,Integer type){
+		
+		return thirdPartyCompanyService.exportPaymentList(response,ip,type);
 		
 	}
 	
+	
 }

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

@@ -3,7 +3,9 @@ package com.goafanti.organization.service;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.OfficialFeePrice;
 import com.goafanti.common.model.PatentPrice;
@@ -85,7 +87,7 @@ public interface ThirdPartyCompanyService {
 
 	int deleteOfficialFeePrice(Integer id);
 
-	List<OfficialFeePrice> listOfficialFeePrice(String name);
+	Pagination<OfficialFeePrice>  listOfficialFeePrice(Integer type, Integer patentType, Integer pageSize, Integer pageNo);
 
 	int deleteFinancialPayment(Integer id);
 
@@ -107,6 +109,12 @@ public interface ThirdPartyCompanyService {
 
 	void checkGetAmount(TOrderPayment p);
 
+	Result exportPaymentList(HttpServletResponse response, InputPaymentList ip, Integer type);
+
+
+	
+
+
 
 
 }

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

@@ -10,13 +10,16 @@ import java.util.Map;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
+import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CompanyLibraryMapper;
@@ -43,6 +46,7 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -598,7 +602,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			map.put("lvl", 2);
 		}else  if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)) {
 			map.put("lvl", 3);
-		}else  {
+		}else if(TokenManager.hasRole(AFTConstants.PATENT_AUDITOR)) 
+		{
+			map.put("lvl", 4);
+		}else {
 			map.put("lvl", 0);
 		}
 		return (Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
@@ -767,9 +774,14 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public List<OfficialFeePrice> listOfficialFeePrice(String name) {
-		return officialFeePriceMapper.selectListByname(name);
+	public Pagination<OfficialFeePrice>  listOfficialFeePrice(Integer type, Integer patentType, Integer pageSize, Integer pageNo){
+		Map<String, Object>map=new HashedMap<String, Object>();
+		if(type!=null)map.put("type", type);
+		if(patentType!=null)map.put("patentType", patentType);
+		return (Pagination<OfficialFeePrice>)findPage("selectListOfficialFeePrice","countListOfficialFeePrice",
+				map,pageNo,pageSize);
 	}
 
 
@@ -873,4 +885,35 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}
 		
 	}
+
+
+
+
+
+	@Override
+	public Result exportPaymentList(HttpServletResponse response, InputPaymentList ip, Integer type) {
+		if (type==null) type=0;
+		@SuppressWarnings("unchecked")
+		List<outPaymentList> list=(List<outPaymentList>) selectPaymentList(ip).getList();
+		if (type==0) {
+			for (outPaymentList o : list) {
+				StringBuffer s=new StringBuffer();
+				if (o.getOfficialCost()!=null&&o.getOfficialCost()==1) {
+					s.append("含官费");
+					if (o.getCostReduction()!=null&&o.getOfficialCost()==1) {
+						s.append(",有费减");
+					}else {
+						s.append(",无费减");
+					}
+				}else {
+					s.append("不含官费");
+				}
+				o.setOfficialName(s.toString());
+			}
+			NewExcelUtil<outPaymentList> excelUtil=new NewExcelUtil<>(outPaymentList.class);
+			return excelUtil.exportExcel(list, "财务成本列表", response);
+		}
+		return null;
+	}
+		
 }