WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug67150

Browse Source
This commit is contained in:
cuijiaming
2023-04-03 14:52:35 +08:00
parent 9c4de2acc9
commit b005a367d5
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+14 -14
View File
@@ -1108,13 +1108,13 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
//必填项校验 *类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,*交付物类型";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) ||
datas.get(k).getInspectionItem() == null ||
datas.get(k).getConfigItem() == null ||
datas.get(k).getWvtaId() == null ||
datas.get(k).getSerialNumber() == null ||
datas.get(k).getDutyTerritoryName() == null ||
datas.get(k).getDeliverableTypeName() == null ){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
((datas.get(k).getDeliverableTypeName() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeName())))){
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
@@ -1126,13 +1126,13 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
}
}else {
for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) ||
datas.get(k).getInspectionItem() == null ||
datas.get(k).getConfigItem() == null ||
datas.get(k).getWvtaId() == null ||
datas.get(k).getSerialNumber() == null ||
datas.get(k).getDutyTerritoryName() == null ||
datas.get(k).getDeliverableTypeNameEn() == null ){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
((datas.get(k).getDeliverableTypeNameEn() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeNameEn())))){
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+20 -20
View File
@@ -2997,16 +2997,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//必填项校验
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) ||
datas.get(k).getInspectionItem() == null ||
datas.get(k).getConfigItem() == null ||
datas.get(k).getWvtaId() == null ||
datas.get(k).getSerialNumber() == null ||
datas.get(k).getDutyTerritoryName() == null ||
datas.get(k).getSdtName() == null ||
datas.get(k).getDutyPersonName() == null ||
datas.get(k).getDeliverableTypeName() == null ||
datas.get(k).getEndTimeStr() == null ){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
((datas.get(k).getDeliverableTypeName() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeName()))) ||
((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -3018,16 +3018,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
}else {
for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) ||
datas.get(k).getInspectionItem() == null ||
datas.get(k).getConfigItem() == null ||
datas.get(k).getWvtaId() == null ||
datas.get(k).getSerialNumber() == null ||
datas.get(k).getDutyTerritoryName() == null ||
datas.get(k).getSdtName() == null ||
datas.get(k).getDutyPersonName() == null ||
datas.get(k).getDeliverableTypeNameEn() == null ||
datas.get(k).getEndTimeStr() == null ){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
((datas.get(k).getDeliverableTypeNameEn() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeNameEn()))) ||
((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){