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

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1122,14 +1122,45 @@ public class Bills implements Serializable {
 	/**
 	 * 实际开船日期
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "实际开船日期 yyyy-MM-dd hh:nn")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date actualEtd;
 	/**
 	 * 实际到港日期
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "实际到港日期 yyyy-MM-dd hh:nn")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date actualEta;
 	/**
+	 * 返空日期
+	 */
+	@ApiModelProperty(value = "返空日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Date returnEmptyDate;
+
+	/**
+	 * 通关日期
+	 */
+	@ApiModelProperty(value = "通关日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Date clearanceDate;
+	/**
+	 * 换单日期
+	 */
+	@ApiModelProperty(value = "换单日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Date changeOrderDate;
+	/**
 	 * IEIEC
 	 */
 	@TableField(exist = false)

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

@@ -206,16 +206,34 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getAccountStatus()), Bills::getAccountStatus, bills.getAccountStatus())
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus());
 		if (ObjectUtils.isNotNull(bills.getBillStatus())){
-			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()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-			}else if (6 == bills.getBillStatus()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+			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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
+				}else if (6 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}
+			}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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}else if (8 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
+				}else if (9 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
+				}else if (10 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
+				}
 			}
 		}
 		if ("SE".equals(bills.getBusinessType())) {
@@ -351,16 +369,34 @@ 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 ("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()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-			}else if (6 == bills.getBillStatus()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+			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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
+				}else if (6 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}
+			}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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}else if (8 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
+				}else if (9 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
+				}else if (10 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
+				}
 			}
 		}
 		if ("SE".equals(bills.getBusinessType())) {
@@ -732,16 +768,34 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus())
 			.orderByDesc(Bills::getCreateTime);
 		if (ObjectUtils.isNotNull(bills.getBillStatus())){
-			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()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
-			}else if (6 == bills.getBillStatus()){
-				lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+			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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEtd);
+				}else if (6 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}
+			}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()){
+					lambdaQueryWrapper.isNotNull(Bills::getActualEta);
+				}else if (8 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getReturnEmptyDate);
+				}else if (9 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getChangeOrderDate);
+				}else if (10 == bills.getBillStatus()){
+					lambdaQueryWrapper.isNotNull(Bills::getClearanceDate);
+				}
 			}
 		}
 		List<Bills> list = billsService.list(lambdaQueryWrapper);

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

@@ -328,7 +328,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					.select(Bills::getId, Bills::getVesselId, Bills::getVoyageNo, Bills::getEtd, Bills::getEta)
 					.eq(Bills::getId, bills.getId()));
 				boolean status = false;
-				if ("SE".equals(bills.getBillType())) {
+				if ("SE".equals(bills.getBusinessType())) {
 					if (!details.getEtd().equals(bills.getEtd())) {
 						status = true;
 					}