锁账 海运出口 etd 改为 actual_etd

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

@@ -3738,6 +3738,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		}
 		fileList.add(filePath);
 		mailDto.setMailFilePath(fileList);
+
+		System.out.println("ReportsServiceImpl.generateMailFileAndSend"+mailDto);
+
 		SendMailUtil.sendHtmlFileMail(mailDto);
 		//保存发送地址
 		List<EmailAddress> addressList = new ArrayList<>();

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinPeriodServiceImpl.java

@@ -220,7 +220,7 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getBranchId, detail.getBranchId())
 			.apply("not find_in_set(bill_status,'1,3')")
-			.apply("((business_type = 'SE' and etd >='" + beginDate + "' and etd <= '" + endDate + "' ) " +
+			.apply("((business_type = 'SE' and actual_etd >='" + beginDate + "' and actual_etd <= '" + endDate + "' ) " +
 				"or (business_type = 'SI' and actual_eta >='" + beginDate + "' and actual_eta <= '" + endDate + "'))"));
 		if (!billsList.isEmpty()) {
 			for (Bills item : billsList) {