From b005a367d5ec6f5539939548339105287b2787e7 Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Mon, 3 Apr 2023 14:52:35 +0800
Subject: [PATCH 1/2] bug67150

---
 .../AuthDummyInventoryInfoEOServiceImpl.java  | 28 ++++++-------
 ...ctCertificationInventoryEOServiceImpl.java | 40 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 1fb69f13c..3563262d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -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())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 642624eb8..34339f806 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -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())){

From cba89818564e273768542ee01896b09cc4c7e5cb Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 3 Apr 2023 14:53:17 +0800
Subject: [PATCH 2/2] bug 67631

---
 jero-web/src/common/lang/en-us.js | 3 ++-
 jero-web/src/common/lang/zh-cn.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1b0823753..d7facbfbc 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -630,6 +630,7 @@ module.exports = {
   entryName: 'Project Name',
   targetMarket: 'Target Market',
   projectStatus: 'Project Status',
+  projectStatus: 'Project Status',
   StudioEngineer: 'R&H Studio',
   CertificationTime: 'Certification Time',
   NTplatform: 'NT Platform',
@@ -1739,10 +1740,10 @@ module.exports = {
   verifyConformanceConfirmation:'Verify conformance confirmation',
   designConformanceVerification:'Design conformance verification',
   nomorethan:'No more than 10',
-  uploadedfilelarger:'The uploaded file is larger than 50 MB',
   marketCertificationList:'Market Certification List',
   uploadedfilelarger:'The uploaded file is larger than',
   marketCertificationListDetails:'Market Certification List Details',
   andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list',
   pleasefillintherange:'Please fill in the range',
+  databasereportingtime:'Synchronize the database reporting time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 19e18f226..f25e6f914 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1843,9 +1843,9 @@ module.exports = {
   designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
   uploadedfilelarger:'文件大于',
-  uploadedfilelarger:'文件大于50M',
   marketCertificationList:'市场认证清单',
   marketCertificationListDetails:'市场认证清单详情',
   andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据',
   pleasefillintherange:'请填写范围',
+  databasereportingtime:'同步上报库时间',
 }
\ No newline at end of file