zjh20250102

zjh

2025-01-02 eac48696e8df9a0a6eace257adcea4ee203d6fe0

 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));
                    }
                }
@@ -742,11 +743,11 @@
        LambdaQueryWrapper<TjGroupingPro> wq = new LambdaQueryWrapper<>();
        wq.eq(TjGroupingPro::getGroupingId, groupingId);
        List<TjGroupingPro> proList = groupingProService.list(wq);
        if (null != proList && proList.size() > 0) {
        if (null != proList && !proList.isEmpty()) {
            for (TjGroupingPro groupingPro : proList) {
                TjProject project = projectService.getById(groupingPro.getProId());
                if (null != project) {
                    if (project.getProType() == null || project.getProType().equals("")) {
                    if (project.getProType() == null || project.getProType().isEmpty()) {
                        groupingPro.setProType("2");
                    } else {
                        groupingPro.setProType(project.getProType());
@@ -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());