|
|
@@ -220,7 +220,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
|
|
|
);
|
|
|
}
|
|
|
for (FinanceProfitDtoList item : financeProfitList) {
|
|
|
- if ("SEA,SIA,AEA,AIA".contains(item.getBusinessType()) && !financeProfitDataList.isEmpty()) {
|
|
|
+ if (("SEA".equals(item.getBusinessType()) || "SIA".equals(item.getBusinessType())
|
|
|
+ || "AEA".equals(item.getBusinessType()) || "AIA".equals(item.getBusinessType()))
|
|
|
+ && !financeProfitDataList.isEmpty()) {
|
|
|
FinanceProfit profit = financeProfitDataList.stream().filter(e -> e.getMblno().equals(item.getMblNo())).findFirst().orElse(null);
|
|
|
if (profit != null) {
|
|
|
item.setSalesman(profit.getSrcCnName());
|
|
|
@@ -943,7 +945,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
|
|
|
);
|
|
|
}
|
|
|
for (FinanceProfitDtoList item : financeProfitList) {
|
|
|
- if ("SEA,SIA,AEA,AIA".contains(item.getBusinessType()) && !financeProfitDataList.isEmpty()) {
|
|
|
+ if (("SEA".equals(item.getBusinessType()) || "SIA".equals(item.getBusinessType())
|
|
|
+ || "AEA".equals(item.getBusinessType()) || "AIA".equals(item.getBusinessType()))
|
|
|
+ && !financeProfitDataList.isEmpty()) {
|
|
|
FinanceProfit profit = financeProfitDataList.stream().filter(e -> e.getMblno().equals(item.getMblNo())).findFirst().orElse(null);
|
|
|
if (profit != null) {
|
|
|
item.setSalesman(profit.getSrcCnName());
|