From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index b8f687a..57636f3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1950,8 +1950,8 @@
                     }
                     member.setIdcardNo(applyDetail.getIdcardNo());
                     member.setApplyId(insuranceApply.getId());
-                    member.setStartTime(applyDetail.getStartTime());
-                    member.setEndTime(applyDetail.getEndTime());
+//                    member.setStartTime(applyDetail.getStartTime());
+//                    member.setEndTime(applyDetail.getEndTime());
                     member.setDuId(applyDetail.getDuId());
                     member.setWorktypeId(applyDetail.getWorktypeId());
                     addMemberList.add(member);
@@ -1981,6 +1981,15 @@
                 applyDetail.setEndTime(insuranceApply.getApplyEndTime());
                 applyDetail.setSortnum(i);
                 applyDetail.setApplyId(insuranceApply.getId());
+
+                //鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
+                long age = Constants.getAgeByIdCard(applyDetail.getIdcardNo());
+                if(Objects.isNull(age)
+                        || age > solutions.getMaxAge()
+                        || age < solutions.getMinAge()){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ勾榫勮秴鍑烘柟妗堥厤缃�,鏂规閰嶇疆銆�"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"銆戯紒");
+                }
+
                 Member member = null;
                 if(Objects.isNull(applyDetail.getMemberId())){
                     if(CollectionUtils.isNotEmpty(memberList)){
@@ -1994,8 +2003,8 @@
                         member.setApplyId(insuranceApply.getId());
                         member.setDuId(applyDetail.getDuId());
                         member.setWorktypeId(applyDetail.getWorktypeId());
-                        member.setStartTime(applyDetail.getStartTime());
-                        member.setEndTime(applyDetail.getEndTime());
+//                        member.setStartTime(applyDetail.getStartTime());
+//                        member.setEndTime(applyDetail.getEndTime());
                         memberMapper.updateById(member);
                     }
                 }else{
@@ -2006,18 +2015,12 @@
                     member.setApplyId(insuranceApply.getId());
                     member.setDuId(applyDetail.getDuId());
                     member.setWorktypeId(applyDetail.getWorktypeId());
-                    member.setStartTime(applyDetail.getStartTime());
-                    member.setEndTime(applyDetail.getEndTime());
+//                    member.setStartTime(applyDetail.getStartTime());
+//                    member.setEndTime(applyDetail.getEndTime());
                     memberMapper.updateById(member);
                 }
 
-                //鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
-                long age = Constants.getAgeByIdCard(member.getIdcardNo());
-                if(Objects.isNull(age)
-                    || age > solutions.getMaxAge()
-                    || age < solutions.getMinAge()){
-                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ勾榫勮秴鍑烘柟妗堥厤缃�,鏂规閰嶇疆銆�"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"銆戯紒");
-                }
+
                 applyDetail.setMemberId(member.getId());
                 applyDetail.setIdcardNo(member.getIdcardNo());
                 applyDetail.setSex(member.getSex());

--
Gitblit v1.9.3