|
@@ -1914,8 +1914,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
childRepairMap = MapUtil.convertIntegerMap(sellOrderDao.queryChildRepair(otherOrderIds));
|
|
|
}
|
|
|
//阳光、善学、坚韧、做更好的自己
|
|
|
- List<Integer> organIds = studentPaymentOrderExportDtos.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
|
|
|
- Map<Integer, String> userOrganNameMap = this.getMap("organization","id_","name_",organIds,1,Integer.class,String.class);
|
|
|
+// List<Integer> organIds = studentPaymentOrderExportDtos.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
|
|
|
+ Map<Integer, String> userOrganNameMap = this.getMap("organization","id_","name_",true,1,Integer.class,String.class);
|
|
|
//按分部分组
|
|
|
Map<Integer, List<StudentPaymentOrderExportDto>> listMap = studentPaymentOrderExportDtos.stream().collect(Collectors.groupingBy(e -> e.getOrganId()));
|
|
|
List<OperatingTotalIncomeDto> incomeDtos = new ArrayList<>();
|