1.到港提醒数据查询条件修改

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

@@ -2173,7 +2173,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		lambdaQueryWrapper.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getBranchId, AuthUtil.getDeptId())
-			.apply("DATE_FORMAT(eta,'%Y-%m-%d') > '" + sdf.format(date1) + "' and DATE_FORMAT(eta,'%Y-%m-%d') <= '" + sdf.format(date) + "'");
+			.apply("DATE_FORMAT(eta,'%Y-%m-%d') > '" + sdf.format(date) + "' and DATE_FORMAT(eta,'%Y-%m-%d') <= '" + sdf.format(date1) + "'");
 		map.put("arrivalReminder", billsMapper.selectCount(lambdaQueryWrapper));
 		return R.data(map);
 	}
@@ -2199,7 +2199,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
 				.like(Bills::getCorpEnName, bills.getCorpCnName()))
 			.like(ObjectUtils.isNotNull(bills.getBillNo()), Bills::getBillNo, bills.getBillNo())
-			.apply("DATE_FORMAT(eta,'%Y-%m-%d') > '" + sdf.format(date1) + "' and DATE_FORMAT(eta,'%Y-%m-%d') <= '" + sdf.format(date) + "'");
+			.apply("DATE_FORMAT(eta,'%Y-%m-%d') > '" + sdf.format(date) + "' and DATE_FORMAT(eta,'%Y-%m-%d') <= '" + sdf.format(date1) + "'");
 		IPage<Bills> billsIPage = billsMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(billsIPage);
 	}