From 8cd6e88b041619993d734d028a5e6a0a2385a379 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 五月 2025 18:51:17 +0800
Subject: [PATCH] zjh20250507
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 18 ++++-----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 7 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 24 ++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java | 12 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 12 +++---
7 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index b3130af..02ab055 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -38,7 +38,7 @@
*/
@Slf4j
@Component
-@Profile("!dev & !prod & !test")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
public class DefaultScheduled {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index a8cd91d..563370b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -121,16 +121,16 @@
if (!MatchUtils.isMobileNO(tjCustomer.getCusPhone()))
return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- if (cusIdcard.length() == 18) {
+ if (tjCustomer.getIdType().equals("1")) {
if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if (cusIdcard.length() == 9) {
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if (cusIdcard.length() == 9) {
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusIdcard, cusIdcard);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
index 8bbd736..c6cee55 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
@@ -82,16 +82,16 @@
if (!(MatchUtils.isMobileNO(tjReservation.getPhoe())))
return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- if (tjReservation.getIdCard().length() == 18) {
+ if (tjReservation.getIdType().equals("1")) {
if (!MatchUtils.isIdCard(tjReservation.getIdCard())) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if (tjReservation.getIdCard().length() == 9) {
- if (!MatchUtils.cardValidates(tjReservation.getIdCard())) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if (tjReservation.getIdCard().length() == 9) {
+// if (!MatchUtils.cardValidates(tjReservation.getIdCard())) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
wq.eq(TjReservation::getIsExpire, 2);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index ed8598f..f4f4388 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2656,8 +2656,14 @@
if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
if (jcbgd != null) {
- tjPdfVO.setTs(jcbgd.getYxbx());
- tjPdfVO.setSj(jcbgd.getBgNr());
+ String yxbx = jcbgd.getYxbx();
+ String bgNr = jcbgd.getBgNr();
+ // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏁板瓧鍚庤窡 '.' 鎴� '銆�'
+ String regex = "\\d+[\\.,銆乚";
+ // 浣跨敤姝ｅ垯鏇挎崲锛屽尮閰嶇殑鏁板瓧鍚庢坊鍔犳崲琛岀
+ yxbx = yxbx.replaceAll(regex, "\n$0");
+ tjPdfVO.setTs(yxbx);
+ tjPdfVO.setSj(bgNr);
tjPdfVO.setShys(jcbgd.getShysxm());
tjPdfVO.setProName(jcbgd.getXmmc());
ids += "|" + jcbgd.getXmdm();
@@ -2667,14 +2673,6 @@
}
}
}
-// if(!tjPdfVOS.isEmpty()){
-// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-// tjPdfVOS = tjPdfVOS.stream()
-// .sorted(Comparator.comparingInt(
-// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-// ))
-// .collect(Collectors.toList());
-// }
printReport.put(entry.getKey(), tjPdfVOS);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 03a6400..517da06 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -822,7 +822,8 @@
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber,
- @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam Integer type) {
+ @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam(required = false) Integer type) {
+ if(type == null)type= 0;
String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
SysUser sysUser = null;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 83a1e72..fae6edb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -159,15 +159,15 @@
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
if(cusIdcard.length()==18){
- if (! MatchUtils.isIdCard(cusIdcard)) {
+ if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if(cusIdcard.length()==9){
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(cusIdcard.length()==9){
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
@@ -654,16 +654,16 @@
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
- if(tjCustomer.getCusIdcard().length()==18){
+ if(customer.getIdType().equals("1")){
if (!(MatchUtils.isIdCard(tjCustomer.getCusIdcard())))
return AjaxResult.error("韬唤璇佸彿閿欒");
}
- if(tjCustomer.getCusIdcard().length()==9){
- if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(tjCustomer.getCusIdcard().length()==9){
+// if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
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..e3ff6da 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
@@ -436,7 +436,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 +570,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