From 3779da90aeb2392b85bf721900bfb6f07bee1021 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 12 七月 2024 17:22:12 +0800
Subject: [PATCH] zjh 2024/07/12-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 12 +++++++++---
1 files changed, 9 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 6f9f6e7..f5b106c 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
@@ -218,7 +218,7 @@
int grouping = dwGroupingService.selectTjDwGroupingByDwDeptId(dwDeptId);
if(grouping==0){
- return AjaxResult.error("璇锋鏌ラ儴闂ㄥ垎缁勬垨鍒嗙粍涓槸鍚﹀瓨鍦ㄩ」鐩�!");
+ return AjaxResult.error("璇锋鏌ラ儴闂ㄤ腑鏄惁瀛樺湪鍒嗙粍鎴栧垎缁勪腑鏄惁瀛樺湪椤圭洰!");
}
List<String> wrongList = new ArrayList<>();
@@ -251,9 +251,15 @@
String idCard = tjReservation.getIdCard();
String phoe = tjReservation.getPhoe();
if (null != idCard && null != phoe) {
- if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+// if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+ if (idCard.isEmpty() || phoe.isEmpty()) {
wrongList.add(tjReservation.getName());
} else {
+ //骞撮緞
+ tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
+ //鍑虹敓鏃ユ湡
+ tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));
+
if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {
tjReservation.setGroupingId(groupingMan.getId());
@@ -539,7 +545,7 @@
reservation.setProIds(Joiner.on(",").join(proIds));
reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
reservation.setCompanyId(dwGrouping.getDwId());
- reservation.setCompany(dwGrouping.getDwName());
+ reservation.setCompany(dwGrouping.getDwDeptName());
reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
reservation.setPacId(dwDept.getId());
// if(dwGrouping.getPayType().equals("1")){
--
Gitblit v1.8.0