Commit 8a04736a authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第四次提交

parent 37b2faef
...@@ -616,7 +616,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -616,7 +616,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
} }
// 2. 校验资料类型是否有效 // 2. 校验资料类型是否有效
if (!isValidMaterialType(request.getMaterialType())) { if (isValidMaterialType(request.getMaterialType())) {
return R.failed("资料类型不正确,必须为:存量、新签、续签、离职"); return R.failed("资料类型不正确,必须为:存量、新签、续签、离职");
} }
...@@ -705,10 +705,10 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -705,10 +705,10 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
* 判断是否是有效的资料类型 * 判断是否是有效的资料类型
*/ */
private boolean isValidMaterialType(String typeName) { private boolean isValidMaterialType(String typeName) {
return ArchiveConstants.MATERIAL_TYPE_STOCK.equals(typeName) || return !ArchiveConstants.MATERIAL_TYPE_STOCK.equals(typeName) &&
ArchiveConstants.MATERIAL_TYPE_NEW.equals(typeName) || !ArchiveConstants.MATERIAL_TYPE_NEW.equals(typeName) &&
ArchiveConstants.MATERIAL_TYPE_RENEW.equals(typeName) || !ArchiveConstants.MATERIAL_TYPE_RENEW.equals(typeName) &&
ArchiveConstants.MATERIAL_TYPE_LEAVE.equals(typeName); !ArchiveConstants.MATERIAL_TYPE_LEAVE.equals(typeName);
} }
/** /**
...@@ -879,7 +879,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -879,7 +879,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
for (String materialType : request.getMaterialTypes()) { for (String materialType : request.getMaterialTypes()) {
// 校验资料类型是否有效 // 校验资料类型是否有效
if (!isValidMaterialType(materialType)) { if (isValidMaterialType(materialType)) {
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment