From e191ab24286eb091db9966c9227c68d1af717b46 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 20 三月 2025 11:29:35 +0800
Subject: [PATCH] zjh20250320
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 5f0aee5..6e960a7 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
@@ -282,7 +282,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()))) {
@@ -407,6 +411,7 @@
int woManCount = 0;//濂崇粍浜烘暟
List<String> ids=new ArrayList<>();
+ String errMsg="";
for (TjReservation tjReservation : tjReservations) {
String idCard = tjReservation.getIdCard();
String phoe = tjReservation.getPhoe();
@@ -427,6 +432,7 @@
if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
(sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
wrongList.add(tjReservation.getName());
+ errMsg="韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�";
log.info(tjReservation.getName()+idCard+MatchUtils.isIdCard(idCard)+MatchUtils.isMobileNO(phoe));
}else {
@@ -436,9 +442,13 @@
//骞撮緞
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()));
+ TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()));
if (null != dwDept) {
for (TjDwGrouping groupingMan : groupingMans) {
if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
@@ -495,6 +505,7 @@
rightList.add(tjReservation);
} else {
wrongList.add(tjReservation.getName());
+ errMsg="鎵�閫夐」鐩悕 涓嶆纭�";
}
}
// }
@@ -570,6 +581,7 @@
} else {
wrongList.add(tjReservation.getName());
+ errMsg="韬唤璇佸彿/鎵嬫満鍙�/椤圭洰鍚嶄负绌�";
}
}
if (!yyList.isEmpty()) {
@@ -581,7 +593,7 @@
if (!wrongList.isEmpty()) {
map.put("list", wrongList);
map.put("hjMoney", hjMoney);
- return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map);
+ return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!"+errMsg, map);
} else {
map.put("list", rightList);
map.put("count", count);
--
Gitblit v1.8.0