zjh20250711

zjh

4 天以前 cc25bc0eec2d50da39d62f9896ed4d5e66805366

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java

@@ -764,7 +764,7 @@

        //团体人数
        int tramNum = 0;
        if (null != rightList && rightList.size() > 0) {
        if (null != rightList && !rightList.isEmpty()) {
            String teamNo = PinyinUtil.getFirstLetter(dwDept.getDwName(), "") + DateUtil.format(new Date(), "yyMMddHHmmss");
            for (TjReservation reservation : rightList) {
                TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());
@@ -867,7 +867,6 @@
        Date date = new Date();

        //异步数据
//        asyncService.addNewReservationConfirm(rightList);
        asyncService.saveNewReservationConfirm(rightList);

        //体检单位部门
@@ -896,7 +895,6 @@

                TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());

//                TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());

                LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
                wq.eq(TjReservation::getIdCard, reservation.getIdCard());
@@ -927,7 +925,6 @@

                reservation.setPacId(dwGrouping.getId());
                compPay = compPay.add(dwGrouping.getYsPrice());
//                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
@@ -935,7 +932,7 @@
                        DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
            }

            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
/*            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjCompPay::getCompId, dto.getDwId());
            wq0.eq(TjCompPay::getTeamNo, teamNo);
            TjCompPay one = compPayService.getOne(wq0);
@@ -955,16 +952,15 @@
                tjCompPay.setPaidIn(new BigDecimal("0.00"));
                tjCompPay.setDifference(tjCompPay.getCopeWith().subtract(BigDecimal.valueOf(0.00)));
                compPayService.save(tjCompPay);
            }
            }*/

//            .filter(a-> null != a.getPacId())

            Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));
   /*         Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));

            if (!collect.isEmpty()) {
                for (Map.Entry<String, List<TjReservation>> entry : collect.entrySet()) {
                    LambdaQueryWrapper<TjTeamSelectRecord> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjTeamSelectRecord::getTeamNo, teamNo);
                    wq.eq(TjTeamSelectRecord::getPacId, entry.getKey());
                    wq.eq(TjTeamSelectRecord::getCompId, dto.getDwId());
                    TjTeamSelectRecord recordServiceOne = selectRecordService.getOne(wq);
                    if (null != recordServiceOne) {
@@ -986,7 +982,7 @@
                        selectRecordService.save(selectRecord);
                    }
                }
            }
            }*/
            return AjaxResult.success("预约成功");
        }
        return AjaxResult.error("请选择预约对象");