fanxw 5 年之前
父節點
當前提交
0ebcdd43a1

+ 6 - 6
src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -182,12 +182,12 @@ public class OrgInfoController {
182
 			List<ButtonInfo> buttonList = buttonInfoService.queryByExample(exampleButton);
182
 			List<ButtonInfo> buttonList = buttonInfoService.queryByExample(exampleButton);
183
 			roleButtonService.saveForList(roleInfo.getRoleId(), buttonList);
183
 			roleButtonService.saveForList(roleInfo.getRoleId(), buttonList);
184
 		} else {
184
 		} else {
185
-			if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
186
-        		String path = uploadPath+orgInfo.getBirdsEye();
187
-        		byte[] file2byte = FileUtil.file2byte(path);
188
-        		String hexString = FileUtil.toHexString(file2byte);
189
-        		orgInfo.setWjl(hexString);
190
-        	}
185
+//			if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
186
+//        		String path = uploadPath+orgInfo.getBirdsEye();
187
+//        		byte[] file2byte = FileUtil.file2byte(path);
188
+//        		String hexString = FileUtil.toHexString(file2byte);
189
+//        		orgInfo.setWjl(hexString);
190
+//        	}
191
 			orgInfoService.update(orgInfo);
191
 			orgInfoService.update(orgInfo);
192
 		}
192
 		}
193
         /*if(5318 == orgInfo.getOrgClassId()) {//粮食企业的级别是在上级行政单位的级别上加2位顺序码
193
         /*if(5318 == orgInfo.getOrgClassId()) {//粮食企业的级别是在上级行政单位的级别上加2位顺序码

+ 7 - 7
src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -19,7 +19,7 @@
19
     <result column="work_number" property="workNumber" jdbcType="INTEGER" />
19
     <result column="work_number" property="workNumber" jdbcType="INTEGER" />
20
     <result column="area_code" property="areaCode" jdbcType="INTEGER" />
20
     <result column="area_code" property="areaCode" jdbcType="INTEGER" />
21
     <result column="area_name" property="areaName" jdbcType="VARCHAR" />
21
     <result column="area_name" property="areaName" jdbcType="VARCHAR" />
22
-    <result column="post" property="post" jdbcType="INTEGER" />
22
+    <result column="post" property="post" jdbcType="VARCHAR" />
23
     <result column="depot_class" property="depotClass" jdbcType="INTEGER" />
23
     <result column="depot_class" property="depotClass" jdbcType="INTEGER" />
24
     <result column="design_capacity" property="designCapacity" jdbcType="INTEGER" />
24
     <result column="design_capacity" property="designCapacity" jdbcType="INTEGER" />
25
     <result column="effective_capacity" property="effectiveCapacity" jdbcType="INTEGER" />
25
     <result column="effective_capacity" property="effectiveCapacity" jdbcType="INTEGER" />
@@ -186,7 +186,7 @@
186
       #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
186
       #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
187
       #{fax,jdbcType=VARCHAR}, #{chargePerson,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
187
       #{fax,jdbcType=VARCHAR}, #{chargePerson,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
188
       #{latitude,jdbcType=VARCHAR}, #{registCapital,jdbcType=INTEGER}, #{workNumber,jdbcType=INTEGER}, 
188
       #{latitude,jdbcType=VARCHAR}, #{registCapital,jdbcType=INTEGER}, #{workNumber,jdbcType=INTEGER}, 
189
-      #{areaCode,jdbcType=INTEGER}, #{areaName,jdbcType=VARCHAR}, #{post,jdbcType=INTEGER}, 
189
+      #{areaCode,jdbcType=INTEGER}, #{areaName,jdbcType=VARCHAR}, #{post,jdbcType=VARCHAR}, 
190
       #{depotClass,jdbcType=INTEGER}, #{designCapacity,jdbcType=INTEGER}, #{effectiveCapacity,jdbcType=INTEGER}, 
190
       #{depotClass,jdbcType=INTEGER}, #{designCapacity,jdbcType=INTEGER}, #{effectiveCapacity,jdbcType=INTEGER}, 
191
       #{depotArea,jdbcType=REAL}, #{completeDate,jdbcType=TIMESTAMP}, #{useDate,jdbcType=TIMESTAMP}, 
191
       #{depotArea,jdbcType=REAL}, #{completeDate,jdbcType=TIMESTAMP}, #{useDate,jdbcType=TIMESTAMP}, 
192
       #{companyOrgCode,jdbcType=VARCHAR}, #{creditCode,jdbcType=VARCHAR}, #{registType,jdbcType=INTEGER}, 
192
       #{companyOrgCode,jdbcType=VARCHAR}, #{creditCode,jdbcType=VARCHAR}, #{registType,jdbcType=INTEGER}, 
@@ -403,7 +403,7 @@
403
         #{areaName,jdbcType=VARCHAR},
403
         #{areaName,jdbcType=VARCHAR},
404
       </if>
404
       </if>
405
       <if test="post != null" >
405
       <if test="post != null" >
406
-        #{post,jdbcType=INTEGER},
406
+        #{post,jdbcType=VARCHAR},
407
       </if>
407
       </if>
408
       <if test="depotClass != null" >
408
       <if test="depotClass != null" >
409
         #{depotClass,jdbcType=INTEGER},
409
         #{depotClass,jdbcType=INTEGER},
@@ -558,7 +558,7 @@
558
         area_name = #{record.areaName,jdbcType=VARCHAR},
558
         area_name = #{record.areaName,jdbcType=VARCHAR},
559
       </if>
559
       </if>
560
       <if test="record.post != null" >
560
       <if test="record.post != null" >
561
-        post = #{record.post,jdbcType=INTEGER},
561
+        post = #{record.post,jdbcType=VARCHAR},
562
       </if>
562
       </if>
563
       <if test="record.depotClass != null" >
563
       <if test="record.depotClass != null" >
564
         depot_class = #{record.depotClass,jdbcType=INTEGER},
564
         depot_class = #{record.depotClass,jdbcType=INTEGER},
@@ -677,7 +677,7 @@
677
       work_number = #{record.workNumber,jdbcType=INTEGER},
677
       work_number = #{record.workNumber,jdbcType=INTEGER},
678
       area_code = #{record.areaCode,jdbcType=INTEGER},
678
       area_code = #{record.areaCode,jdbcType=INTEGER},
679
       area_name = #{record.areaName,jdbcType=VARCHAR},
679
       area_name = #{record.areaName,jdbcType=VARCHAR},
680
-      post = #{record.post,jdbcType=INTEGER},
680
+      post = #{record.post,jdbcType=VARCHAR},
681
       depot_class = #{record.depotClass,jdbcType=INTEGER},
681
       depot_class = #{record.depotClass,jdbcType=INTEGER},
682
       design_capacity = #{record.designCapacity,jdbcType=INTEGER},
682
       design_capacity = #{record.designCapacity,jdbcType=INTEGER},
683
       effective_capacity = #{record.effectiveCapacity,jdbcType=INTEGER},
683
       effective_capacity = #{record.effectiveCapacity,jdbcType=INTEGER},
@@ -764,7 +764,7 @@
764
         area_name = #{areaName,jdbcType=VARCHAR},
764
         area_name = #{areaName,jdbcType=VARCHAR},
765
       </if>
765
       </if>
766
       <if test="post != null" >
766
       <if test="post != null" >
767
-        post = #{post,jdbcType=INTEGER},
767
+        post = #{post,jdbcType=VARCHAR},
768
       </if>
768
       </if>
769
       <if test="depotClass != null" >
769
       <if test="depotClass != null" >
770
         depot_class = #{depotClass,jdbcType=INTEGER},
770
         depot_class = #{depotClass,jdbcType=INTEGER},
@@ -907,7 +907,7 @@
907
       work_number = #{workNumber,jdbcType=INTEGER},
907
       work_number = #{workNumber,jdbcType=INTEGER},
908
       area_code = #{areaCode,jdbcType=INTEGER},
908
       area_code = #{areaCode,jdbcType=INTEGER},
909
       area_name = #{areaName,jdbcType=VARCHAR},
909
       area_name = #{areaName,jdbcType=VARCHAR},
910
-      post = #{post,jdbcType=INTEGER},
910
+      post = #{post,jdbcType=VARCHAR},
911
       depot_class = #{depotClass,jdbcType=INTEGER},
911
       depot_class = #{depotClass,jdbcType=INTEGER},
912
       design_capacity = #{designCapacity,jdbcType=INTEGER},
912
       design_capacity = #{designCapacity,jdbcType=INTEGER},
913
       effective_capacity = #{effectiveCapacity,jdbcType=INTEGER},
913
       effective_capacity = #{effectiveCapacity,jdbcType=INTEGER},

+ 4 - 4
src/main/java/com/chinaitop/depot/system/model/OrgInfo.java

@@ -43,7 +43,7 @@ public class OrgInfo implements Serializable {
43
 
43
 
44
     private String areaName;
44
     private String areaName;
45
 
45
 
46
-    private Integer post;
46
+    private String post;
47
 
47
 
48
     private Integer depotClass;
48
     private Integer depotClass;
49
 
49
 
@@ -265,12 +265,12 @@ public class OrgInfo implements Serializable {
265
         this.areaName = areaName == null ? null : areaName.trim();
265
         this.areaName = areaName == null ? null : areaName.trim();
266
     }
266
     }
267
 
267
 
268
-    public Integer getPost() {
268
+    public String getPost() {
269
         return post;
269
         return post;
270
     }
270
     }
271
 
271
 
272
-    public void setPost(Integer post) {
273
-        this.post = post;
272
+    public void setPost(String post) {
273
+        this.post = post == null ? null : post.trim();
274
     }
274
     }
275
 
275
 
276
     public Integer getDepotClass() {
276
     public Integer getDepotClass() {

+ 4 - 34
src/main/java/com/chinaitop/depot/system/model/OrgInfoExample.java

@@ -1235,56 +1235,26 @@ public class OrgInfoExample {
1235
             return (Criteria) this;
1235
             return (Criteria) this;
1236
         }
1236
         }
1237
 
1237
 
1238
-        public Criteria andPostEqualTo(Integer value) {
1238
+        public Criteria andPostEqualTo(String value) {
1239
             addCriterion("post =", value, "post");
1239
             addCriterion("post =", value, "post");
1240
             return (Criteria) this;
1240
             return (Criteria) this;
1241
         }
1241
         }
1242
 
1242
 
1243
-        public Criteria andPostNotEqualTo(Integer value) {
1243
+        public Criteria andPostNotEqualTo(String value) {
1244
             addCriterion("post <>", value, "post");
1244
             addCriterion("post <>", value, "post");
1245
             return (Criteria) this;
1245
             return (Criteria) this;
1246
         }
1246
         }
1247
 
1247
 
1248
-        public Criteria andPostGreaterThan(Integer value) {
1249
-            addCriterion("post >", value, "post");
1250
-            return (Criteria) this;
1251
-        }
1252
-
1253
-        public Criteria andPostGreaterThanOrEqualTo(Integer value) {
1254
-            addCriterion("post >=", value, "post");
1255
-            return (Criteria) this;
1256
-        }
1257
-
1258
-        public Criteria andPostLessThan(Integer value) {
1259
-            addCriterion("post <", value, "post");
1260
-            return (Criteria) this;
1261
-        }
1262
-
1263
-        public Criteria andPostLessThanOrEqualTo(Integer value) {
1264
-            addCriterion("post <=", value, "post");
1265
-            return (Criteria) this;
1266
-        }
1267
-
1268
-        public Criteria andPostIn(List<Integer> values) {
1248
+        public Criteria andPostIn(List<String> values) {
1269
             addCriterion("post in", values, "post");
1249
             addCriterion("post in", values, "post");
1270
             return (Criteria) this;
1250
             return (Criteria) this;
1271
         }
1251
         }
1272
 
1252
 
1273
-        public Criteria andPostNotIn(List<Integer> values) {
1253
+        public Criteria andPostNotIn(List<String> values) {
1274
             addCriterion("post not in", values, "post");
1254
             addCriterion("post not in", values, "post");
1275
             return (Criteria) this;
1255
             return (Criteria) this;
1276
         }
1256
         }
1277
 
1257
 
1278
-        public Criteria andPostBetween(Integer value1, Integer value2) {
1279
-            addCriterion("post between", value1, value2, "post");
1280
-            return (Criteria) this;
1281
-        }
1282
-
1283
-        public Criteria andPostNotBetween(Integer value1, Integer value2) {
1284
-            addCriterion("post not between", value1, value2, "post");
1285
-            return (Criteria) this;
1286
-        }
1287
-
1288
         public Criteria andDepotClassIsNull() {
1258
         public Criteria andDepotClassIsNull() {
1289
             addCriterion("depot_class is null");
1259
             addCriterion("depot_class is null");
1290
             return (Criteria) this;
1260
             return (Criteria) this;