20241225

zjh

2024-12-25 79f9fbd9f999e26af3f0bca534d825eb687e092c

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

@@ -697,7 +697,8 @@
                TjReservation reservation = tjReservationService.getById(id);
                if (null != reservation && reservation.getIsExpire() == 2) {
                    if (tjReservationService.removeById(id)) {
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
                                .isNull(TbTransition::getTjNum));
                        taskService.removeTask(new TjReservationTask(id));
                    }
                }
@@ -912,7 +913,7 @@
                    return AjaxResult.error("此身份证号: "+reservation.getIdCard()+" 重复,请核对后上传!");

                }

                reservation.setName(reservation.getName().replaceAll("　","").replaceAll(" ",""));
                ids.add(reservation.getIdCard());

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