fanxw 1 anno fa
parent
commit
9adaee12a9

+ 7 - 7
src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperEducationMapper.xml

@@ -12,7 +12,7 @@
12
     <result column="education" jdbcType="INTEGER" property="education" />
12
     <result column="education" jdbcType="INTEGER" property="education" />
13
     <result column="degree" jdbcType="INTEGER" property="degree" />
13
     <result column="degree" jdbcType="INTEGER" property="degree" />
14
     <result column="degree_detailed" jdbcType="INTEGER" property="degreeDetailed" />
14
     <result column="degree_detailed" jdbcType="INTEGER" property="degreeDetailed" />
15
-    <result column="rank" jdbcType="INTEGER" property="rank" />
15
+    <result column="rank" jdbcType="VARCHAR" property="rank" />
16
     <result column="issue_facility" jdbcType="VARCHAR" property="issueFacility" />
16
     <result column="issue_facility" jdbcType="VARCHAR" property="issueFacility" />
17
     <result column="issue_time" jdbcType="TIMESTAMP" property="issueTime" />
17
     <result column="issue_time" jdbcType="TIMESTAMP" property="issueTime" />
18
     <result column="sfwslzy" jdbcType="VARCHAR" property="sfwslzy" />
18
     <result column="sfwslzy" jdbcType="VARCHAR" property="sfwslzy" />
@@ -127,7 +127,7 @@
127
     values (#{id,jdbcType=INTEGER}, #{keeperId,jdbcType=INTEGER}, #{datatype,jdbcType=INTEGER}, 
127
     values (#{id,jdbcType=INTEGER}, #{keeperId,jdbcType=INTEGER}, #{datatype,jdbcType=INTEGER}, 
128
       #{type,jdbcType=INTEGER}, #{occupation,jdbcType=INTEGER}, #{college,jdbcType=VARCHAR}, 
128
       #{type,jdbcType=INTEGER}, #{occupation,jdbcType=INTEGER}, #{college,jdbcType=VARCHAR}, 
129
       #{department,jdbcType=VARCHAR}, #{education,jdbcType=INTEGER}, #{degree,jdbcType=INTEGER}, 
129
       #{department,jdbcType=VARCHAR}, #{education,jdbcType=INTEGER}, #{degree,jdbcType=INTEGER}, 
130
-      #{degreeDetailed,jdbcType=INTEGER}, #{rank,jdbcType=INTEGER}, #{issueFacility,jdbcType=VARCHAR}, 
130
+      #{degreeDetailed,jdbcType=INTEGER}, #{rank,jdbcType=VARCHAR}, #{issueFacility,jdbcType=VARCHAR}, 
131
       #{issueTime,jdbcType=TIMESTAMP}, #{sfwslzy,jdbcType=VARCHAR}, 
131
       #{issueTime,jdbcType=TIMESTAMP}, #{sfwslzy,jdbcType=VARCHAR}, 
132
       #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR}, #{org_id,jdbcType=INTEGER}, #{fzywlx,jdbcType=VARCHAR}, #{fzywsj,jdbcType=TIMESTAMP})
132
       #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR}, #{org_id,jdbcType=INTEGER}, #{fzywlx,jdbcType=VARCHAR}, #{fzywsj,jdbcType=TIMESTAMP})
133
   </insert>
133
   </insert>
@@ -227,7 +227,7 @@
227
         #{degreeDetailed,jdbcType=INTEGER},
227
         #{degreeDetailed,jdbcType=INTEGER},
228
       </if>
228
       </if>
229
       <if test="rank != null">
229
       <if test="rank != null">
230
-        #{rank,jdbcType=INTEGER},
230
+        #{rank,jdbcType=VARCHAR},
231
       </if>
231
       </if>
232
       <if test="issueFacility != null">
232
       <if test="issueFacility != null">
233
         #{issueFacility,jdbcType=VARCHAR},
233
         #{issueFacility,jdbcType=VARCHAR},
@@ -295,7 +295,7 @@
295
         degree_detailed = #{record.degreeDetailed,jdbcType=INTEGER},
295
         degree_detailed = #{record.degreeDetailed,jdbcType=INTEGER},
296
       </if>
296
       </if>
297
       <if test="record.rank != null">
297
       <if test="record.rank != null">
298
-        rank = #{record.rank,jdbcType=INTEGER},
298
+        rank = #{record.rank,jdbcType=VARCHAR},
299
       </if>
299
       </if>
300
       <if test="record.issueFacility != null">
300
       <if test="record.issueFacility != null">
301
         issue_facility = #{record.issueFacility,jdbcType=VARCHAR},
301
         issue_facility = #{record.issueFacility,jdbcType=VARCHAR},
@@ -338,7 +338,7 @@
338
       education = #{record.education,jdbcType=INTEGER},
338
       education = #{record.education,jdbcType=INTEGER},
339
       degree = #{record.degree,jdbcType=INTEGER},
339
       degree = #{record.degree,jdbcType=INTEGER},
340
       degree_detailed = #{record.degreeDetailed,jdbcType=INTEGER},
340
       degree_detailed = #{record.degreeDetailed,jdbcType=INTEGER},
341
-      rank = #{record.rank,jdbcType=INTEGER},
341
+      rank = #{record.rank,jdbcType=VARCHAR},
342
       issue_facility = #{record.issueFacility,jdbcType=VARCHAR},
342
       issue_facility = #{record.issueFacility,jdbcType=VARCHAR},
343
       issue_time = #{record.issueTime,jdbcType=TIMESTAMP},
343
       issue_time = #{record.issueTime,jdbcType=TIMESTAMP},
344
       sfwslzy = #{record.sfwslzy,jdbcType=VARCHAR},
344
       sfwslzy = #{record.sfwslzy,jdbcType=VARCHAR},
@@ -382,7 +382,7 @@
382
         degree_detailed = #{degreeDetailed,jdbcType=INTEGER},
382
         degree_detailed = #{degreeDetailed,jdbcType=INTEGER},
383
       </if>
383
       </if>
384
       <if test="rank != null">
384
       <if test="rank != null">
385
-        rank = #{rank,jdbcType=INTEGER},
385
+        rank = #{rank,jdbcType=VARCHAR},
386
       </if>
386
       </if>
387
       <if test="issueFacility != null">
387
       <if test="issueFacility != null">
388
         issue_facility = #{issueFacility,jdbcType=VARCHAR},
388
         issue_facility = #{issueFacility,jdbcType=VARCHAR},
@@ -422,7 +422,7 @@
422
       education = #{education,jdbcType=INTEGER},
422
       education = #{education,jdbcType=INTEGER},
423
       degree = #{degree,jdbcType=INTEGER},
423
       degree = #{degree,jdbcType=INTEGER},
424
       degree_detailed = #{degreeDetailed,jdbcType=INTEGER},
424
       degree_detailed = #{degreeDetailed,jdbcType=INTEGER},
425
-      rank = #{rank,jdbcType=INTEGER},
425
+      rank = #{rank,jdbcType=VARCHAR},
426
       issue_facility = #{issueFacility,jdbcType=VARCHAR},
426
       issue_facility = #{issueFacility,jdbcType=VARCHAR},
427
       issue_time = #{issueTime,jdbcType=TIMESTAMP},
427
       issue_time = #{issueTime,jdbcType=TIMESTAMP},
428
       sfwslzy = #{sfwslzy,jdbcType=VARCHAR},
428
       sfwslzy = #{sfwslzy,jdbcType=VARCHAR},

+ 3 - 3
src/main/java/com/chinaitop/depot/basic/model/BasicKeeperEducation.java

@@ -25,7 +25,7 @@ public class BasicKeeperEducation {
25
 
25
 
26
     private Integer degreeDetailed;
26
     private Integer degreeDetailed;
27
 
27
 
28
-    private Integer rank;
28
+    private String rank;
29
 
29
 
30
     private String issueFacility;
30
     private String issueFacility;
31
 
31
 
@@ -208,7 +208,7 @@ public class BasicKeeperEducation {
208
      * 等级
208
      * 等级
209
      * @return rank 等级
209
      * @return rank 等级
210
      */
210
      */
211
-    public Integer getRank() {
211
+    public String getRank() {
212
         return rank;
212
         return rank;
213
     }
213
     }
214
 
214
 
@@ -216,7 +216,7 @@ public class BasicKeeperEducation {
216
      * 等级
216
      * 等级
217
      * @param rank 等级
217
      * @param rank 等级
218
      */
218
      */
219
-    public void setRank(Integer rank) {
219
+    public void setRank(String rank) {
220
         this.rank = rank;
220
         this.rank = rank;
221
     }
221
     }
222
 
222
 

+ 10 - 10
src/main/java/com/chinaitop/depot/basic/model/BasicKeeperEducationExample.java

@@ -747,52 +747,52 @@ public class BasicKeeperEducationExample {
747
             return (Criteria) this;
747
             return (Criteria) this;
748
         }
748
         }
749
 
749
 
750
-        public Criteria andRankEqualTo(Integer value) {
750
+        public Criteria andRankEqualTo(String value) {
751
             addCriterion("rank =", value, "rank");
751
             addCriterion("rank =", value, "rank");
752
             return (Criteria) this;
752
             return (Criteria) this;
753
         }
753
         }
754
 
754
 
755
-        public Criteria andRankNotEqualTo(Integer value) {
755
+        public Criteria andRankNotEqualTo(String value) {
756
             addCriterion("rank <>", value, "rank");
756
             addCriterion("rank <>", value, "rank");
757
             return (Criteria) this;
757
             return (Criteria) this;
758
         }
758
         }
759
 
759
 
760
-        public Criteria andRankGreaterThan(Integer value) {
760
+        public Criteria andRankGreaterThan(String value) {
761
             addCriterion("rank >", value, "rank");
761
             addCriterion("rank >", value, "rank");
762
             return (Criteria) this;
762
             return (Criteria) this;
763
         }
763
         }
764
 
764
 
765
-        public Criteria andRankGreaterThanOrEqualTo(Integer value) {
765
+        public Criteria andRankGreaterThanOrEqualTo(String value) {
766
             addCriterion("rank >=", value, "rank");
766
             addCriterion("rank >=", value, "rank");
767
             return (Criteria) this;
767
             return (Criteria) this;
768
         }
768
         }
769
 
769
 
770
-        public Criteria andRankLessThan(Integer value) {
770
+        public Criteria andRankLessThan(String value) {
771
             addCriterion("rank <", value, "rank");
771
             addCriterion("rank <", value, "rank");
772
             return (Criteria) this;
772
             return (Criteria) this;
773
         }
773
         }
774
 
774
 
775
-        public Criteria andRankLessThanOrEqualTo(Integer value) {
775
+        public Criteria andRankLessThanOrEqualTo(String value) {
776
             addCriterion("rank <=", value, "rank");
776
             addCriterion("rank <=", value, "rank");
777
             return (Criteria) this;
777
             return (Criteria) this;
778
         }
778
         }
779
 
779
 
780
-        public Criteria andRankIn(List<Integer> values) {
780
+        public Criteria andRankIn(List<String> values) {
781
             addCriterion("rank in", values, "rank");
781
             addCriterion("rank in", values, "rank");
782
             return (Criteria) this;
782
             return (Criteria) this;
783
         }
783
         }
784
 
784
 
785
-        public Criteria andRankNotIn(List<Integer> values) {
785
+        public Criteria andRankNotIn(List<String> values) {
786
             addCriterion("rank not in", values, "rank");
786
             addCriterion("rank not in", values, "rank");
787
             return (Criteria) this;
787
             return (Criteria) this;
788
         }
788
         }
789
 
789
 
790
-        public Criteria andRankBetween(Integer value1, Integer value2) {
790
+        public Criteria andRankBetween(String value1, String value2) {
791
             addCriterion("rank between", value1, value2, "rank");
791
             addCriterion("rank between", value1, value2, "rank");
792
             return (Criteria) this;
792
             return (Criteria) this;
793
         }
793
         }
794
 
794
 
795
-        public Criteria andRankNotBetween(Integer value1, Integer value2) {
795
+        public Criteria andRankNotBetween(String value1, String value2) {
796
             addCriterion("rank not between", value1, value2, "rank");
796
             addCriterion("rank not between", value1, value2, "rank");
797
             return (Criteria) this;
797
             return (Criteria) this;
798
         }
798
         }