Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mybatis/generatorConfig.xml

src/main/java/com/jqtx/windows/repository/entity/WindowsCredit.java

@@ -15,6 +15,12 @@ public class WindowsCredit {
 
     private String creditDetailUrl;
 
+    private String creditThirdToken;
+
+    private String creditThirdUrl;
+
+    private String creditThirdStatus;
+
     private String creditResult;
 
     private String creditAmt;
@@ -73,6 +79,30 @@ public class WindowsCredit {
         this.creditDetailUrl = creditDetailUrl == null ? null : creditDetailUrl.trim();
     }
 
+    public String getCreditThirdToken() {
+        return creditThirdToken;
+    }
+
+    public void setCreditThirdToken(String creditThirdToken) {
+        this.creditThirdToken = creditThirdToken == null ? null : creditThirdToken.trim();
+    }
+
+    public String getCreditThirdUrl() {
+        return creditThirdUrl;
+    }
+
+    public void setCreditThirdUrl(String creditThirdUrl) {
+        this.creditThirdUrl = creditThirdUrl == null ? null : creditThirdUrl.trim();
+    }
+
+    public String getCreditThirdStatus() {
+        return creditThirdStatus;
+    }
+
+    public void setCreditThirdStatus(String creditThirdStatus) {
+        this.creditThirdStatus = creditThirdStatus == null ? null : creditThirdStatus.trim();
+    }
+
     public String getCreditResult() {
         return creditResult;
     }

src/main/java/com/jqtx/windows/repository/entity/WindowsCreditExample.java

@@ -515,6 +515,216 @@ public class WindowsCreditExample {
             return (Criteria) this;
         }
 
+        public Criteria andCreditThirdTokenIsNull() {
+            addCriterion("credit_third_token is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenIsNotNull() {
+            addCriterion("credit_third_token is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenEqualTo(String value) {
+            addCriterion("credit_third_token =", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenNotEqualTo(String value) {
+            addCriterion("credit_third_token <>", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenGreaterThan(String value) {
+            addCriterion("credit_third_token >", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenGreaterThanOrEqualTo(String value) {
+            addCriterion("credit_third_token >=", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenLessThan(String value) {
+            addCriterion("credit_third_token <", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenLessThanOrEqualTo(String value) {
+            addCriterion("credit_third_token <=", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenLike(String value) {
+            addCriterion("credit_third_token like", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenNotLike(String value) {
+            addCriterion("credit_third_token not like", value, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenIn(List<String> values) {
+            addCriterion("credit_third_token in", values, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenNotIn(List<String> values) {
+            addCriterion("credit_third_token not in", values, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenBetween(String value1, String value2) {
+            addCriterion("credit_third_token between", value1, value2, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdTokenNotBetween(String value1, String value2) {
+            addCriterion("credit_third_token not between", value1, value2, "creditThirdToken");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlIsNull() {
+            addCriterion("credit_third_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlIsNotNull() {
+            addCriterion("credit_third_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlEqualTo(String value) {
+            addCriterion("credit_third_url =", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlNotEqualTo(String value) {
+            addCriterion("credit_third_url <>", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlGreaterThan(String value) {
+            addCriterion("credit_third_url >", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("credit_third_url >=", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlLessThan(String value) {
+            addCriterion("credit_third_url <", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlLessThanOrEqualTo(String value) {
+            addCriterion("credit_third_url <=", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlLike(String value) {
+            addCriterion("credit_third_url like", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlNotLike(String value) {
+            addCriterion("credit_third_url not like", value, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlIn(List<String> values) {
+            addCriterion("credit_third_url in", values, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlNotIn(List<String> values) {
+            addCriterion("credit_third_url not in", values, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlBetween(String value1, String value2) {
+            addCriterion("credit_third_url between", value1, value2, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdUrlNotBetween(String value1, String value2) {
+            addCriterion("credit_third_url not between", value1, value2, "creditThirdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusIsNull() {
+            addCriterion("credit_third_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusIsNotNull() {
+            addCriterion("credit_third_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusEqualTo(String value) {
+            addCriterion("credit_third_status =", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusNotEqualTo(String value) {
+            addCriterion("credit_third_status <>", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusGreaterThan(String value) {
+            addCriterion("credit_third_status >", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("credit_third_status >=", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusLessThan(String value) {
+            addCriterion("credit_third_status <", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusLessThanOrEqualTo(String value) {
+            addCriterion("credit_third_status <=", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusLike(String value) {
+            addCriterion("credit_third_status like", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusNotLike(String value) {
+            addCriterion("credit_third_status not like", value, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusIn(List<String> values) {
+            addCriterion("credit_third_status in", values, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusNotIn(List<String> values) {
+            addCriterion("credit_third_status not in", values, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusBetween(String value1, String value2) {
+            addCriterion("credit_third_status between", value1, value2, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditThirdStatusNotBetween(String value1, String value2) {
+            addCriterion("credit_third_status not between", value1, value2, "creditThirdStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andCreditResultIsNull() {
             addCriterion("credit_result is null");
             return (Criteria) this;

src/main/resources/mybatis/generatorConfig.xml

@@ -5,7 +5,7 @@
 
 <generatorConfiguration>
     <!--mysql 连接数据库jar 这里选择自己本地位置-->
-    <classPathEntry location="D:\repository\mysql\mysql-connector-java\5.1.46\mysql-connector-java-5.1.46.jar"/>
+    <classPathEntry location="E:\Repo\mysql\mysql-connector-java\5.1.46\mysql-connector-java-5.1.46.jar"/>
     <context id="testTables" targetRuntime="MyBatis3">
         <commentGenerator>
             <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
@@ -50,6 +50,5 @@
         </javaClientGenerator>
         <!-- 指定数据库表 -->
         <table schema="windows" tableName="windows_credit"></table>
-
     </context>
 </generatorConfiguration>

src/main/resources/mybatis/mapper/WindowsCreditMapper.xml

@@ -8,6 +8,9 @@
     <result column="client_cell" jdbcType="VARCHAR" property="clientCell" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="credit_detail_url" jdbcType="VARCHAR" property="creditDetailUrl" />
+    <result column="credit_third_token" jdbcType="VARCHAR" property="creditThirdToken" />
+    <result column="credit_third_url" jdbcType="VARCHAR" property="creditThirdUrl" />
+    <result column="credit_third_status" jdbcType="VARCHAR" property="creditThirdStatus" />
     <result column="credit_result" jdbcType="VARCHAR" property="creditResult" />
     <result column="credit_amt" jdbcType="VARCHAR" property="creditAmt" />
     <result column="gmt_created" jdbcType="TIMESTAMP" property="gmtCreated" />
@@ -73,8 +76,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, client_name, cert_no, client_cell, order_no, credit_detail_url, credit_result, 
-    credit_amt, gmt_created, gmt_modified, memo
+    id, client_name, cert_no, client_cell, order_no, credit_detail_url, credit_third_token, 
+    credit_third_url, credit_third_status, credit_result, credit_amt, gmt_created, gmt_modified, 
+    memo
   </sql>
   <select id="selectByExample" parameterType="com.jqtx.windows.repository.entity.WindowsCreditExample" resultMap="BaseResultMap">
     select
@@ -109,10 +113,12 @@
   <insert id="insert" parameterType="com.jqtx.windows.repository.entity.WindowsCredit">
     insert into windows_credit (id, client_name, cert_no, 
       client_cell, order_no, credit_detail_url, 
+      credit_third_token, credit_third_url, credit_third_status, 
       credit_result, credit_amt, gmt_created, 
       gmt_modified, memo)
     values (#{id,jdbcType=INTEGER}, #{clientName,jdbcType=VARCHAR}, #{certNo,jdbcType=VARCHAR}, 
       #{clientCell,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{creditDetailUrl,jdbcType=VARCHAR}, 
+      #{creditThirdToken,jdbcType=VARCHAR}, #{creditThirdUrl,jdbcType=VARCHAR}, #{creditThirdStatus,jdbcType=VARCHAR}, 
       #{creditResult,jdbcType=VARCHAR}, #{creditAmt,jdbcType=VARCHAR}, #{gmtCreated,jdbcType=TIMESTAMP}, 
       #{gmtModified,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR})
   </insert>
@@ -137,6 +143,15 @@
       <if test="creditDetailUrl != null">
         credit_detail_url,
       </if>
+      <if test="creditThirdToken != null">
+        credit_third_token,
+      </if>
+      <if test="creditThirdUrl != null">
+        credit_third_url,
+      </if>
+      <if test="creditThirdStatus != null">
+        credit_third_status,
+      </if>
       <if test="creditResult != null">
         credit_result,
       </if>
@@ -172,6 +187,15 @@
       <if test="creditDetailUrl != null">
         #{creditDetailUrl,jdbcType=VARCHAR},
       </if>
+      <if test="creditThirdToken != null">
+        #{creditThirdToken,jdbcType=VARCHAR},
+      </if>
+      <if test="creditThirdUrl != null">
+        #{creditThirdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="creditThirdStatus != null">
+        #{creditThirdStatus,jdbcType=VARCHAR},
+      </if>
       <if test="creditResult != null">
         #{creditResult,jdbcType=VARCHAR},
       </if>
@@ -216,6 +240,15 @@
       <if test="row.creditDetailUrl != null">
         credit_detail_url = #{row.creditDetailUrl,jdbcType=VARCHAR},
       </if>
+      <if test="row.creditThirdToken != null">
+        credit_third_token = #{row.creditThirdToken,jdbcType=VARCHAR},
+      </if>
+      <if test="row.creditThirdUrl != null">
+        credit_third_url = #{row.creditThirdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="row.creditThirdStatus != null">
+        credit_third_status = #{row.creditThirdStatus,jdbcType=VARCHAR},
+      </if>
       <if test="row.creditResult != null">
         credit_result = #{row.creditResult,jdbcType=VARCHAR},
       </if>
@@ -244,6 +277,9 @@
       client_cell = #{row.clientCell,jdbcType=VARCHAR},
       order_no = #{row.orderNo,jdbcType=VARCHAR},
       credit_detail_url = #{row.creditDetailUrl,jdbcType=VARCHAR},
+      credit_third_token = #{row.creditThirdToken,jdbcType=VARCHAR},
+      credit_third_url = #{row.creditThirdUrl,jdbcType=VARCHAR},
+      credit_third_status = #{row.creditThirdStatus,jdbcType=VARCHAR},
       credit_result = #{row.creditResult,jdbcType=VARCHAR},
       credit_amt = #{row.creditAmt,jdbcType=VARCHAR},
       gmt_created = #{row.gmtCreated,jdbcType=TIMESTAMP},
@@ -271,6 +307,15 @@
       <if test="creditDetailUrl != null">
         credit_detail_url = #{creditDetailUrl,jdbcType=VARCHAR},
       </if>
+      <if test="creditThirdToken != null">
+        credit_third_token = #{creditThirdToken,jdbcType=VARCHAR},
+      </if>
+      <if test="creditThirdUrl != null">
+        credit_third_url = #{creditThirdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="creditThirdStatus != null">
+        credit_third_status = #{creditThirdStatus,jdbcType=VARCHAR},
+      </if>
       <if test="creditResult != null">
         credit_result = #{creditResult,jdbcType=VARCHAR},
       </if>
@@ -296,6 +341,9 @@
       client_cell = #{clientCell,jdbcType=VARCHAR},
       order_no = #{orderNo,jdbcType=VARCHAR},
       credit_detail_url = #{creditDetailUrl,jdbcType=VARCHAR},
+      credit_third_token = #{creditThirdToken,jdbcType=VARCHAR},
+      credit_third_url = #{creditThirdUrl,jdbcType=VARCHAR},
+      credit_third_status = #{creditThirdStatus,jdbcType=VARCHAR},
       credit_result = #{creditResult,jdbcType=VARCHAR},
       credit_amt = #{creditAmt,jdbcType=VARCHAR},
       gmt_created = #{gmtCreated,jdbcType=TIMESTAMP},