From 983d95bdcbb273b4a78efd0058a2a35141be1b51 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 08 四月 2025 18:00:12 +0800
Subject: [PATCH] zjh20250408
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 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 5e296a4..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
@@ -96,6 +96,12 @@
private ISysDictDataService dictDataService;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private IDictCompService dictCompService;
+ @Autowired
+ private ITjDwDeptService tjDwDeptService;
+ @Autowired
+ private ITjDwGroupingService tjDwGroupingService;
@Value("${path.filePath}")
private String value;
@@ -276,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()))) {
@@ -401,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();
@@ -421,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 {
@@ -430,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())) {
@@ -489,6 +505,7 @@
rightList.add(tjReservation);
} else {
wrongList.add(tjReservation.getName());
+ errMsg="鎵�閫夐」鐩悕 涓嶆纭�";
}
}
// }
@@ -564,6 +581,7 @@
} else {
wrongList.add(tjReservation.getName());
+ errMsg="韬唤璇佸彿/鎵嬫満鍙�/椤圭洰鍚嶄负绌�";
}
}
if (!yyList.isEmpty()) {
@@ -575,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);
@@ -1028,4 +1046,40 @@
return AjaxResult.error("璇烽�夋嫨棰勭害瀵硅薄");
}
+ @GetMapping("/linkage")
+ public String linkage(@RequestParam("pid") String pid, @RequestParam("type") String type) {
+ switch (type){
+ case "1":
+ List<DictComp> list = dictCompService.list();
+ List<HashMap<String, Object>> collect = list.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getDrugManufacturerId());
+ hashMap.put("text", i.getCnName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect);
+ case "2":
+ List<TjDwDept> list1 = tjDwDeptService.getDwDeptListByTjDwDeptId(pid);
+ List<HashMap<String, Object>> collect1 = list1.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getId());
+ hashMap.put("text", i.getDwDeptName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect1);
+ case "3":
+ LambdaQueryWrapper<TjDwGrouping> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjDwGrouping::getDwDeptId,pid);
+ List<TjDwGrouping> list2 = tjDwGroupingService.list(wrapper);
+ List<HashMap<String, Object>> collect2 = list2.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getId());
+ hashMap.put("text", i.getGroupingName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect2);
+ }
+ return null;
+ }
+
}
--
Gitblit v1.8.0