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

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -205,33 +205,35 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getStlCrStatusDescr()), Bills::getStlCrStatusDescr, bills.getStlCrStatusDescr())
 			.eq(ObjectUtils.isNotNull(bills.getAccountStatus()), Bills::getAccountStatus, bills.getAccountStatus())
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus());
-		if (ObjectUtils.isNotNull(bills.getBillStatus())){
-			if ("SE".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+		if (ObjectUtils.isNotNull(bills.getBillStatus())) {
+			if ("SE".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNull(Bills::getMblno);
-				}else if (4 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-				}else if (5 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.and(i -> i.isNull(Bills::getMblno).or().eq(Bills::getMblno, ""));
+				} else if (4 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+				} else if (5 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-				}else if (6 == bills.getBillStatus()){
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
 				}
-			}else if ("SI".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+			} else if ("SI".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"3");
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"1");
-				}else if (6 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "3");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "1");
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
-				}else if (8 == bills.getBillStatus()){
+				} else if (8 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
-				}else if (9 == bills.getBillStatus()){
+				} else if (9 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
-				}else if (10 == bills.getBillStatus()){
+				} else if (10 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
 				}
 			}
@@ -368,33 +370,35 @@ public class BillsController extends BladeController {
 
 			.eq(ObjectUtils.isNotNull(bills.getMasterBillNo()), Bills::getMasterBillNo, bills.getMasterBillNo())
 			.eq(ObjectUtils.isNotNull(bills.getMasterId()), Bills::getMasterId, bills.getMasterId());
-		if (ObjectUtils.isNotNull(bills.getBillStatus())){
-			if ("SE".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+		if (ObjectUtils.isNotNull(bills.getBillStatus())) {
+			if ("SE".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNull(Bills::getMblno);
-				}else if (4 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-				}else if (5 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.and(i -> i.isNull(Bills::getMblno).or().eq(Bills::getMblno, ""));
+				} else if (4 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+				} else if (5 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-				}else if (6 == bills.getBillStatus()){
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
 				}
-			}else if ("SI".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+			} else if ("SI".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"3");
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"1");
-				}else if (6 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "3");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "1");
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
-				}else if (8 == bills.getBillStatus()){
+				} else if (8 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
-				}else if (9 == bills.getBillStatus()){
+				} else if (9 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
-				}else if (10 == bills.getBillStatus()){
+				} else if (10 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
 				}
 			}
@@ -767,33 +771,35 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus())
 			.orderByDesc(Bills::getCreateTime);
-		if (ObjectUtils.isNotNull(bills.getBillStatus())){
-			if ("SE".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+		if (ObjectUtils.isNotNull(bills.getBillStatus())) {
+			if ("SE".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNull(Bills::getMblno);
-				}else if (4 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-				}else if (5 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.and(i -> i.isNull(Bills::getMblno).or().eq(Bills::getMblno, ""));
+				} else if (4 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+				} else if (5 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-				}else if (6 == bills.getBillStatus()){
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
 				}
-			}else if ("SI".equals(bills.getBusinessType())){
-				if ("1,2,3".contains(bills.getBillStatus()+"")){
+			} else if ("SI".equals(bills.getBusinessType())) {
+				if ("1,2,3".contains(bills.getBillStatus() + "")) {
 					lambdaQueryWrapper.eq(Bills::getBillStatus, bills.getBillStatus());
-				}else if (0 == bills.getBillStatus()){
-					lambdaQueryWrapper.isNotNull(Bills::getMblno);
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"3");
-					lambdaQueryWrapper.ne(Bills::getBillStatus,"1");
-				}else if (6 == bills.getBillStatus()){
+				} else if (0 == bills.getBillStatus()) {
+					lambdaQueryWrapper.isNotNull(Bills::getMblno)
+						.ne(Bills::getMblno, "");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "3");
+					lambdaQueryWrapper.ne(Bills::getBillStatus, "1");
+				} else if (6 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
-				}else if (8 == bills.getBillStatus()){
+				} else if (8 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
-				}else if (9 == bills.getBillStatus()){
+				} else if (9 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
-				}else if (10 == bills.getBillStatus()){
+				} else if (10 == bills.getBillStatus()) {
 					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
 				}
 			}