From 18e5f7bfe225b284dfc62033ef7963ead120a19f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 18 三月 2025 17:43:11 +0800
Subject: [PATCH] 修改泾川手动检验检查

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index b658599..4362a26 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -281,7 +281,11 @@
                     //骞撮緞
                     tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
                     //鍑虹敓鏃ユ湡
-                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                    try {
+                        tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                    } catch (Exception e) {
+                        return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+                    }
 
                     if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {
 
@@ -434,7 +438,11 @@
                         //骞撮緞
                         tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
                         //鍑虹敓鏃ユ湡
-                        tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                        try {
+                            tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                        } catch (Exception e) {
+                            return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+                        }
 
                         TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
                         if (null != dwDept) {
@@ -958,7 +966,7 @@
                 }
 
 
-                reservation.setPacId(dwDept.getId());
+                reservation.setPacId(dwGrouping.getId());
                 compPay = compPay.add(dwGrouping.getYsPrice());
 //                reservation.setTjType(String.valueOf(1));
                 reservation.setTeamNo(teamNo);

--
Gitblit v1.8.0