|
|
@@ -1408,7 +1408,16 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
private void pushData(MainExpenseAccount res) {
|
|
|
List<SonExpenseAccount> sonList = res.getSonList();
|
|
|
- for (SonExpenseAccount e : sonList) {
|
|
|
+ List<String> orderList = new ArrayList<>();
|
|
|
+ List<SonExpenseAccount> orderSonList = new ArrayList<>();
|
|
|
+ sonList.stream().forEach(e -> {
|
|
|
+ if (!orderList.contains(e.getOrderNo())){
|
|
|
+ orderList.add(e.getOrderNo());
|
|
|
+ orderSonList.add(e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ orderList.clear();
|
|
|
+ for (SonExpenseAccount e : orderSonList) {
|
|
|
if (StringUtils.isNotEmpty(e.getUserNames())){
|
|
|
String userNames = e.getUserNames();
|
|
|
String districtName = e.getDistrictName();
|
|
|
@@ -1465,10 +1474,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
String str = getString(e, out, count, yxyCount, zxsCount,qtCount,useOyd);
|
|
|
- e.setCountStr(str);
|
|
|
+ orderList.add(str);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1480,6 +1487,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal count, BigDecimal yxyCount,
|
|
|
BigDecimal zxsCount, BigDecimal qtCount,OrderYearMaxDuration useOyd) {
|
|
|
TOrderPublicReleaseCountBo bo = new TOrderPublicReleaseCountBo();
|
|
|
+ if (out==null||useOyd==null)return String.format("订单%s统计信息不存在,请要营销员先将订单派单。",e.getOrderNo());
|
|
|
bo.setMaxDuration(useOyd.getMaxDuration());
|
|
|
bo.setExceedDuration(useOyd.getMaxDuration().subtract(BigDecimal.valueOf(out.getActualDuration())).abs());
|
|
|
bo.setActualDuration(out.getActualDuration());
|