From 36917e6b283b90312564a87f779b9ebd7d4aba0f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 29 十月 2024 13:51:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 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 cb5f934..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());
@@ -2062,6 +2065,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(ApplyDetail::getIdcardNo,idCode)
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.eq(Solutions::getBaseId,solutionId)
.ne(Objects.nonNull(applyId),InsuranceApply::getId,applyId)
.notIn(InsuranceApply::getStatus
@@ -2094,6 +2098,7 @@
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(ApplyDetail::getIdcardNo,idCode)
.eq(Solutions::getBaseId,solutionId)
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.notIn(InsuranceApply::getStatus
,Constants.InsuranceApplyStatus.CLOSE.getKey()
,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
--
Gitblit v1.9.3