From 0e6bbda3d9f0b9e421b7bf6247be3d82d825de27 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 17 六月 2025 13:43:53 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 034365e..68d4c4f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -40,6 +40,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -445,7 +447,10 @@
.eq(ApplyDetail::getApplyId,insuranceApply.getId())
.eq(ApplyDetail::getIdcardNo,model.getIdCard())
/* .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3))
+ .orderByAsc(ApplyDetail::getEndTime)
+ .last(" limit 1 ")
+ );
if(detail == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屾棤娉曡繘琛岃鎿嶄綔");
}
@@ -570,9 +575,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭�");
}
}
-
+ //String pattern = "^[\\u4e00-\\u9fa5\\d路]+$";
+ String pattern = "^[\\u4e00-\\u9fa5路]*$";
+ Pattern r = Pattern.compile(pattern);
index = Constants.TWO;
for(MemberImport model : dataList){
+ Matcher m = r.matcher(model.getName());
+ if (!m.matches()) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝"+model.getName() + "濮撳悕鏃犳晥锛岃妫�鏌ュ悗閲嶈瘯");
+ }
//妫�鏌ユ淳閬ｅ崟浣嶅拰宸ョ鏈夋晥鎬�
dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
index += 1;
--
Gitblit v1.9.3