From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..756d268 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
@@ -41,6 +41,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -103,14 +104,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");
@@ -177,7 +179,7 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
- tjReservation.setIsExpire(2);
+ if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
// if(null !=list && list.size()>0){
// for (TjReservation reservation : list) {
@@ -436,7 +438,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 +572,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