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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-04-03 15:02:02 +08:00
parent 3e742bbab4 87954dc933
commit 8991419ec2
4 changed files with 37 additions and 36 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,*编号,*责任领域,*交付物类型"; //必填项校验 *类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,*交付物类型";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
datas.get(k).getInspectionItem() == null || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
datas.get(k).getConfigItem() == null || ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
datas.get(k).getWvtaId() == null || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
datas.get(k).getSerialNumber() == null || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
datas.get(k).getDutyTerritoryName() == null || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
datas.get(k).getDeliverableTypeName() == null ){ ((datas.get(k).getDeliverableTypeName() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeName())))){
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
@@ -1126,13 +1126,13 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
} }
}else { }else {
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
datas.get(k).getInspectionItem() == null || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
datas.get(k).getConfigItem() == null || ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
datas.get(k).getWvtaId() == null || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
datas.get(k).getSerialNumber() == null || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
datas.get(k).getDutyTerritoryName() == null || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
datas.get(k).getDeliverableTypeNameEn() == null ){ ((datas.get(k).getDeliverableTypeNameEn() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeNameEn())))){
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ 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())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
datas.get(k).getInspectionItem() == null || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
datas.get(k).getConfigItem() == null || ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
datas.get(k).getWvtaId() == null || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
datas.get(k).getSerialNumber() == null || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
datas.get(k).getDutyTerritoryName() == null || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
datas.get(k).getSdtName() == null || ((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
datas.get(k).getDutyPersonName() == null || ((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
datas.get(k).getDeliverableTypeName() == null || ((datas.get(k).getDeliverableTypeName() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeName()))) ||
datas.get(k).getEndTimeStr() == null ){ ((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -3018,16 +3018,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
}else { }else {
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if((datas.get(k).getCategory() == null) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
datas.get(k).getInspectionItem() == null || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
datas.get(k).getConfigItem() == null || ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
datas.get(k).getWvtaId() == null || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
datas.get(k).getSerialNumber() == null || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
datas.get(k).getDutyTerritoryName() == null || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
datas.get(k).getSdtName() == null || ((datas.get(k).getSdtName() == null)||(StringUtils.equals("",datas.get(k).getSdtName()))) ||
datas.get(k).getDutyPersonName() == null || ((datas.get(k).getDutyPersonName() == null)||(StringUtils.equals("",datas.get(k).getDutyPersonName()))) ||
datas.get(k).getDeliverableTypeNameEn() == null || ((datas.get(k).getDeliverableTypeNameEn() == null)||(StringUtils.equals("",datas.get(k).getDeliverableTypeNameEn()))) ||
datas.get(k).getEndTimeStr() == null ){ ((datas.get(k).getEndTimeStr() == null)||(StringUtils.equals("",datas.get(k).getEndTimeStr())))){
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
jero-web/src/common/lang/en-us.js
+2 -1
View File
@@ -630,6 +630,7 @@ module.exports = {
entryName: 'Project Name', entryName: 'Project Name',
targetMarket: 'Target Market', targetMarket: 'Target Market',
projectStatus: 'Project Status', projectStatus: 'Project Status',
projectStatus: 'Project Status',
StudioEngineer: 'R&H Studio', StudioEngineer: 'R&H Studio',
CertificationTime: 'Certification Time', CertificationTime: 'Certification Time',
NTplatform: 'NT Platform', NTplatform: 'NT Platform',
@@ -1739,10 +1740,10 @@ module.exports = {
verifyConformanceConfirmation:'Verify conformance confirmation', verifyConformanceConfirmation:'Verify conformance confirmation',
designConformanceVerification:'Design conformance verification', designConformanceVerification:'Design conformance verification',
nomorethan:'No more than 10', nomorethan:'No more than 10',
uploadedfilelarger:'The uploaded file is larger than 50 MB',
marketCertificationList:'Market Certification List', marketCertificationList:'Market Certification List',
uploadedfilelarger:'The uploaded file is larger than', uploadedfilelarger:'The uploaded file is larger than',
marketCertificationListDetails:'Market Certification List Details', marketCertificationListDetails:'Market Certification List Details',
andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list',
pleasefillintherange:'Please fill in the range', pleasefillintherange:'Please fill in the range',
databasereportingtime:'Synchronize the database reporting time',
} }
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -1843,9 +1843,9 @@ module.exports = {
designConformanceVerification:'设计符合性确认', designConformanceVerification:'设计符合性确认',
nomorethan:'不能超过10个', nomorethan:'不能超过10个',
uploadedfilelarger:'文件大于', uploadedfilelarger:'文件大于',
uploadedfilelarger:'文件大于50M',
marketCertificationList:'市场认证清单', marketCertificationList:'市场认证清单',
marketCertificationListDetails:'市场认证清单详情', marketCertificationListDetails:'市场认证清单详情',
andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据',
pleasefillintherange:'请填写范围', pleasefillintherange:'请填写范围',
databasereportingtime:'同步上报库时间',
} }