财务导出

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2289,20 +2289,26 @@ public class ExportServiceImpl implements ExportService {
             //获取合作单位第一个乐团
             firstMusicMap = MapUtil.convertMybatisMap(cooperationOrganDao.findFirstMusic());
         }
-        List<Integer> studentIds = studentPaymentOrderExportDtos.stream().map(e -> e.getUserId()).distinct().collect(Collectors.toList());
-        //获取学员第一个课程组编号
-        Map<Integer, String> userFirstVipMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.findUserFirstVipMap("VIP",studentIds));
-        //获取学员最近加入的一个乐团编号
-        Map<Integer, String> userLastMusicIdMap = MapUtil.convertMybatisMap(studentRegistrationDao.getLastMusicGroupId(studentIds));
-        Map<Integer, String> userLastMusicNameMap = MapUtil.convertMybatisMap(studentRegistrationDao.getLastMusicGroupName(studentIds));
+        Map<Integer, String> userFirstVipMap = new HashMap<>();
+        Map<Integer, String> userLastMusicIdMap = new HashMap<>();
+        Map<Integer, String> userLastMusicNameMap = new HashMap<>();
+        Map<Integer, String> studentNameMap = new HashMap<>();
+        if(studentPaymentOrderExportDtos.stream().anyMatch(e->e.getUserId() != null)){
+            List<Integer> studentIds = studentPaymentOrderExportDtos.stream().filter(e->e.getUserId() != null).map(e -> e.getUserId()).distinct().collect(Collectors.toList());
+            //获取学员第一个课程组编号
+            userFirstVipMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.findUserFirstVipMap("VIP",studentIds));
+            //获取学员最近加入的一个乐团编号
+            userLastMusicIdMap = MapUtil.convertMybatisMap(studentRegistrationDao.getLastMusicGroupId(studentIds));
+            userLastMusicNameMap = MapUtil.convertMybatisMap(studentRegistrationDao.getLastMusicGroupName(studentIds));
+            //获取学员名称
+            studentNameMap = studentService.getMap("sys_user", "id_", "username_", studentIds, tenantId, Integer.class, String.class);
+        }
+
         Set<String> musicGroupIds = studentPaymentOrderExportDtos.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet());
         Map<String, String> musicGroupNameMap = new HashMap<>();
         if(musicGroupIds != null && musicGroupIds.size() > 0){
             musicGroupNameMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
         }
-        //获取学员名称
-        Map<Integer, String> studentNameMap = studentService.getMap("sys_user", "id_", "username_", studentIds, tenantId, Integer.class, String.class);
-
         //用于计算手续费
         Map<String, FeeFlagNumDto> feeFlagMap = new HashMap<>();
         if(studentPaymentOrderExportDtos.stream().anyMatch(e->Objects.equals(e.getPaymentChannel(),"ADAPAY"))){

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -297,10 +297,12 @@ calender_id_,create_time_,create_by_,update_time_,update_by_,tenant_id_,type_
         spro.mer_no_ routeMerNo,
         spro.fee_flag_ feeFlag,
         sci.charge_type_,
-        spo.expect_amount_ + spo.coupon_remit_fee_ orderAmount
+        spo.expect_amount_ + spo.coupon_remit_fee_ orderAmount,
+        o.name_ organ_name
         FROM student_payment_route_order spro
         LEFT JOIN student_payment_order spo ON spo.order_no_ = spro.order_no_
         LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_ = sci.id_
+        LEFT JOIN organization o on spro.route_organ_id_ = o.id_
         <include refid="queryPaymentOrder"/>
         GROUP BY spro.order_no_,spro.mer_no_
         ORDER BY spro.id_