1.华翰财务统计bug修改

2.福达列表检索条件修改

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -90,8 +90,8 @@ public class AmendsController extends BladeController {
 			.and(ObjectUtils.isNotNull(amends.getVesselCnName()), i -> i.like(Amends::getVesselCnName, amends.getVesselCnName()).or()
 				.like(Amends::getVesselEnName, amends.getVesselCnName()))
 			.like(ObjectUtils.isNotNull(amends.getVoyageNo()), Amends::getVoyageNo, amends.getVoyageNo())
-			.ge(ObjectUtils.isNotNull(amends.getBillDateStart()), Amends::getStatus, amends.getBillDateStart())
-			.le(ObjectUtils.isNotNull(amends.getBillDateEnd()), Amends::getStatus, amends.getBillDateEnd())
+			.ge(ObjectUtils.isNotNull(amends.getBillDateStart()), Amends::getEtd, amends.getBillDateStart())
+			.le(ObjectUtils.isNotNull(amends.getBillDateEnd()), Amends::getEtd, amends.getBillDateEnd())
 			.ge(ObjectUtils.isNotNull(amends.getEtdStart()), Amends::getEtd, amends.getEtdStart())
 			.le(ObjectUtils.isNotNull(amends.getEtdEnd()), Amends::getEtd, amends.getEtdEnd())
 			.ge(ObjectUtils.isNotNull(amends.getEtaStart()), Amends::getEta, amends.getEtaStart())

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -142,8 +142,8 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			if (ObjectUtils.isNotNull(financeProfit.getExamine())) {
 				lambdaQueryWrapper.eq(Amends::getStatus, 3);
 			}
-			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getCreateTime, financeProfit.getStatisticsDateStart());
-			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getCreateTime, financeProfit.getStatisticsDateEnd());
+			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getEtd, financeProfit.getStatisticsDateStart());
+			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getEtd, financeProfit.getStatisticsDateEnd());
 			List<Amends> amendsList = amendsMapper.selectList(lambdaQueryWrapper);
 			List<FeeCenter> feeCenterList = new ArrayList<>();
 			if (!amendsList.isEmpty()) {
@@ -1049,8 +1049,8 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			if (ObjectUtils.isNotNull(financeProfit.getExamine())) {
 				lambdaQueryWrapper.eq(Amends::getStatus, 3);
 			}
-			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getCreateTime, financeProfit.getStatisticsDateStart());
-			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getCreateTime, financeProfit.getStatisticsDateEnd());
+			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getEtd, financeProfit.getStatisticsDateStart());
+			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getEtd, financeProfit.getStatisticsDateEnd());
 			List<Amends> amendsList = amendsMapper.selectList(lambdaQueryWrapper);
 			List<FeeCenter> feeCenterList = new ArrayList<>();
 			if (!amendsList.isEmpty()) {
@@ -1231,8 +1231,8 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			if (ObjectUtils.isNotNull(financeProfit.getExamine())) {
 				lambdaQueryWrapper.eq(Amends::getStatus, 3);
 			}
-			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getCreateTime, financeProfit.getStatisticsDateStart());
-			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getCreateTime, financeProfit.getStatisticsDateEnd());
+			lambdaQueryWrapper.gt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateStart()), Amends::getEtd, financeProfit.getStatisticsDateStart());
+			lambdaQueryWrapper.lt(ObjectUtils.isNotNull(financeProfit.getStatisticsDateEnd()), Amends::getEtd, financeProfit.getStatisticsDateEnd());
 			List<Amends> amendsList = amendsMapper.selectList(lambdaQueryWrapper);
 			List<FeeCenter> feeCenterList = new ArrayList<>();
 			if (!amendsList.isEmpty()) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -165,9 +165,8 @@ public class ExportOrderController extends BladeController {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "已取消");
 		} else if ("4".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "录入");
-		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderStatus()),Order::getOrderStatus, order.getOrderStatus());
 		}
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderStatus()),Order::getOrderStatus, order.getOrderStatus());
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {