Browse Source

jms:请核接口判断是否默认审核路径

纪新园 9 months ago
parent
commit
3730aa3b34

+ 6 - 2
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1881,7 +1881,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.append(item.getQuantity()).append(item.getPackingUnit()).append("/")
 						.append(item.getGrossWeight()).append(item.getPackingUnit()).append("/")
 						.append(item.getMeasurement()).append("CBM");
-					cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo());
+					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())){
+						cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("  ");
+					}
 				}
 				bills.setCntryString(text.toString());
 				bills.setCntrSealNo(cntrSealNo.toString());
@@ -1994,7 +1996,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.append(item.getQuantity()).append(item.getPackingUnit()).append("/")
 						.append(item.getGrossWeight()).append(item.getPackingUnit()).append("/")
 						.append(item.getMeasurement()).append("CBM");
-					cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo());
+					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())){
+						cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("  ");
+					}
 				}
 				bills.setCntryString(text.toString());
 				bills.setCntrSealNo(cntrSealNo.toString());

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -909,7 +909,7 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			auditProecessDTO.setPageLabel(bills.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
 			List<LosAuditPathsLevels> pathsLevelsList = bills.getAuditPathsLevels();
-			if (!pathsLevelsList.isEmpty()) {
+			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
 				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
 				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
 				for (LosAuditPathsLevels item : auditPathsLevels) {

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -280,7 +280,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			auditProecessDTO.setPageLabel(amends.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
 			List<LosAuditPathsLevels> pathsLevelsList = amends.getAuditPathsLevels();
-			if (!pathsLevelsList.isEmpty()) {
+			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
 				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
 				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
 				for (LosAuditPathsLevels item : auditPathsLevels) {

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/business/customsDeclaration/service/impl/CustomsDeclarationServiceImpl.java

@@ -412,7 +412,7 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 			auditProecessDTO.setPageLabel(customsDeclaration.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
 			List<LosAuditPathsLevels> pathsLevelsList = customsDeclaration.getAuditPathsLevels();
-			if (!pathsLevelsList.isEmpty()) {
+			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
 				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
 				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
 				for (LosAuditPathsLevels item : auditPathsLevels) {

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1458,7 +1458,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			auditProecessDTO.setPageLabel(bills.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
 			List<LosAuditPathsLevels> pathsLevelsList = bills.getAuditPathsLevels();
-			if (!pathsLevelsList.isEmpty()) {
+			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
 				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
 				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
 				for (LosAuditPathsLevels item : auditPathsLevels) {