From 20fd61260b51260b99fe485bb718e136f6742976 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 27 五月 2025 09:07:47 +0800
Subject: [PATCH] 修改团体lis
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 b13277d..6da640c 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
@@ -103,14 +103,15 @@
@Autowired
private ITjDwGroupingService tjDwGroupingService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@PostMapping("/importTemplate")
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
//鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙�
try {
+ String value = configService.selectConfigByKey("path_filePath");
String base64String = PDFBinaryUtil.getPDFBinary(value + File.separator + "瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls");
if (null != base64String) {
PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + File.separator + "鍥綋棰勭害Excel妯＄増.xls");
@@ -436,7 +437,7 @@
log.info(tjReservation.getName() + " " + idCard);
}
- if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
+ if ((sfjysfzh.equalsIgnoreCase("Y") && idCard.length()==18 && !MatchUtils.isIdCard(idCard)) ||
(sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�");
// errMsg = "韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�";
@@ -570,9 +571,10 @@
if (null != tjReservation.getIdType()) {
if (tjReservation.getIdType().equals("1")) {
b = MatchUtils.isIdCard(tjReservation.getIdCard());
- } else {
- b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
}
+// else {
+// b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
+// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
--
Gitblit v1.8.0