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

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

@@ -4335,6 +4335,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										feeCenterReports.setPid(item.getId());
 										feeCenterReports.setFeeCnName(fee.getFeeCnName());
 										feeCenterReports.setDc(fee.getDc());
+										feeCenterReports.setCurCode(fee.getCurCode());
 										List<FeeCenter> feeCenterListD;
 										List<FeeCenter> feeCenterListUsdD;
 										List<FeeCenter> feeCenterListC;
@@ -4495,6 +4496,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								feeCenterReports.setPid(bills.getId());
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setReportType(fee.getReportType());
+								feeCenterReports.setCurCode(fee.getCurCode());
 								List<FeeCenter> feeCenterListD;
 								List<FeeCenter> feeCenterListUsdD;
 								List<FeeCenter> feeCenterListC;
@@ -4658,6 +4660,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									feeCenterReports.setFeeCnName(fee.getFeeCnName());
 									feeCenterReports.setDc(fee.getDc());
 									feeCenterReports.setReportType(fee.getReportType());
+									feeCenterReports.setCurCode(fee.getCurCode());
 									List<FeeCenter> feeCenterListD;
 									List<FeeCenter> feeCenterListUsdD;
 									List<FeeCenter> feeCenterListC;
@@ -4816,6 +4819,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								feeCenterReports.setFeeCnName(fee.getFeeCnName());
 								feeCenterReports.setDc(fee.getDc());
 								feeCenterReports.setReportType(fee.getReportType());
+								feeCenterReports.setCurCode(fee.getCurCode());
 								List<FeeCenter> feeCenterListD;
 								List<FeeCenter> feeCenterListUsdD;
 								List<FeeCenter> feeCenterListC;
@@ -5040,11 +5044,11 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							List<FeeCenterReports> feeCenterReportsArrayListC = feeCenterReportsList1.stream()
 								.filter(e -> "C".equals(e.getDc()))
 								.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-									Comparator.comparing(f -> f.getFeeCnName() + f.getCorpCnName()))), ArrayList::new));
+									Comparator.comparing(f -> f.getFeeCnName() + f.getCorpCnName() + f.getCurCode()))), ArrayList::new));
 							List<FeeCenterReports> feeCenterReportsArrayListD = feeCenterReportsList1.stream()
 								.filter(e -> "D".equals(e.getDc()))
 								.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-									Comparator.comparing(f -> f.getFeeCnName() + f.getBillCorpCnName()))), ArrayList::new));
+									Comparator.comparing(f -> f.getFeeCnName() + f.getBillCorpCnName() + f.getCurCode()))), ArrayList::new));
 							for (FeeCenterReports fee : feeCenterReportsArrayListD) {
 								FeeCenterReports feeCenterReports1 = new FeeCenterReports();
 								feeCenterReports1.setFeeCnName(fee.getFeeCnName());