Sfoglia il codice sorgente

新专利导入开发

anderx 4 anni fa
parent
commit
7782c972e3
25 ha cambiato i file con 1442 aggiunte e 199 eliminazioni
  1. 0 16
      .vscode/launch.json
  2. 1 1
      GeneratorConfig.xml
  3. 1 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  4. 12 6
      src/main/java/com/goafanti/common/dao/PatentNewMapper.java
  5. 57 0
      src/main/java/com/goafanti/common/dao/PatentPaymentDetailsMapper.java
  6. 57 0
      src/main/java/com/goafanti/common/dao/PatentYearPaymentMapper.java
  7. 3 0
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  8. 0 1
      src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java
  9. 79 43
      src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml
  10. 169 0
      src/main/java/com/goafanti/common/mapper/PatentPaymentDetailsMapper.xml
  11. 153 0
      src/main/java/com/goafanti/common/mapper/PatentYearPaymentMapper.xml
  12. 7 0
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  13. 0 6
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  14. 94 94
      src/main/java/com/goafanti/common/model/PatentNew.java
  15. 287 0
      src/main/java/com/goafanti/common/model/PatentPaymentDetails.java
  16. 251 0
      src/main/java/com/goafanti/common/model/PatentYearPayment.java
  17. 0 1
      src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java
  18. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  19. 2 0
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  20. 25 8
      src/main/java/com/goafanti/patent/bo/PatentNewBo.java
  21. 2 2
      src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java
  22. 78 0
      src/main/java/com/goafanti/patent/enums/PatentType.java
  23. 2 1
      src/main/java/com/goafanti/patent/service/PatentNewService.java
  24. 155 13
      src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java
  25. 6 6
      src/main/resources/props/config_local.properties

+ 0 - 16
.vscode/launch.json

@@ -1,16 +0,0 @@
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch Chrome 127.0.0.1",
-      "type": "chrome",
-      "request": "launch",
-      "port": 9276,
-      "webRoot": "${workspaceFolder}",
-      "url": "http://127.0.0.1:50939/p/kede-server/src/main/webapp/WEB-INF/views/common.html?_cmAuth\u003dxdspwawfnr"
-    }
-  ]
-}

+ 1 - 1
GeneratorConfig.xml

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

+ 1 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -716,6 +716,7 @@ public class PublicController extends CertifyApiController {
                   response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
                   FileUtils.setAttachmentResponseHeader(response, realFileName);
                   FileUtils.writeBytes(filePath, response.getOutputStream());
+                  if(delete==null)delete=true;
                   if (delete)
                   {
                       FileUtils.deleteFile(filePath);

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

@@ -10,37 +10,37 @@ public interface PatentNewMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	int insert(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	int insertSelective(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	PatentNew selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	int updateByPrimaryKeySelective(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	int updateByPrimaryKey(PatentNew record);
 
@@ -52,4 +52,10 @@ public interface PatentNewMapper {
 
 
 	void insertLogBatch(List<PatentNewLog> list);
+
+	void insertBatch(List<PatentNew> list2);
+
+	int selectByPatenNo(String patentNo);
+
+	List<PatentNew> selectByYear(int i);
 }

+ 57 - 0
src/main/java/com/goafanti/common/dao/PatentPaymentDetailsMapper.java

@@ -0,0 +1,57 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.PatentPaymentDetails;
+
+public interface PatentPaymentDetailsMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    int insert(PatentPaymentDetails record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    int insertSelective(PatentPaymentDetails record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    PatentPaymentDetails selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    int updateByPrimaryKeySelective(PatentPaymentDetails record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    int updateByPrimaryKey(PatentPaymentDetails record);
+
+	void insertBatch(List<PatentPaymentDetails> list);
+}

+ 57 - 0
src/main/java/com/goafanti/common/dao/PatentYearPaymentMapper.java

@@ -0,0 +1,57 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.PatentYearPayment;
+
+public interface PatentYearPaymentMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    int insert(PatentYearPayment record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    int insertSelective(PatentYearPayment record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    PatentYearPayment selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    int updateByPrimaryKeySelective(PatentYearPayment record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    int updateByPrimaryKey(PatentYearPayment record);
+
+	List<PatentYearPayment> selectAll();
+}

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

@@ -6,6 +6,7 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.organization.bo.ProjectTypePuls;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -88,4 +89,6 @@ public interface TOrderTaskMapper {
 
 	OrderOperator selectAidByParam(@Param("tid")Integer tid);
 
+	ProjectTypePuls selectByTidGetDtails(Integer tid);
+
 }

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

@@ -85,5 +85,4 @@ public interface ThirdPartyCompanyMapper {
 
 	void deleteByTid(Integer id);
 
-	List<ProjectTypePuls>  selectByTidGetListDtails(Integer tid);
 }

+ 79 - 43
src/main/java/com/goafanti/common/mapper/PatentNewMapper.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 Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="patent_no" jdbcType="VARCHAR" property="patentNo" />
@@ -33,24 +33,24 @@
     <result column="new_type" jdbcType="INTEGER" property="newType" />
     <result column="delaying_amount" jdbcType="DECIMAL" property="delayingAmount" />
     <result column="recovery_amount" jdbcType="DECIMAL" property="recoveryAmount" />
-    <result column="input_name" jdbcType="VARCHAR" property="inputName" />
+    <result column="input_id" jdbcType="VARCHAR" property="inputId" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     id, patent_no, `name`, `type`, `status`, apply_date, authorization_date, patent_amount, 
     applicant, province, contact_mobile, email, certificate_url, create_time, update_time, 
     aid, `years`, `uid`, holders, inventor, annual_fee_status, salesman_remind, tid, 
-    new_type, delaying_amount, recovery_amount, input_name
+    new_type, delaying_amount, recovery_amount, input_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -61,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     delete from patent_new
     where id = #{id,jdbcType=INTEGER}
@@ -70,7 +70,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     insert into patent_new (id, patent_no, `name`, 
       `type`, `status`, apply_date, 
@@ -80,7 +80,7 @@
       aid, `years`, `uid`, holders, 
       inventor, annual_fee_status, salesman_remind, 
       tid, new_type, delaying_amount, 
-      recovery_amount, input_name)
+      recovery_amount, input_id)
     values (#{id,jdbcType=INTEGER}, #{patentNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{applyDate,jdbcType=DATE}, 
       #{authorizationDate,jdbcType=DATE}, #{patentAmount,jdbcType=DECIMAL}, #{applicant,jdbcType=VARCHAR}, 
@@ -89,13 +89,13 @@
       #{aid,jdbcType=VARCHAR}, #{years,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{holders,jdbcType=VARCHAR}, 
       #{inventor,jdbcType=VARCHAR}, #{annualFeeStatus,jdbcType=INTEGER}, #{salesmanRemind,jdbcType=INTEGER}, 
       #{tid,jdbcType=INTEGER}, #{newType,jdbcType=INTEGER}, #{delayingAmount,jdbcType=DECIMAL}, 
-      #{recoveryAmount,jdbcType=DECIMAL}, #{inputName,jdbcType=VARCHAR})
+      #{recoveryAmount,jdbcType=DECIMAL}, #{inputId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     insert into patent_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -177,8 +177,8 @@
       <if test="recoveryAmount != null">
         recovery_amount,
       </if>
-      <if test="inputName != null">
-        input_name,
+      <if test="inputId != null">
+        input_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -260,8 +260,8 @@
       <if test="recoveryAmount != null">
         #{recoveryAmount,jdbcType=DECIMAL},
       </if>
-      <if test="inputName != null">
-        #{inputName,jdbcType=VARCHAR},
+      <if test="inputId != null">
+        #{inputId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -269,7 +269,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     update patent_new
     <set>
@@ -348,8 +348,8 @@
       <if test="recoveryAmount != null">
         recovery_amount = #{recoveryAmount,jdbcType=DECIMAL},
       </if>
-      <if test="inputName != null">
-        input_name = #{inputName,jdbcType=VARCHAR},
+      <if test="inputId != null">
+        input_id = #{inputId,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -358,7 +358,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 05 17:02:04 CST 2021.
+      This element was generated on Fri Aug 06 11:49:51 CST 2021.
     -->
     update patent_new
     set patent_no = #{patentNo,jdbcType=VARCHAR},
@@ -386,20 +386,22 @@
       new_type = #{newType,jdbcType=INTEGER},
       delaying_amount = #{delayingAmount,jdbcType=DECIMAL},
       recovery_amount = #{recoveryAmount,jdbcType=DECIMAL},
-      input_name = #{inputName,jdbcType=VARCHAR}
+      input_id = #{inputId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <select id="selectPatentNewList" resultType="com.goafanti.patent.bo.PatentNewBo">
-	  select a.id,a.patent_no as patentNo,a.name,a.type,a.status,
-	  date_format(a.apply_date,'%Y-%m-%d') as applyDates,a.uid,
-	  date_format(a.authorization_date ,'%Y-%m-%d ')as authorizationDates,a.patent_amount as patentAmount,a.province,
+	 select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders ,a.inventor ,a.annual_fee_status  annualFeeStatus,
+	  date_format(a.apply_date,'%Y-%m-%d') as applyDates,a.uid,a.salesman_remind salesmanRemind, 
+	  date_format(a.authorization_date ,'%Y-%m-%d ')as authorizationDates,a.province,
 	a.applicant,a.contact_mobile as contactMobile,a.email,a.certificate_url as certificateUrl,
-	date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTimeS,a.apply_date as applyDate,c.name depName,
-	date_format(a.update_time,'%Y-%m-%d %H:%I:%S') as updateTimeS,b.name as aname,u.nickname  userName
+	date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTimeS,a.apply_date as applyDate,
+	date_format(a.update_time,'%Y-%m-%d %H:%I:%S') as updateTimeS,b.name as aname,tm.buyer_name userName,
+	a.patent_amount as patentAmount,a.delaying_amount delayingAmount ,a.recovery_amount recoveryAmount, c.commodity_name commodityName ,
+	c.id tid,tm.salesman_name salesmanName ,c.receiver_name techName,tm.dep_name depName,ia.name inputName
 	from patent_new a left join admin b on a.aid=b.id
-	left join `user` u on a.uid=u.id
-	left join department c on b.department_id=c.id
+	left join t_order_task c on a.tid =c.id  left join t_order_mid tm on c.order_no =tm.order_no 
+	left join admin ia on a.input_id =ia.id 
 	<if test="shiro ==1">
      left join admin e on e.department_id=c.id
 	</if>
@@ -412,7 +414,7 @@
 	</if>
     <if test="status != null">
      and a.status=#{status}
-     </if>
+    </if>
        <if test="type != null">
      and a.type=#{type}
      </if>
@@ -423,16 +425,25 @@
      and a.create_time between  #{createStart} and  #{createEnd}
      </if>
      <if test="name != null">
-     and a.applicant  like concat('%',#{name},'%')
+     and a.name  like concat('%',#{name},'%')
      </if>
      <if test="patentNo != null">
      and a.patent_no like concat('%',#{patentNo},'%')
      </if>
+     <if test="annualFeeStatus != null">
+	and a.annual_fee_status = #{annualFeeStatus}
+     </if>
+	  <if test="userName != null">
+	and tm.buyer_name like concat('%',#{userName},'%')
+     </if>
      <if test="aname != null">
      and b.name like concat('%',#{aname},'%')
      </if>
-     <if test="departmentId != null">
-     and b.department_id= #{departmentId}
+     <if test="depName != null">
+     and tm.dep_name = #{depName}
+     </if>
+     <if test="salesmanRemind !=null">
+     and a.salesman_remind= #{salesmanRemind}
      </if>
 	order by a.status ,a.create_time
 	<if test="page_sql!=null">
@@ -442,7 +453,8 @@
     <select id="selectPatentNewCount" resultType="java.lang.Integer">
 	  select count(*)
 	from patent_new a left join admin b on a.aid=b.id
-	left join department c on b.department_id=c.id
+	left join t_order_task c on a.tid =c.id  left join t_order_mid tm on c.order_no =tm.order_no 
+	left join admin ia on a.input_id =ia.id 
 	<if test="shiro ==1">
      left join admin e on e.department_id=c.id
 	</if>
@@ -455,7 +467,7 @@
 	</if>
     <if test="status != null">
      and a.status=#{status}
-     </if>
+    </if>
        <if test="type != null">
      and a.type=#{type}
      </if>
@@ -466,16 +478,25 @@
      and a.create_time between  #{createStart} and  #{createEnd}
      </if>
      <if test="name != null">
-     and a.applicant  like concat('%',#{name},'%')
+     and a.name  like concat('%',#{name},'%')
      </if>
      <if test="patentNo != null">
      and a.patent_no like concat('%',#{patentNo},'%')
      </if>
+     <if test="annualFeeStatus != null">
+	and a.annual_fee_status = #{annualFeeStatus}
+     </if>
+	  <if test="userName != null">
+	and tm.buyer_name like concat('%',#{userName},'%')
+     </if>
      <if test="aname != null">
      and b.name like concat('%',#{aname},'%')
      </if>
-     <if test="departmentId != null">
-     and b.department_id= #{departmentId}
+     <if test="depName != null">
+     and tm.dep_name = #{depName}
+     </if>
+     <if test="salesmanRemind !=null">
+     and a.salesman_remind= #{salesmanRemind}
      </if>
 	</select>
 	
@@ -495,20 +516,35 @@
 	where aid= #{aid} 
     </update>
     <insert id="insertBatch">
-        insert into patent_new (patent_no, `name`, 
+          insert into patent_new (id, patent_no, `name`, 
       `type`, `status`, apply_date, 
       authorization_date, patent_amount, applicant, 
       province, contact_mobile, email, 
       certificate_url, create_time, update_time, 
-      aid, `years`, `uid`)values
+      aid, `years`, `uid`, holders, 
+      inventor,  
+      tid, new_type, delaying_amount, 
+       input_id)
+    values 
       <foreach collection="list" index="index" item="item" separator=",">
-      ( #{item.aid,jdbcType=VARCHAR}, #{item.noticeType,jdbcType=INTEGER},
-      	#{item.content,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.readed,jdbcType=INTEGER},
-      	#{item.uid,jdbcType=VARCHAR}, #{item.pid,jdbcType=VARCHAR}, #{item.rid,jdbcType=VARCHAR},
-      	#{item.year,jdbcType=INTEGER}
-      )
+      (#{item.id,jdbcType=INTEGER}, #{item.patentNo,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, 
+      #{item.type,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER}, #{item.applyDate,jdbcType=DATE}, 
+      #{item.authorizationDate,jdbcType=DATE}, #{item.patentAmount,jdbcType=DECIMAL}, #{item.applicant,jdbcType=VARCHAR}, 
+      #{item.province,jdbcType=INTEGER}, #{item.contactMobile,jdbcType=VARCHAR}, #{item.email,jdbcType=VARCHAR}, 
+      #{item.certificateUrl,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.aid,jdbcType=VARCHAR}, #{item.years,jdbcType=INTEGER}, #{item.uid,jdbcType=VARCHAR}, #{item.holders,jdbcType=VARCHAR}, 
+      #{item.inventor,jdbcType=VARCHAR},  
+      #{item.tid,jdbcType=INTEGER}, #{item.newType,jdbcType=INTEGER}, #{item.delayingAmount,jdbcType=DECIMAL}, 
+       #{item.inputId,jdbcType=VARCHAR})
     </foreach>
     </insert>
+    <select id="selectByPatenNo" resultType="java.lang.Integer">
+    select count(*) from patent_new where patent_no = #{patenNo}
+    </select>
     
-    
+    <select id="selectByYear" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from patent_new where years = #{year}
+    </select>
 </mapper>

+ 169 - 0
src/main/java/com/goafanti/common/mapper/PatentPaymentDetailsMapper.xml

@@ -0,0 +1,169 @@
+<?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.PatentPaymentDetailsMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PatentPaymentDetails">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="years" jdbcType="INTEGER" property="years" />
+    <result column="patent_amount" jdbcType="DECIMAL" property="patentAmount" />
+    <result column="end_date" jdbcType="DATE" property="endDate" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    id, pid, `years`, patent_amount, end_date, `status`, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from patent_payment_details
+    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 Fri Aug 06 15:00:19 CST 2021.
+    -->
+    delete from patent_payment_details
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PatentPaymentDetails">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    insert into patent_payment_details (id, pid, `years`, 
+      patent_amount, end_date, `status`, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{years,jdbcType=INTEGER}, 
+      #{patentAmount,jdbcType=DECIMAL}, #{endDate,jdbcType=DATE}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentPaymentDetails">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    insert into patent_payment_details
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="years != null">
+        `years`,
+      </if>
+      <if test="patentAmount != null">
+        patent_amount,
+      </if>
+      <if test="endDate != null">
+        end_date,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="years != null">
+        #{years,jdbcType=INTEGER},
+      </if>
+      <if test="patentAmount != null">
+        #{patentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="endDate != null">
+        #{endDate,jdbcType=DATE},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PatentPaymentDetails">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    update patent_payment_details
+    <set>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="years != null">
+        `years` = #{years,jdbcType=INTEGER},
+      </if>
+      <if test="patentAmount != null">
+        patent_amount = #{patentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="endDate != null">
+        end_date = #{endDate,jdbcType=DATE},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </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.PatentPaymentDetails">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:00:19 CST 2021.
+    -->
+    update patent_payment_details
+    set pid = #{pid,jdbcType=INTEGER},
+      `years` = #{years,jdbcType=INTEGER},
+      patent_amount = #{patentAmount,jdbcType=DECIMAL},
+      end_date = #{endDate,jdbcType=DATE},
+      `status` = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <insert id="insertBatch" >
+    insert into patent_payment_details ( pid, `years`, 
+      patent_amount, end_date, `status`
+      )
+    values
+     <foreach collection="list" index="index" item="item" separator=",">
+    ( #{item.pid,jdbcType=INTEGER}, #{item.years,jdbcType=INTEGER}, 
+      #{item.patentAmount,jdbcType=DECIMAL}, #{item.endDate,jdbcType=DATE}, #{item.status,jdbcType=INTEGER}
+      )
+     </foreach> 
+  </insert>
+</mapper>

+ 153 - 0
src/main/java/com/goafanti/common/mapper/PatentYearPaymentMapper.xml

@@ -0,0 +1,153 @@
+<?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.PatentYearPaymentMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PatentYearPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="year" jdbcType="INTEGER" property="year" />
+    <result column="patent_amount" jdbcType="DECIMAL" property="patentAmount" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="reduction_amount" jdbcType="DECIMAL" property="reductionAmount" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    id, `type`, `year`, patent_amount, create_time, reduction_amount
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from patent_year_payment
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    delete from patent_year_payment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PatentYearPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    insert into patent_year_payment (id, `type`, `year`, 
+      patent_amount, create_time, reduction_amount
+      )
+    values (#{id,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, 
+      #{patentAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{reductionAmount,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentYearPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    insert into patent_year_payment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="year != null">
+        `year`,
+      </if>
+      <if test="patentAmount != null">
+        patent_amount,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="reductionAmount != null">
+        reduction_amount,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=INTEGER},
+      </if>
+      <if test="patentAmount != null">
+        #{patentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reductionAmount != null">
+        #{reductionAmount,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PatentYearPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    update patent_year_payment
+    <set>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="year != null">
+        `year` = #{year,jdbcType=INTEGER},
+      </if>
+      <if test="patentAmount != null">
+        patent_amount = #{patentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reductionAmount != null">
+        reduction_amount = #{reductionAmount,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PatentYearPayment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 06 15:52:32 CST 2021.
+    -->
+    update patent_year_payment
+    set `type` = #{type,jdbcType=INTEGER},
+      `year` = #{year,jdbcType=INTEGER},
+      patent_amount = #{patentAmount,jdbcType=DECIMAL},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      reduction_amount = #{reductionAmount,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+    <select id="selectAll" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from patent_year_payment
+    where 1=1
+  </select>
+</mapper>

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

@@ -2154,4 +2154,11 @@ inner join department de on x.department_id=de.id left join business_category bc
 			and a.id= #{tid}
 		</if>
 	</select>
+	
+	  <select id="selectByTidGetDtails" resultType="com.goafanti.organization.bo.ProjectTypePuls">
+ select a.id,a.official_cost officialCost,a.cost_reduction costReduction ,a.commodity_quantity quantity ,a.patent_type patentType,b.patent_name_type projectType,
+ c.amount officialAmount,c.proportion85 from t_order_task a left join t_order_outsource b on a.id=b.tid
+left join official_fee_price c on a.patent_type =c.patent_type and b.patent_name_type =c.`type`  
+where a.id= #{tid}
+  </select>
 </mapper>

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

@@ -541,12 +541,6 @@ where x.id=  #{tid}
   </select>
   
   
-    <select id="selectByTidGetDtails" resultType="com.goafanti.organization.bo.ProjectTypePuls">
- select a.id,a.official_cost officialCost,a.cost_reduction costReduction ,a.commodity_quantity quantity ,a.patent_type patentType,b.patent_name_type projectType,
- c.amount officialAmount,c.proportion85 from t_order_task a left join t_order_outsource b on a.id=b.tid
-left join official_fee_price c on a.patent_type =c.patent_type and b.patent_name_type =c.`type`  
-where a.id= #{tid}
-  </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,
 		a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,a.company_name companyName, 

+ 94 - 94
src/main/java/com/goafanti/common/model/PatentNew.java

@@ -8,149 +8,149 @@ public class PatentNew implements Serializable {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.id
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * Database Column Remarks: 专利编号 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_no
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String patentNo;
 	/**
 	 * Database Column Remarks: 名称 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String name;
 	/**
 	 * Database Column Remarks: 类型 0发明专利 1使用新型 2外观设计 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer type;
 	/**
 	 * Database Column Remarks: 状态 0 未提醒 1 剩余90天 2剩余30天 3剩余20天 4剩余10天 5剩余3天 6剩余2天 7剩余1天 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer status;
 	/**
 	 * Database Column Remarks: 申请时间 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.apply_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Date applyDate;
 	/**
 	 * Database Column Remarks: 授权时间 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.authorization_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Date authorizationDate;
 	/**
 	 * Database Column Remarks: 金额 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private BigDecimal patentAmount;
 	/**
 	 * Database Column Remarks: 申请人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.applicant
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String applicant;
 	/**
 	 * Database Column Remarks: 所在地-省份 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.province
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer province;
 	/**
 	 * Database Column Remarks: 联系方式 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.contact_mobile
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String contactMobile;
 	/**
 	 * Database Column Remarks: 邮箱 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.email
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String email;
 	/**
 	 * Database Column Remarks: 证件URL This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.certificate_url
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String certificateUrl;
 	/**
 	 * Database Column Remarks: 创建时间 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.create_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Date createTime;
 	/**
 	 * Database Column Remarks: 更新时间 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.update_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Date updateTime;
 	/**
 	 * Database Column Remarks: 操作人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.aid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String aid;
 	/**
 	 * Database Column Remarks: 年份 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.years
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer years;
 	/**
 	 * Database Column Remarks: 客户编号 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.uid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String uid;
 	/**
 	 * Database Column Remarks: 权利人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.holders
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String holders;
 	/**
 	 * Database Column Remarks: 发明人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.inventor
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private String inventor;
 	/**
 	 * Database Column Remarks: 年费状态 0无信息 1代缴费 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.annual_fee_status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer annualFeeStatus;
 	/**
 	 * Database Column Remarks: 营销员是否提醒 0未通知 1已通知 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.salesman_remind
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer salesmanRemind;
 	/**
 	 * Database Column Remarks: 项目编号 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.tid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer tid;
 	/**
 	 * Database Column Remarks: 是否为新专利 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.new_type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private Integer newType;
 	/**
 	 * Database Column Remarks: 滞纳金 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.delaying_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private BigDecimal delayingAmount;
 	/**
 	 * Database Column Remarks: 恢复金 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.recovery_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private BigDecimal recoveryAmount;
 	/**
-	 * Database Column Remarks: 录入人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.input_name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * Database Column Remarks: 录入人 This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.input_id
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
-	private String inputName;
+	private String inputId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.id
 	 * @return  the value of patent_new.id
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -159,7 +159,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.id
 	 * @param id  the value for patent_new.id
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -168,7 +168,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.patent_no
 	 * @return  the value of patent_new.patent_no
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getPatentNo() {
 		return patentNo;
@@ -177,7 +177,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.patent_no
 	 * @param patentNo  the value for patent_new.patent_no
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setPatentNo(String patentNo) {
 		this.patentNo = patentNo == null ? null : patentNo.trim();
@@ -186,7 +186,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.name
 	 * @return  the value of patent_new.name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getName() {
 		return name;
@@ -195,7 +195,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.name
 	 * @param name  the value for patent_new.name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setName(String name) {
 		this.name = name == null ? null : name.trim();
@@ -204,7 +204,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.type
 	 * @return  the value of patent_new.type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getType() {
 		return type;
@@ -213,7 +213,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.type
 	 * @param type  the value for patent_new.type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -222,7 +222,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.status
 	 * @return  the value of patent_new.status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -231,7 +231,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.status
 	 * @param status  the value for patent_new.status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -240,7 +240,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.apply_date
 	 * @return  the value of patent_new.apply_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Date getApplyDate() {
 		return applyDate;
@@ -249,7 +249,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.apply_date
 	 * @param applyDate  the value for patent_new.apply_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setApplyDate(Date applyDate) {
 		this.applyDate = applyDate;
@@ -258,7 +258,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.authorization_date
 	 * @return  the value of patent_new.authorization_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Date getAuthorizationDate() {
 		return authorizationDate;
@@ -267,7 +267,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.authorization_date
 	 * @param authorizationDate  the value for patent_new.authorization_date
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setAuthorizationDate(Date authorizationDate) {
 		this.authorizationDate = authorizationDate;
@@ -276,7 +276,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.patent_amount
 	 * @return  the value of patent_new.patent_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public BigDecimal getPatentAmount() {
 		return patentAmount;
@@ -285,7 +285,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.patent_amount
 	 * @param patentAmount  the value for patent_new.patent_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setPatentAmount(BigDecimal patentAmount) {
 		this.patentAmount = patentAmount;
@@ -294,7 +294,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.applicant
 	 * @return  the value of patent_new.applicant
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -303,7 +303,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.applicant
 	 * @param applicant  the value for patent_new.applicant
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant == null ? null : applicant.trim();
@@ -312,7 +312,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.province
 	 * @return  the value of patent_new.province
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getProvince() {
 		return province;
@@ -321,7 +321,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.province
 	 * @param province  the value for patent_new.province
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -330,7 +330,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.contact_mobile
 	 * @return  the value of patent_new.contact_mobile
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -339,7 +339,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.contact_mobile
 	 * @param contactMobile  the value for patent_new.contact_mobile
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile == null ? null : contactMobile.trim();
@@ -348,7 +348,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.email
 	 * @return  the value of patent_new.email
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getEmail() {
 		return email;
@@ -357,7 +357,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.email
 	 * @param email  the value for patent_new.email
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setEmail(String email) {
 		this.email = email == null ? null : email.trim();
@@ -366,7 +366,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.certificate_url
 	 * @return  the value of patent_new.certificate_url
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getCertificateUrl() {
 		return certificateUrl;
@@ -375,7 +375,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.certificate_url
 	 * @param certificateUrl  the value for patent_new.certificate_url
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setCertificateUrl(String certificateUrl) {
 		this.certificateUrl = certificateUrl == null ? null : certificateUrl.trim();
@@ -384,7 +384,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.create_time
 	 * @return  the value of patent_new.create_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -393,7 +393,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.create_time
 	 * @param createTime  the value for patent_new.create_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -402,7 +402,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.update_time
 	 * @return  the value of patent_new.update_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -411,7 +411,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.update_time
 	 * @param updateTime  the value for patent_new.update_time
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -420,7 +420,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.aid
 	 * @return  the value of patent_new.aid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -429,7 +429,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.aid
 	 * @param aid  the value for patent_new.aid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -438,7 +438,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.years
 	 * @return  the value of patent_new.years
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getYears() {
 		return years;
@@ -447,7 +447,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.years
 	 * @param years  the value for patent_new.years
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setYears(Integer years) {
 		this.years = years;
@@ -456,7 +456,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.uid
 	 * @return  the value of patent_new.uid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getUid() {
 		return uid;
@@ -465,7 +465,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.uid
 	 * @param uid  the value for patent_new.uid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setUid(String uid) {
 		this.uid = uid == null ? null : uid.trim();
@@ -474,7 +474,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.holders
 	 * @return  the value of patent_new.holders
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getHolders() {
 		return holders;
@@ -483,7 +483,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.holders
 	 * @param holders  the value for patent_new.holders
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setHolders(String holders) {
 		this.holders = holders == null ? null : holders.trim();
@@ -492,7 +492,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.inventor
 	 * @return  the value of patent_new.inventor
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public String getInventor() {
 		return inventor;
@@ -501,7 +501,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.inventor
 	 * @param inventor  the value for patent_new.inventor
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setInventor(String inventor) {
 		this.inventor = inventor == null ? null : inventor.trim();
@@ -510,7 +510,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.annual_fee_status
 	 * @return  the value of patent_new.annual_fee_status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getAnnualFeeStatus() {
 		return annualFeeStatus;
@@ -519,7 +519,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.annual_fee_status
 	 * @param annualFeeStatus  the value for patent_new.annual_fee_status
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setAnnualFeeStatus(Integer annualFeeStatus) {
 		this.annualFeeStatus = annualFeeStatus;
@@ -528,7 +528,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.salesman_remind
 	 * @return  the value of patent_new.salesman_remind
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getSalesmanRemind() {
 		return salesmanRemind;
@@ -537,7 +537,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.salesman_remind
 	 * @param salesmanRemind  the value for patent_new.salesman_remind
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setSalesmanRemind(Integer salesmanRemind) {
 		this.salesmanRemind = salesmanRemind;
@@ -546,7 +546,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.tid
 	 * @return  the value of patent_new.tid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getTid() {
 		return tid;
@@ -555,7 +555,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.tid
 	 * @param tid  the value for patent_new.tid
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -564,7 +564,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.new_type
 	 * @return  the value of patent_new.new_type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public Integer getNewType() {
 		return newType;
@@ -573,7 +573,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.new_type
 	 * @param newType  the value for patent_new.new_type
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setNewType(Integer newType) {
 		this.newType = newType;
@@ -582,7 +582,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.delaying_amount
 	 * @return  the value of patent_new.delaying_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public BigDecimal getDelayingAmount() {
 		return delayingAmount;
@@ -591,7 +591,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.delaying_amount
 	 * @param delayingAmount  the value for patent_new.delaying_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setDelayingAmount(BigDecimal delayingAmount) {
 		this.delayingAmount = delayingAmount;
@@ -600,7 +600,7 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.recovery_amount
 	 * @return  the value of patent_new.recovery_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public BigDecimal getRecoveryAmount() {
 		return recoveryAmount;
@@ -609,33 +609,33 @@ public class PatentNew implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.recovery_amount
 	 * @param recoveryAmount  the value for patent_new.recovery_amount
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	public void setRecoveryAmount(BigDecimal recoveryAmount) {
 		this.recoveryAmount = recoveryAmount;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.input_name
-	 * @return  the value of patent_new.input_name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.input_id
+	 * @return  the value of patent_new.input_id
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
-	public String getInputName() {
-		return inputName;
+	public String getInputId() {
+		return inputId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.input_name
-	 * @param inputName  the value for patent_new.input_name
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.input_id
+	 * @param inputId  the value for patent_new.input_id
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
-	public void setInputName(String inputName) {
-		this.inputName = inputName == null ? null : inputName.trim();
+	public void setInputId(String inputId) {
+		this.inputId = inputId == null ? null : inputId.trim();
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu Aug 05 17:02:04 CST 2021
+	 * @mbg.generated  Fri Aug 06 11:49:51 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -669,7 +669,7 @@ public class PatentNew implements Serializable {
 		sb.append(", newType=").append(newType);
 		sb.append(", delayingAmount=").append(delayingAmount);
 		sb.append(", recoveryAmount=").append(recoveryAmount);
-		sb.append(", inputName=").append(inputName);
+		sb.append(", inputId=").append(inputId);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();

+ 287 - 0
src/main/java/com/goafanti/common/model/PatentPaymentDetails.java

@@ -0,0 +1,287 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table patent_payment_details
+ */
+public class PatentPaymentDetails implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.id
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Integer id;
+
+    /**
+     * Database Column Remarks:
+     *   专利id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.pid
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Integer pid;
+
+    /**
+     * Database Column Remarks:
+     *   年份
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.years
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Integer years;
+
+    /**
+     * Database Column Remarks:
+     *   金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private BigDecimal patentAmount;
+
+    /**
+     * Database Column Remarks:
+     *   截止时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.end_date
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Date endDate;
+
+    /**
+     * Database Column Remarks:
+     *   状态 0未缴费 1已缴费
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.status
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Integer status;
+
+    /**
+     * Database Column Remarks:
+     *   发起时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_payment_details.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private Date createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.id
+     *
+     * @return the value of patent_payment_details.id
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.id
+     *
+     * @param id the value for patent_payment_details.id
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    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_payment_details.pid
+     *
+     * @return the value of patent_payment_details.pid
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Integer getPid() {
+        return pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.pid
+     *
+     * @param pid the value for patent_payment_details.pid
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.years
+     *
+     * @return the value of patent_payment_details.years
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Integer getYears() {
+        return years;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.years
+     *
+     * @param years the value for patent_payment_details.years
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setYears(Integer years) {
+        this.years = years;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.patent_amount
+     *
+     * @return the value of patent_payment_details.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public BigDecimal getPatentAmount() {
+        return patentAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.patent_amount
+     *
+     * @param patentAmount the value for patent_payment_details.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setPatentAmount(BigDecimal patentAmount) {
+        this.patentAmount = patentAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.end_date
+     *
+     * @return the value of patent_payment_details.end_date
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.end_date
+     *
+     * @param endDate the value for patent_payment_details.end_date
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.status
+     *
+     * @return the value of patent_payment_details.status
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.status
+     *
+     * @param status the value for patent_payment_details.status
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_payment_details.create_time
+     *
+     * @return the value of patent_payment_details.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_payment_details.create_time
+     *
+     * @param createTime the value for patent_payment_details.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 CST 2021
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_payment_details
+     *
+     * @mbg.generated Fri Aug 06 15:00:19 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(", pid=").append(pid);
+        sb.append(", years=").append(years);
+        sb.append(", patentAmount=").append(patentAmount);
+        sb.append(", endDate=").append(endDate);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 251 - 0
src/main/java/com/goafanti/common/model/PatentYearPayment.java

@@ -0,0 +1,251 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table patent_year_payment
+ */
+public class PatentYearPayment implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.id
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private Integer id;
+
+    /**
+     * Database Column Remarks:
+     *   专利分类 0实用新型 1发明专利 2外观专利 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.type
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private Integer type;
+
+    /**
+     * Database Column Remarks:
+     *   年份
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.year
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private Integer year;
+
+    /**
+     * Database Column Remarks:
+     *   金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private BigDecimal patentAmount;
+
+    /**
+     * Database Column Remarks:
+     *   发起时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   费减金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column patent_year_payment.reduction_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private BigDecimal reductionAmount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_year_payment.id
+     *
+     * @return the value of patent_year_payment.id
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.id
+     *
+     * @param id the value for patent_year_payment.id
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    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_year_payment.type
+     *
+     * @return the value of patent_year_payment.type
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.type
+     *
+     * @param type the value for patent_year_payment.type
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_year_payment.year
+     *
+     * @return the value of patent_year_payment.year
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public Integer getYear() {
+        return year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.year
+     *
+     * @param year the value for patent_year_payment.year
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_year_payment.patent_amount
+     *
+     * @return the value of patent_year_payment.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public BigDecimal getPatentAmount() {
+        return patentAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.patent_amount
+     *
+     * @param patentAmount the value for patent_year_payment.patent_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public void setPatentAmount(BigDecimal patentAmount) {
+        this.patentAmount = patentAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column patent_year_payment.create_time
+     *
+     * @return the value of patent_year_payment.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.create_time
+     *
+     * @param createTime the value for patent_year_payment.create_time
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 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 patent_year_payment.reduction_amount
+     *
+     * @return the value of patent_year_payment.reduction_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public BigDecimal getReductionAmount() {
+        return reductionAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column patent_year_payment.reduction_amount
+     *
+     * @param reductionAmount the value for patent_year_payment.reduction_amount
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 CST 2021
+     */
+    public void setReductionAmount(BigDecimal reductionAmount) {
+        this.reductionAmount = reductionAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table patent_year_payment
+     *
+     * @mbg.generated Fri Aug 06 15:52:32 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(", year=").append(year);
+        sb.append(", patentAmount=").append(patentAmount);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", reductionAmount=").append(reductionAmount);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 0 - 1
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -74,7 +74,6 @@ public class NewExcelUtil<T> {
 	 */
 	public static final int sheetSize = 65536;
 	
-	@Value(value = "upload.path")
 	public  String downloadPath = "";
 	
 	

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

@@ -1349,7 +1349,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
 		}
 		if(type==1) {
-			ProjectTypePuls tt=thirdPartyCompanyMapper.selectByTidGetDtails(tid);
+			ProjectTypePuls tt=tOrderTaskMapper.selectByTidGetDtails(tid);
 			if (tt.getOfficialCost()==1) {
 				if (tt.getCostReduction()==1) {
 					tCount=tCount.add(tt.getProportion85().multiply(new BigDecimal(tt.getQuantity())));

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

@@ -18,6 +18,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
@@ -112,6 +113,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Autowired
 	private AsyncUtils	asyncUtils;
 	
+	
 
 
 	@Override

+ 25 - 8
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -35,8 +35,12 @@ public class PatentNewBo extends PatentNew{
 	private Integer salesmanRemind;
 	@Excel(name = "email")
 	private String email;
-	@Excel(name = "年费/滞纳金/恢复")
-	private BigDecimal amountCount;
+	@Excel(name = "年费")
+	private BigDecimal patentAmount;
+	@Excel(name = "滞纳金")
+	private BigDecimal delayingAmount;
+	@Excel(name = "恢复金")
+	private BigDecimal recoveryAmount;
 	@Excel(name = "客户名称")
 	private String userName;
 	@Excel(name = "项目名称")
@@ -63,6 +67,24 @@ public class PatentNewBo extends PatentNew{
 	private String createEnd;
 	
 	
+	public BigDecimal getPatentAmount() {
+		return patentAmount;
+	}
+	public void setPatentAmount(BigDecimal patentAmount) {
+		this.patentAmount = patentAmount;
+	}
+	public BigDecimal getDelayingAmount() {
+		return delayingAmount;
+	}
+	public void setDelayingAmount(BigDecimal delayingAmount) {
+		this.delayingAmount = delayingAmount;
+	}
+	public BigDecimal getRecoveryAmount() {
+		return recoveryAmount;
+	}
+	public void setRecoveryAmount(BigDecimal recoveryAmount) {
+		this.recoveryAmount = recoveryAmount;
+	}
 	public String getPatentNo() {
 		return patentNo;
 	}
@@ -111,12 +133,7 @@ public class PatentNewBo extends PatentNew{
 	public void setEmail(String email) {
 		this.email = email;
 	}
-	public BigDecimal getAmountCount() {
-		return amountCount;
-	}
-	public void setAmountCount(BigDecimal amountCount) {
-		this.amountCount = amountCount;
-	}
+	
 	public String getProjectName() {
 		return projectName;
 	}

+ 2 - 2
src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java

@@ -95,7 +95,7 @@ public class AdminPatentNewApiController extends CertifyApiController {
 	
 	
 	/**
-	 * 专利列表
+	 * 专利日志列表
 	 */
 	@RequestMapping(value = "/selectPatentNewLog", method = RequestMethod.GET)
 	public Result selectPatentNew(Integer id){
@@ -143,7 +143,7 @@ public class AdminPatentNewApiController extends CertifyApiController {
         	  res.getError().add(buildError("格式不正确","格式不正确"));
         	  return res;
           }
-    	patentNewService.importTemplate(file);
+    	patentNewService.pushImportTemplate(file);
          res.data(1); 
     	return res;
     }

+ 78 - 0
src/main/java/com/goafanti/patent/enums/PatentType.java

@@ -0,0 +1,78 @@
+package com.goafanti.patent.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PatentType {
+	/**0实用新型 1发明专利 2外观专利**/
+	 SYXX(0,"实用新型"),
+	 /** 已分派 **/
+	 FMZL(1,"发明专利"),
+	 /** 材料已启动 **/
+	 WGZL(2,"外观专利"),
+	/** 无效 **/
+	NOT(10, "无效");
+	
+	private PatentType(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentType> status = new HashMap<Integer, PatentType>();
+
+	static {
+		for (PatentType value : PatentType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static PatentType getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return NOT;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	public static String getValueByCode(Integer code){
+        for(PatentType patentType:PatentType.values()){
+            if(code.equals(patentType.getCode())){
+                return patentType.getDesc();
+            }
+        }
+        return  null;
+    }
+	
+	public static Integer getCodeByDesc(String desc){
+        for(PatentType patentType:PatentType.values()){
+            if(desc.equals(patentType.getDesc())){
+                return patentType.getCode();
+            }
+        }
+        return  NOT.code;
+    }
+	
+	public static String getCountStr() {
+		StringBuffer str=new StringBuffer();
+		for (PatentType value : PatentType.values()) {
+			str.append(value.getCode()).append("=").append(value.getDesc()).append(",");
+		}
+		return str.substring(0, str.length()-1);
+		
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	
+}

+ 2 - 1
src/main/java/com/goafanti/patent/service/PatentNewService.java

@@ -29,8 +29,9 @@ public interface PatentNewService {
 
 	List<PatentNewLog> selectPatentNewLog(Integer id);
 
-	void importTemplate(MultipartFile file);
 
 	Object export(PatentNewBo p, Integer pageSize, Integer pageNo);
 
+	void pushImportTemplate(MultipartFile file);
+
 }

+ 155 - 13
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.patent.service.impl;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -13,6 +14,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,17 +22,23 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.PatentNewLogMapper;
 import com.goafanti.common.dao.PatentNewMapper;
+import com.goafanti.common.dao.PatentPaymentDetailsMapper;
+import com.goafanti.common.dao.PatentYearPaymentMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.PatentNew;
 import com.goafanti.common.model.PatentNewLog;
+import com.goafanti.common.model.PatentPaymentDetails;
+import com.goafanti.common.model.PatentYearPayment;
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExcelUtils;
 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;
-import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.patent.bo.PatentNewBo;
+import com.goafanti.patent.enums.PatentType;
 import com.goafanti.patent.service.PatentNewService;
 @Service
 public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> implements PatentNewService {
@@ -38,6 +46,17 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	private PatentNewMapper patentNewMapper;
 	@Autowired
 	private PatentNewLogMapper patentNewLogMapper;
+	@Autowired
+	private TOrderTaskMapper	tOrderTaskMapper;
+	@Autowired
+	private PatentPaymentDetailsMapper	patentPaymentDetailsMapper;
+	@Autowired
+	private PatentYearPaymentMapper	patentYearPaymentMapper;
+	
+	private List<PatentYearPayment> patentYear=new ArrayList<PatentYearPayment>(); 
+
+	@Value(value = "${upload.path}")
+	private String uploadPath=null;
 
 	@Override
 	public int addPatenNew(PatentNew p) {
@@ -73,6 +92,10 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		if(p.getCreateStart()!=null)params.put("createStart", p.getCreateStart());
 		if(p.getCreateEnd()!=null)params.put("createEnd", p.getCreateEnd()+" 23:59:59");
 		if(p.getType()!=null)params.put("type", p.getType());
+		if(p.getDepName()!=null)params.put("depName", p.getDepName());
+		if(p.getAnnualFeeStatus()!=null)params.put("annualFeeStatus", p.getAnnualFeeStatus());
+		if(p.getUserName()!=null)params.put("userName", p.getUserName());
+		if(p.getSalesmanRemind()!=null)params.put("salesmanRemind", p.getSalesmanRemind());
 		params.put("aid", TokenManager.getAdminId());
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.PATENT_AUDITOR)) {
 			params.put("shiro", 2);
@@ -109,11 +132,10 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	}
 
 	@Override
-	public void importTemplate(MultipartFile file) {
+	public void pushImportTemplate(MultipartFile file) {
 		 //获得Workbook工作薄对象
         Workbook workbook = ExcelUtils.getWorkBook(file);
         //创建一个对象,用来存储数据
-        List<TemporaryReceivablesBo> list=new ArrayList<>();
         if(workbook != null){
         	//获得当前sheet工作表
     		Sheet sheet = workbook.getSheetAt(0);
@@ -154,6 +176,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
     		if (lastRowNum<2) {
     			throw new BusinessException(new Error("未找到正确的参数。"));
 			}
+    		List<PatentNew> list=new ArrayList<>();
     		//循环除了第2行的所有行
     		for(int rowNum = firstRowNum+2;rowNum <= lastRowNum;rowNum++){
         		//获得当前行
@@ -166,43 +189,162 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	        	//获得当前行的列数
 	        	int lastCellNum = row.getLastCellNum();
 		        //循环当前行 cellNum = (firstCellNum+1) 则是除开第一例
-	        	TemporaryReceivablesBo trb=new TemporaryReceivablesBo();
+	        	PatentNew trb=new PatentNew();
 		        for(int cellNum = (firstCellNum); cellNum < lastCellNum;cellNum++){
 			        Cell cell = row.getCell(cellNum);
 			    	try {
 			        switch (cellNum) {
 					case 0:
-						trb.setFinancialPayNo(ExcelUtils.getCellValue(cell));
+						trb.setPatentNo(ExcelUtils.getCellValue(cell));
 						break;
 					case 1:
-						trb.setOrderNo(ExcelUtils.getCellValue(cell).trim());
+						trb.setName(ExcelUtils.getCellValue(cell).trim());
 						break;
 					case 2:
-						trb.setCorporateName(ExcelUtils.getCellValue(cell));
+						trb.setType(PatentType.getCodeByDesc(ExcelUtils.getCellValue(cell)));
 						break;
 					case 3:
-						trb.setAmount(new BigDecimal((ExcelUtils.getCellValue(cell).equals("")?"0":ExcelUtils.getCellValue(cell))));
+						trb.setApplyDate(DateUtils.StringToDate(ExcelUtils.getCellValue(cell), AFTConstants.YYYYMMDD));
 						break;
 					case 4:
-						trb.setReceivablesTime(DateUtils.StringToDate(ExcelUtils.getCellValue(cell), AFTConstants.YYYYMMDD));
+						trb.setHolders(ExcelUtils.getCellValue(cell));
 						break;
 					case 5:
-						trb.setRemarks(ExcelUtils.getCellValue(cell));
+						trb.setAuthorizationDate(DateUtils.StringToDate(ExcelUtils.getCellValue(cell), AFTConstants.YYYYMMDD));
 						break;
-					}
+					case 6:
+						trb.setInventor(ExcelUtils.getCellValue(cell));
+						break;
+					case 7:
+						trb.setEmail(ExcelUtils.getCellValue(cell));
+						break;
+					case 8:
+						trb.setPatentAmount(new BigDecimal((ExcelUtils.getCellValue(cell).equals("")?"0":ExcelUtils.getCellValue(cell))));
+						break;
+					case 9:
+						trb.setDelayingAmount(new BigDecimal((ExcelUtils.getCellValue(cell).equals("")?"0":ExcelUtils.getCellValue(cell))));
+						break;
+					case 10:
+						trb.setRecoveryAmount(new BigDecimal((ExcelUtils.getCellValue(cell).equals("")?"0":ExcelUtils.getCellValue(cell))));
+						break;
+					case 11:
+						trb.setTid(Integer.parseInt(ExcelUtils.getCellValue(cell)));
+						break;
+					
+			        }
 			    	} catch (Exception e) {
-			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行输入内容不正确。"));
+			    		e.printStackTrace();
+			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行"+cellNum+"列输入内容不正确。"));
+					}
+			    	if (cellNum==0&&trb.getPatentNo()!=null) {
+						int i=patentNewMapper.selectByPatenNo(trb.getPatentNo());
+						if (i>0) {
+							throw new BusinessException(new Error("表格第"+(rowNum+1)+"行[专利编号]系统已存在。"));
+						}
 					}
 		        }
 		        trb.setAid(TokenManager.getAdminId());
+		        trb.setInputId(trb.getAid());
 		        trb.setCreateTime(new Date());
 		        trb.setStatus(0);
+		        trb.setNewType(1);
+		        trb.setYears(0);
 		        list.add(trb);
+		    }
+    		
+    		List<PatentNew> list2=new ArrayList<>();
+    		for (int i = 0; i < list.size(); i++) {
+    			
+    			list2.add(list.get(i));
+    			if (50 == list2.size() || i == list.size() - 1) {
+    				if (list2.size() > 0) patentNewMapper.insertBatch(list2);
+    				list2.clear();
+    				try {
+    					Thread.sleep(500);
+    				} catch (InterruptedException e) {
+    					e.printStackTrace();
+    				}
+    			}
     		}
+    		List<PatentNew> lp=patentNewMapper.selectByYear(0);
+    		for (PatentNew p : lp) {
+    			PatentNew n=new PatentNew();
+    			n.setId(p.getId());
+    			n.setYears(getyear(p));
+    			p.setYears(n.getYears());
+    			n.setPatentAmount(sumAmout(p.getType(),p.getTid(),p.getYears()));
+    			sumYears(p);
+    			patentNewMapper.updateByPrimaryKeySelective(n);
+			}
         }
         
     }
 
+	private Integer getyear(PatentNew p) {
+		Calendar c=Calendar.getInstance();
+		c.setTime(p.getApplyDate());
+		int x=c.get(Calendar.YEAR);
+		Calendar now=Calendar.getInstance();
+		int y=now.get(Calendar.YEAR);
+		int z=y-x;
+		if (z==0) z=1;
+		return z;
+	}
+
+	private void sumYears(PatentNew trb) {
+		if (trb.getApplyDate()!=null) {
+			Calendar apply =Calendar.getInstance();
+			apply.setTime(trb.getApplyDate());
+			List<PatentPaymentDetails> list =new ArrayList<PatentPaymentDetails>();
+			for (int i = 1; i < 21; i++) {
+				PatentPaymentDetails pd=new PatentPaymentDetails();
+				if ((trb.getType()==0||trb.getType()==2)&&i<11) {
+						addParam(trb, apply, i, pd);
+						list.add(pd);
+				}else if (trb.getType()==1) {
+					
+					addParam(trb, apply, i, pd);
+					list.add(pd);
+				}
+			}
+			patentPaymentDetailsMapper.insertBatch(list);
+		}
+		
+	}
+
+	private void addParam(PatentNew trb, Calendar apply, int i, PatentPaymentDetails pd) {
+		Calendar end=Calendar.getInstance();
+		end.setTime(apply.getTime());
+		end.add(Calendar.YEAR, i);
+		pd.setPid(trb.getId());
+		pd.setEndDate(end.getTime());
+		pd.setPatentAmount(sumAmout(trb.getType(),trb.getTid(),i));
+		pd.setStatus(0);
+		pd.setYears(i);
+	}
+
+	
+
+	
+
+	private BigDecimal sumAmout(Integer type,Integer tid,Integer year) {
+		if (patentYear.isEmpty()) {
+			patentYear=patentYearPaymentMapper.selectAll();
+		}
+		for (PatentYearPayment p : patentYear) {
+			if (type==p.getType()&&year==p.getYear()) {
+				TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(tid);
+				if (t.getCostReduction()==1) {
+					return p.getReductionAmount();
+				}else {
+					return p.getPatentAmount();
+				}
+				
+			}
+		}
+		return null;
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Object export(PatentNewBo p, Integer pageSize, Integer pageNo) {
@@ -213,7 +355,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		pushParams(p, params);
 		List<PatentNewBo> list= (List<PatentNewBo>) findList("selectPatentNewList", params, pageNo,
 				pageSize);
-		return excel.exportExcel(list, "专利列表");
+		return excel.exportExcel(list, "专利列表",uploadPath);
 	}
 
 	

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-•#
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+•#
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570