Browse Source

修改验证

hefeng 5 years ago
parent
commit
7b9720b05d

+ 4 - 4
src/main/java/com/chinaitop/depot/registrationTable/service/impl/RegistrationTableServiceImpl.java

@@ -152,7 +152,7 @@ public class RegistrationTableServiceImpl implements RegistrationTableService {
152
 						break;
152
 						break;
153
 					case 9://容重
153
 					case 9://容重
154
 						if (!ParameterUtil.isMatches(revList.get(j))) {
154
 						if (!ParameterUtil.isMatches(revList.get(j))) {
155
-							msg += "第 "+(beginRow+i+1)+" 行第 10 列的容重数据不对(整数)!" + br;
155
+							msg += "第 "+(beginRow+i+1)+" 行第 10 列的容重数据不对(非负整数)!" + br;
156
 							break;
156
 							break;
157
 						}
157
 						}
158
 						recordWheatInfo.setRz(revList.get(j));
158
 						recordWheatInfo.setRz(revList.get(j));
@@ -250,7 +250,7 @@ public class RegistrationTableServiceImpl implements RegistrationTableService {
250
 						break;
250
 						break;
251
 					case 23://硬度指数
251
 					case 23://硬度指数
252
 						if (!ParameterUtil.isMatches(revList.get(j))) {
252
 						if (!ParameterUtil.isMatches(revList.get(j))) {
253
-							msg += "第 "+(beginRow+i+1)+" 行第 24 列的硬度指数数据不对(整数)!" + br;
253
+							msg += "第 "+(beginRow+i+1)+" 行第 24 列的硬度指数数据不对(非负整数)!" + br;
254
 							break;
254
 							break;
255
 						}
255
 						}
256
 						recordWheatInfo.setYdzs(revList.get(j));
256
 						recordWheatInfo.setYdzs(revList.get(j));
@@ -384,7 +384,7 @@ public class RegistrationTableServiceImpl implements RegistrationTableService {
384
 					break;
384
 					break;
385
 				case 9://容重
385
 				case 9://容重
386
 					if (!ParameterUtil.isMatches(revList.get(j))) {
386
 					if (!ParameterUtil.isMatches(revList.get(j))) {
387
-						msg += "第 "+(beginRow+i+1)+" 行第 10 列的容重数据不对(整数)!" + br;
387
+						msg += "第 "+(beginRow+i+1)+" 行第 10 列的容重数据不对(非负整数)!" + br;
388
 						break;
388
 						break;
389
 					}
389
 					}
390
 					recordCornInfo.setRz(revList.get(j));
390
 					recordCornInfo.setRz(revList.get(j));
@@ -1076,7 +1076,7 @@ public class RegistrationTableServiceImpl implements RegistrationTableService {
1076
 					break;
1076
 					break;
1077
 				case 11://溶剂残留量
1077
 				case 11://溶剂残留量
1078
 					if (!ParameterUtil.isMatches(revList.get(j))) {
1078
 					if (!ParameterUtil.isMatches(revList.get(j))) {
1079
-						msg += "第 "+(beginRow+i+1)+" 行第 12 列的溶剂残留量数据不对(整数)!" + br;
1079
+						msg += "第 "+(beginRow+i+1)+" 行第 12 列的溶剂残留量数据不对(非负整数)!" + br;
1080
 						break;
1080
 						break;
1081
 					}
1081
 					}
1082
 					recordCrudeoilInfo.setRjcll(revList.get(j));
1082
 					recordCrudeoilInfo.setRjcll(revList.get(j));

+ 1 - 1
src/main/java/com/chinaitop/depot/utils/ParameterUtil.java

@@ -199,7 +199,7 @@ public class ParameterUtil {
199
     
199
     
200
     //验证数字是正整数
200
     //验证数字是正整数
201
     public static boolean isMatches(String content) {
201
     public static boolean isMatches(String content) {
202
-    	String pattern = "^[1-9]+[0-9]*$";
202
+    	String pattern = "^[1-9]\\d*|0$";
203
     	return Pattern.matches(pattern, content);
203
     	return Pattern.matches(pattern, content);
204
     }
204
     }
205
 
205