|
|
@@ -268,8 +268,8 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- //前五个参数+第八个参数必填
|
|
|
- if (result[i][0].trim()==""||result[i][0].trim()==null || result[i][1].trim()==""||result[i][1].trim()==null || result[i][2].trim()==""||result[i][2].trim()==null || result[i][3].trim()==""||result[i][3].trim()==null|| result[i][4].trim()==""||result[i][4].trim()==null || result[i][7].trim()==""||result[i][7].trim()==null) {
|
|
|
+ //前五个参数(第四个银行卡号除外)+第八个参数必填
|
|
|
+ if (result[i][0].trim()==""||result[i][0].trim()==null || result[i][1].trim()==""||result[i][1].trim()==null || result[i][2].trim()==""||result[i][2].trim()==null || result[i][4].trim()==""||result[i][4].trim()==null || result[i][7].trim()==""||result[i][7].trim()==null) {
|
|
|
failureNum++;
|
|
|
if (StringUtils.isNotBlank(errorRequiredIndexs)) {
|
|
|
errorRequiredIndexs.append("," + (i+1));
|
|
|
@@ -355,26 +355,28 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
|
|
|
}
|
|
|
|
|
|
//判断是否招商银行格式错误
|
|
|
- if ("Y".equals(result[i][4].trim())) {
|
|
|
-
|
|
|
- } else if ("N".equals(result[i][4].trim())) {
|
|
|
- if (StringUtils.isBlank(result[i][5].trim()) || StringUtils.isBlank(result[i][6].trim())) {
|
|
|
+ if(StringUtils.isNotBlank(result[i][3].trim())){
|
|
|
+ if ("Y".equals(result[i][4].trim())) {
|
|
|
+
|
|
|
+ } else if ("N".equals(result[i][4].trim())) {
|
|
|
+ if (StringUtils.isBlank(result[i][5].trim()) || StringUtils.isBlank(result[i][6].trim())) {
|
|
|
+ failureNum++;
|
|
|
+ if (StringUtils.isNotBlank(errorEacbnkIndexs)) {
|
|
|
+ errorEacbnkIndexs.append("," + (i+1));
|
|
|
+ } else {
|
|
|
+ errorEacbnkIndexs.append(i+1);
|
|
|
+ }
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
failureNum++;
|
|
|
- if (StringUtils.isNotBlank(errorEacbnkIndexs)) {
|
|
|
- errorEacbnkIndexs.append("," + (i+1));
|
|
|
+ if (StringUtils.isNotBlank(errorBnkflgIndexs)) {
|
|
|
+ errorBnkflgIndexs.append("," + (i+1));
|
|
|
} else {
|
|
|
- errorEacbnkIndexs.append(i+1);
|
|
|
+ errorBnkflgIndexs.append(i+1);
|
|
|
}
|
|
|
continue;
|
|
|
}
|
|
|
- } else {
|
|
|
- failureNum++;
|
|
|
- if (StringUtils.isNotBlank(errorBnkflgIndexs)) {
|
|
|
- errorBnkflgIndexs.append("," + (i+1));
|
|
|
- } else {
|
|
|
- errorBnkflgIndexs.append(i+1);
|
|
|
- }
|
|
|
- continue;
|
|
|
}
|
|
|
|
|
|
}
|