Kaynağa Gözat

Merge branch 'test' of jishutao/kede-server into prod

anderx 4 yıl önce
ebeveyn
işleme
4c231ee0d7

+ 1 - 1
GeneratorConfig.xml

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

+ 6 - 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	int updateByPrimaryKey(PatentNew record);
 

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

@@ -12,43 +12,43 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderOutsourceMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int insert(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int insertSelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	TOrderOutsource selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int updateByPrimaryKeySelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	int updateByPrimaryKey(TOrderOutsource record);
 

+ 84 - 13
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 May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="patent_no" jdbcType="VARCHAR" property="patentNo" />
@@ -25,22 +25,29 @@
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="years" jdbcType="INTEGER" property="years" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="holders" jdbcType="VARCHAR" property="holders" />
+    <result column="inventor" jdbcType="VARCHAR" property="inventor" />
+    <result column="annual_fee_status" jdbcType="INTEGER" property="annualFeeStatus" />
+    <result column="salesman_remind" jdbcType="INTEGER" property="salesmanRemind" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="new_type" jdbcType="INTEGER" property="newType" />
   </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 May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 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`
+    aid, `years`, `uid`, holders, inventor, annual_fee_status, salesman_remind, tid, 
+    new_type
   </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 May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -51,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     delete from patent_new
     where id = #{id,jdbcType=INTEGER}
@@ -60,26 +67,30 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     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`)
+      aid, `years`, `uid`, holders, 
+      inventor, annual_fee_status, salesman_remind, 
+      tid, new_type)
     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}, 
       #{province,jdbcType=INTEGER}, #{contactMobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{certificateUrl,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{aid,jdbcType=VARCHAR}, #{years,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR})
+      #{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})
   </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 May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     insert into patent_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -137,6 +148,24 @@
       <if test="uid != null">
         `uid`,
       </if>
+      <if test="holders != null">
+        holders,
+      </if>
+      <if test="inventor != null">
+        inventor,
+      </if>
+      <if test="annualFeeStatus != null">
+        annual_fee_status,
+      </if>
+      <if test="salesmanRemind != null">
+        salesman_remind,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="newType != null">
+        new_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -193,13 +222,31 @@
       <if test="uid != null">
         #{uid,jdbcType=VARCHAR},
       </if>
+      <if test="holders != null">
+        #{holders,jdbcType=VARCHAR},
+      </if>
+      <if test="inventor != null">
+        #{inventor,jdbcType=VARCHAR},
+      </if>
+      <if test="annualFeeStatus != null">
+        #{annualFeeStatus,jdbcType=INTEGER},
+      </if>
+      <if test="salesmanRemind != null">
+        #{salesmanRemind,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="newType != null">
+        #{newType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" 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 May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     update patent_new
     <set>
@@ -254,6 +301,24 @@
       <if test="uid != null">
         `uid` = #{uid,jdbcType=VARCHAR},
       </if>
+      <if test="holders != null">
+        holders = #{holders,jdbcType=VARCHAR},
+      </if>
+      <if test="inventor != null">
+        inventor = #{inventor,jdbcType=VARCHAR},
+      </if>
+      <if test="annualFeeStatus != null">
+        annual_fee_status = #{annualFeeStatus,jdbcType=INTEGER},
+      </if>
+      <if test="salesmanRemind != null">
+        salesman_remind = #{salesmanRemind,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="newType != null">
+        new_type = #{newType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -261,7 +326,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 27 11:21:28 CST 2021.
+      This element was generated on Thu Aug 05 11:46:54 CST 2021.
     -->
     update patent_new
     set patent_no = #{patentNo,jdbcType=VARCHAR},
@@ -280,7 +345,13 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       aid = #{aid,jdbcType=VARCHAR},
       `years` = #{years,jdbcType=INTEGER},
-      `uid` = #{uid,jdbcType=VARCHAR}
+      `uid` = #{uid,jdbcType=VARCHAR},
+      holders = #{holders,jdbcType=VARCHAR},
+      inventor = #{inventor,jdbcType=VARCHAR},
+      annual_fee_status = #{annualFeeStatus,jdbcType=INTEGER},
+      salesman_remind = #{salesmanRemind,jdbcType=INTEGER},
+      tid = #{tid,jdbcType=INTEGER},
+      new_type = #{newType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -395,7 +466,7 @@
       province, contact_mobile, email, 
       certificate_url, create_time, update_time, 
       aid, `years`, `uid`)values
-      <foreach item="item" index="index" collection="list" separator=",">
+      <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},

+ 11 - 11
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -31,7 +31,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     <result column="picture_url" jdbcType="LONGVARCHAR" property="pictureUrl" />
   </resultMap>
@@ -39,7 +39,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     id, order_no, refund_status, create_time, remarks, attachment_url, amount, company_name, 
     audit_time, unit_price, unit_number, outsource_remarks, `type`, tid, start_type, 
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     picture_url
   </sql>
@@ -57,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -70,7 +70,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     delete from t_order_outsource
     where id = #{id,jdbcType=INTEGER}
@@ -79,7 +79,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     insert into t_order_outsource (id, order_no, refund_status, 
       create_time, remarks, attachment_url, 
@@ -100,7 +100,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     insert into t_order_outsource
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -232,7 +232,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     update t_order_outsource
     <set>
@@ -300,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     update t_order_outsource
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -328,7 +328,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 23 15:28:48 CST 2021.
+      This element was generated on Thu Aug 05 11:38:34 CST 2021.
     -->
     update t_order_outsource
     set order_no = #{orderNo,jdbcType=VARCHAR},

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

@@ -8,104 +8,134 @@ 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	private Integer id;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_no
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String patentNo;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.name
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String name;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.type
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Integer type;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.status
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Integer status;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.apply_date
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Date applyDate;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.authorization_date
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Date authorizationDate;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_amount
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private BigDecimal patentAmount;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.applicant
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String applicant;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.province
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Integer province;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.contact_mobile
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String contactMobile;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.email
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String email;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.certificate_url
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String certificateUrl;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.create_time
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.update_time
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Date updateTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.aid
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private String aid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.years
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 CST 2021
 	 */
 	private Integer years;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.uid
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * 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 11:46:54 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 11:46:54 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 11:46:54 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 11:46:54 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 11:46:54 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 11:46:54 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 11:46:54 CST 2021
+	 */
+	private Integer newType;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table patent_new
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -114,7 +144,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -123,7 +153,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getPatentNo() {
 		return patentNo;
@@ -132,7 +162,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setPatentNo(String patentNo) {
 		this.patentNo = patentNo == null ? null : patentNo.trim();
@@ -141,7 +171,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getName() {
 		return name;
@@ -150,7 +180,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setName(String name) {
 		this.name = name == null ? null : name.trim();
@@ -159,7 +189,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Integer getType() {
 		return type;
@@ -168,7 +198,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -177,7 +207,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -186,7 +216,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -195,7 +225,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Date getApplyDate() {
 		return applyDate;
@@ -204,7 +234,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setApplyDate(Date applyDate) {
 		this.applyDate = applyDate;
@@ -213,7 +243,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Date getAuthorizationDate() {
 		return authorizationDate;
@@ -222,7 +252,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setAuthorizationDate(Date authorizationDate) {
 		this.authorizationDate = authorizationDate;
@@ -231,7 +261,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public BigDecimal getPatentAmount() {
 		return patentAmount;
@@ -240,7 +270,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setPatentAmount(BigDecimal patentAmount) {
 		this.patentAmount = patentAmount;
@@ -249,7 +279,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -258,7 +288,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant == null ? null : applicant.trim();
@@ -267,7 +297,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Integer getProvince() {
 		return province;
@@ -276,7 +306,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -285,7 +315,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -294,7 +324,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile == null ? null : contactMobile.trim();
@@ -303,7 +333,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getEmail() {
 		return email;
@@ -312,7 +342,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setEmail(String email) {
 		this.email = email == null ? null : email.trim();
@@ -321,7 +351,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getCertificateUrl() {
 		return certificateUrl;
@@ -330,7 +360,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setCertificateUrl(String certificateUrl) {
 		this.certificateUrl = certificateUrl == null ? null : certificateUrl.trim();
@@ -339,7 +369,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -348,7 +378,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -357,7 +387,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -366,7 +396,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -375,7 +405,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -384,7 +414,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -393,7 +423,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public Integer getYears() {
 		return years;
@@ -402,7 +432,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setYears(Integer years) {
 		this.years = years;
@@ -411,7 +441,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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public String getUid() {
 		return uid;
@@ -420,15 +450,123 @@ 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 May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	public void setUid(String uid) {
 		this.uid = uid == null ? null : uid.trim();
 	}
 
 	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public String getHolders() {
+		return holders;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setHolders(String holders) {
+		this.holders = holders == null ? null : holders.trim();
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public String getInventor() {
+		return inventor;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setInventor(String inventor) {
+		this.inventor = inventor == null ? null : inventor.trim();
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public Integer getAnnualFeeStatus() {
+		return annualFeeStatus;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setAnnualFeeStatus(Integer annualFeeStatus) {
+		this.annualFeeStatus = annualFeeStatus;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public Integer getSalesmanRemind() {
+		return salesmanRemind;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setSalesmanRemind(Integer salesmanRemind) {
+		this.salesmanRemind = salesmanRemind;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public Integer getNewType() {
+		return newType;
+	}
+
+	/**
+	 * 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 11:46:54 CST 2021
+	 */
+	public void setNewType(Integer newType) {
+		this.newType = newType;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Thu May 27 11:21:28 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:46:54 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -454,8 +592,17 @@ public class PatentNew implements Serializable {
 		sb.append(", aid=").append(aid);
 		sb.append(", years=").append(years);
 		sb.append(", uid=").append(uid);
+		sb.append(", holders=").append(holders);
+		sb.append(", inventor=").append(inventor);
+		sb.append(", annualFeeStatus=").append(annualFeeStatus);
+		sb.append(", salesmanRemind=").append(salesmanRemind);
+		sb.append(", tid=").append(tid);
+		sb.append(", newType=").append(newType);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();
 	}
+
+
+	
 }

+ 62 - 62
src/main/java/com/goafanti/common/model/TOrderOutsource.java

@@ -8,114 +8,114 @@ public class TOrderOutsource implements Serializable {
 
 	/**
 	 * Database Column Remarks: id This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.id
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * Database Column Remarks: 订单编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.order_no
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String orderNo;
 	/**
 	 * Database Column Remarks: 状态 0-待审核 ,1-审核通过,2-审核拒绝 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer refundStatus;
 	/**
 	 * Database Column Remarks: 创建时间 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.create_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Date createTime;
 	/**
 	 * Database Column Remarks: 审核备注 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * Database Column Remarks: 附件地址 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String attachmentUrl;
 	/**
 	 * Database Column Remarks: 总金额 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.amount
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private BigDecimal amount;
 	/**
 	 * Database Column Remarks: 公司名称 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.company_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String companyName;
 	/**
 	 * Database Column Remarks: 审核时间 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Date auditTime;
 	/**
 	 * Database Column Remarks: 单价 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private BigDecimal unitPrice;
 	/**
 	 * Database Column Remarks: 数量 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer unitNumber;
 	/**
 	 * Database Column Remarks: 外包备注 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String outsourceRemarks;
 	/**
 	 * Database Column Remarks: 分类 0订单 1项目 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer type;
 	/**
 	 * Database Column Remarks: 任务编号 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.tid
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer tid;
 	/**
 	 * Database Column Remarks: 0外包 1供应商 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.start_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer startType;
 	/**
 	 * Database Column Remarks: 专利类型 0申请/变更/转让 1买卖 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer patentType;
 	/**
 	 * Database Column Remarks: 专利名称 0实用新型 1发明专利 2外观专利 3 其他 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer patentNameType;
 	/**
 	 * Database Column Remarks: 专利名称 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String patentName;
 	/**
 	 * Database Column Remarks: 签单标记 0实际已缴 1实际未已缴 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.actual_official
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private Integer actualOfficial;
 	/**
 	 * Database Column Remarks: 图片地址 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private String pictureUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.id
 	 * @return  the value of t_order_outsource.id
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -124,7 +124,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.id
 	 * @param id  the value for t_order_outsource.id
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -133,7 +133,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.order_no
 	 * @return  the value of t_order_outsource.order_no
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -142,7 +142,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.order_no
 	 * @param orderNo  the value for t_order_outsource.order_no
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo == null ? null : orderNo.trim();
@@ -151,7 +151,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.refund_status
 	 * @return  the value of t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getRefundStatus() {
 		return refundStatus;
@@ -160,7 +160,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.refund_status
 	 * @param refundStatus  the value for t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setRefundStatus(Integer refundStatus) {
 		this.refundStatus = refundStatus;
@@ -169,7 +169,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.create_time
 	 * @return  the value of t_order_outsource.create_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -178,7 +178,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.create_time
 	 * @param createTime  the value for t_order_outsource.create_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -187,7 +187,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.remarks
 	 * @return  the value of t_order_outsource.remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -196,7 +196,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.remarks
 	 * @param remarks  the value for t_order_outsource.remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -205,7 +205,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.attachment_url
 	 * @return  the value of t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -214,7 +214,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.attachment_url
 	 * @param attachmentUrl  the value for t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl == null ? null : attachmentUrl.trim();
@@ -223,7 +223,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.amount
 	 * @return  the value of t_order_outsource.amount
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public BigDecimal getAmount() {
 		return amount;
@@ -232,7 +232,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.amount
 	 * @param amount  the value for t_order_outsource.amount
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
@@ -241,7 +241,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.company_name
 	 * @return  the value of t_order_outsource.company_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -250,7 +250,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.company_name
 	 * @param companyName  the value for t_order_outsource.company_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName == null ? null : companyName.trim();
@@ -259,7 +259,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.audit_time
 	 * @return  the value of t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Date getAuditTime() {
 		return auditTime;
@@ -268,7 +268,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.audit_time
 	 * @param auditTime  the value for t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setAuditTime(Date auditTime) {
 		this.auditTime = auditTime;
@@ -277,7 +277,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_price
 	 * @return  the value of t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -286,7 +286,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_price
 	 * @param unitPrice  the value for t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -295,7 +295,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_number
 	 * @return  the value of t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getUnitNumber() {
 		return unitNumber;
@@ -304,7 +304,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_number
 	 * @param unitNumber  the value for t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setUnitNumber(Integer unitNumber) {
 		this.unitNumber = unitNumber;
@@ -313,7 +313,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.outsource_remarks
 	 * @return  the value of t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getOutsourceRemarks() {
 		return outsourceRemarks;
@@ -322,7 +322,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.outsource_remarks
 	 * @param outsourceRemarks  the value for t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setOutsourceRemarks(String outsourceRemarks) {
 		this.outsourceRemarks = outsourceRemarks == null ? null : outsourceRemarks.trim();
@@ -331,7 +331,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.type
 	 * @return  the value of t_order_outsource.type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getType() {
 		return type;
@@ -340,7 +340,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.type
 	 * @param type  the value for t_order_outsource.type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -349,7 +349,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.tid
 	 * @return  the value of t_order_outsource.tid
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getTid() {
 		return tid;
@@ -358,7 +358,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.tid
 	 * @param tid  the value for t_order_outsource.tid
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -367,7 +367,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.start_type
 	 * @return  the value of t_order_outsource.start_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getStartType() {
 		return startType;
@@ -376,7 +376,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.start_type
 	 * @param startType  the value for t_order_outsource.start_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setStartType(Integer startType) {
 		this.startType = startType;
@@ -385,7 +385,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_type
 	 * @return  the value of t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getPatentType() {
 		return patentType;
@@ -394,7 +394,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_type
 	 * @param patentType  the value for t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setPatentType(Integer patentType) {
 		this.patentType = patentType;
@@ -403,7 +403,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name_type
 	 * @return  the value of t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getPatentNameType() {
 		return patentNameType;
@@ -412,7 +412,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name_type
 	 * @param patentNameType  the value for t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setPatentNameType(Integer patentNameType) {
 		this.patentNameType = patentNameType;
@@ -421,7 +421,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name
 	 * @return  the value of t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getPatentName() {
 		return patentName;
@@ -430,7 +430,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name
 	 * @param patentName  the value for t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setPatentName(String patentName) {
 		this.patentName = patentName == null ? null : patentName.trim();
@@ -439,7 +439,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.actual_official
 	 * @return  the value of t_order_outsource.actual_official
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public Integer getActualOfficial() {
 		return actualOfficial;
@@ -448,7 +448,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.actual_official
 	 * @param actualOfficial  the value for t_order_outsource.actual_official
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setActualOfficial(Integer actualOfficial) {
 		this.actualOfficial = actualOfficial;
@@ -457,7 +457,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.picture_url
 	 * @return  the value of t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public String getPictureUrl() {
 		return pictureUrl;
@@ -466,7 +466,7 @@ public class TOrderOutsource implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.picture_url
 	 * @param pictureUrl  the value for t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	public void setPictureUrl(String pictureUrl) {
 		this.pictureUrl = pictureUrl == null ? null : pictureUrl.trim();
@@ -474,7 +474,7 @@ public class TOrderOutsource implements Serializable {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Fri Jul 23 15:28:48 CST 2021
+	 * @mbg.generated  Thu Aug 05 11:38:34 CST 2021
 	 */
 	@Override
 	public String toString() {

+ 57 - 18
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.enums.NoticeStatus;
+import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.AsyncUtils;
@@ -39,6 +41,8 @@ public class ReleaseUserTask {
 	@Resource
 	private UserService userService;
 	@Autowired
+	private NoticeMapper	noticeMapper;
+	@Autowired
 	private AsyncUtils	asyncUtils;
 	@Value(value = "${dev.name}")
 	private String devName=null;
@@ -103,7 +107,7 @@ public class ReleaseUserTask {
 						NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode(), str,ub.getUid()));
 			}
 		}
-		asyncUtils.addNoticeBatch(ln);
+		addNoticeBatch(ln);
 		LoggerUtils.debug(getClass(), "==============客户提醒结束============");
 	}
 
@@ -117,19 +121,21 @@ public class ReleaseUserTask {
 		try {
 			List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
 			List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
-			List<LockingReleaseBo> userTmpList = null;
-			List<LockingReleaseBo> userTmpList2 = null;
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
+					List<LockingReleaseBo> userTmpList = null;
+					List<LockingReleaseBo> userTmpList2 = null;
 					if (StringUtils.isNotBlank(u.getId())) {
 						// 获取30天释放
 						userTmpList = customerService.selectWaitReleaseCustomer(u.getId(), 0);
 						// 获取270天释放
-						userTmpList2 = customerService.selectWaitReleaseCustomer(u.getId(), 1);
+						if(!u.getId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+							userTmpList2 = customerService.selectWaitReleaseCustomer(u.getId(), 1);
+							customerService.pushReleaseLog(userTmpList2, 1);
+						}
 						addUserNotice(userTmpList,userTmpList2);
 						//
 						customerService.pushReleaseLog(userTmpList, 0);
-						customerService.pushReleaseLog(userTmpList2, 1);
 						if (userTmpList != null && !userTmpList.isEmpty())
 							lockUserList.addAll(userTmpList);
 						if (userTmpList2 != null && !userTmpList2.isEmpty())
@@ -187,7 +193,7 @@ public class ReleaseUserTask {
 		} catch (Exception e) {
 			Notice n = new Notice(UUID.randomUUID().toString(), new Date(), 0, "1",
 					NoticeStatus.TASK_PATENT_ERROR.getCode(), "==============客户释放失败================",null);
-			asyncUtils.addNotice(n);
+			addNotice(n);
 			EmailBo emailBo = new EmailBo("释放客户失败", AFTConstants.ADMIN_EMAIL, "超管", "平台", "系统", devName+"释放客户失败");
 			try {
 				asyncUtils.send(emailBo);
@@ -199,23 +205,56 @@ public class ReleaseUserTask {
 		}
 		LoggerUtils.debug(getClass(), "==============客户释放完成============");
 	}
+	
+	public void addNotice(Notice n ) {
+		n.setType(NoticeTypes.getType(n.getNoticeType()));
+		noticeMapper.insertSelective(n);
+	}
+	
+	public void addNoticeBatch(List<Notice> ln) {
+		List<Notice> newList=new ArrayList<Notice>();
+		if (ln != null && ln.size() > 0) {
+			for (int i = 0; i < ln.size(); i++) {
+				ln.get(i).setType(NoticeTypes.getType(ln.get(i).getNoticeType()));
+				newList.add(ln.get(i));
+				if (50 == newList.size() || i == ln.size() - 1) {
+					if (newList.size() > 0) noticeMapper.insertBatch(newList);
+					newList.clear();
+					try {
+						Thread.sleep(2000);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+	}
+
 
 	private void addUserNotice(List<LockingReleaseBo> userTmpList, List<LockingReleaseBo> userTmpList2) {
 		List<Notice> nl=new ArrayList<Notice>();
-		for (LockingReleaseBo u : userTmpList) {
-			nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
-					NoticeStatus.CUSTOMER_LOSE30.getCode(), 
-					String.format("您的%s客户【%s】已经30天未跟进,已经自动释放!", "私有", u.getUserName()),
-					u.getUid()));
+		if (!userTmpList.isEmpty()) {
+			for (LockingReleaseBo u : userTmpList) {
+				nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
+						NoticeStatus.CUSTOMER_LOSE30.getCode(), 
+						String.format("您的%s客户【%s】已经30天未跟进,已经自动释放!", "私有", u.getUserName()),
+						u.getUid()));
+			}
 		}
-		for (LockingReleaseBo u : userTmpList2) {
-			nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
-					NoticeStatus.CUSTOMER_LOSE270.getCode(), 
-					String.format("您的%s客户【%s】已经270天未签单,已经自动释放!", "私有", u.getUserName()),
-					u.getUid()));
+		if (!userTmpList2.isEmpty()) {
+			for (LockingReleaseBo u : userTmpList2) {
+				nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
+						NoticeStatus.CUSTOMER_LOSE270.getCode(), 
+						String.format("您的%s客户【%s】已经270天未签单,已经自动释放!", "私有", u.getUserName()),
+						u.getUid()));
+			}
 		}
-		if(!nl.isEmpty())asyncUtils.addNoticeBatch(nl);
+		if(!nl.isEmpty())addNoticeBatch(nl);
 	}
+	
+	
+	
+	
 
 	private void addChannelNotice(List<userDaysBo> hsList, List<userDaysBo> sfList) {
 		List<Notice> nl=new ArrayList<Notice>();
@@ -232,7 +271,7 @@ public class ReleaseUserTask {
 					String.format("您的%s客户【%s】已经90天未跟进,已经自动释放!", "渠道", sf.getName()),
 					sf.getUid()));
 		}
-		if(!nl.isEmpty())asyncUtils.addNoticeBatch(nl);
+		if(!nl.isEmpty())addNoticeBatch(nl);
 	}
 
 }

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

@@ -165,6 +165,7 @@ public class NewExcelUtil<T> {
 		return new Result().data(1);
 	}
 	
+	
 	/**
 	 * 	导出CXCEL表到指定目录
 	 * @param list 导出数据集合
@@ -220,6 +221,8 @@ public class NewExcelUtil<T> {
 			}
 		}
 	}
+	
+	
 
 
 	private String DateFilename(String sheetName) {
@@ -402,6 +405,19 @@ public class NewExcelUtil<T> {
 		cell.setCellStyle(styles.get("header"));
 		return cell;
 	}
+	
+	/**
+	 * 创建单元格
+	 */
+	public Cell createTotal(String str, Row row, int column) {
+		// 创建列
+		Cell cell = row.createCell(column);
+		// 写入列信息
+		cell.setCellValue(str);
+		sheet.setColumnWidth(column, (int) ((14 + 0.72) * 256));
+		cell.setCellStyle(styles.get("header"));
+		return cell;
+	}
 
 	/**
 	 * 设置单元格信息

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2059,9 +2059,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 						}
 						userTransferLogMapper.insertList(list3);
 					}
+					newList.clear();
+					Thread.sleep(2000);
 				}
-				newList.clear();
-				Thread.sleep(2000);
 			}
 
 		}

+ 9 - 0
src/main/java/com/goafanti/order/enums/TaskState.java

@@ -44,6 +44,15 @@ public enum TaskState {
         }
         return  null;
     }
+	
+	public static String getCountStr() {
+		StringBuffer str=new StringBuffer();
+		for (TaskState value : TaskState.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() {

+ 0 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -16,7 +16,6 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.InputArrearsDunListBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
-import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.OutArrearsDunListBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;

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

@@ -111,6 +111,7 @@ import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderRefundBo;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.outOrderDunListBo;
 import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.ApprovalNewState;
@@ -1404,11 +1405,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean checkOfficialType(TOrderOutsource o) {
-		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(o.getTid());
-		
-		OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());
-		if (o.getStartType()==1&&of==null) {
-			return true;
+		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(o.getTid().toString());
+		if(o.getStartType()==1&&t.getBpType()==1) {
+			OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());
+			if (of==null) {
+				return true;
+			}
 		}
 		return false;
 	}

+ 21 - 0
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -2,14 +2,35 @@ package com.goafanti.patent.bo;
 
 
 import com.goafanti.common.model.PatentNew;
+import com.goafanti.common.utils.excel.Excel;
 
 public class PatentNewBo extends PatentNew{
+
+	
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "专利编号")
+	private String patentNo;
+	
+	@Excel(name = "专利名称")
+	private String name;
+	@Excel(name = "类型", readConverterExp="0=发明专利,1=使用新型,2=外观设计")
+	private Integer type;
+	@Excel(name = "申请日期")
 	private String applyDates;
+	@Excel(name = "权利人")
+	private String holders;
+	@Excel(name = "授权日期")
 	private String authorizationDates;
+	@Excel(name = "发明人")
+	private String inventor;
+	@Excel(name = "年费状态",readConverterExp = "0=无信息,1=代缴费")
+	private Integer annualFeeStatus;
+	@Excel(name = "营销员提醒状态",readConverterExp = "0=未提醒,1=已提醒")
+	private Integer salesmanRemind;
 	private String aname;
 	private String depName;
 	private String createTimes;

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

@@ -70,7 +70,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.80
+static.host=//static.jishutao.com/1.1.81
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -60,7 +60,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.80
+static.host=//static.jishutao.com/1.1.81
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload