From 644dea17d0f553bdd36f5bd3a6f3a946f5e033e2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 a023f78..1790a06 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
@@ -186,6 +186,16 @@
update.setStartTime(insuranceApply.getStartTime());
insuranceApplyMapper.updateById(update);
+
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
+ .eq(Multifile::getObjId,update.getId())
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,update.getEditDate())
+ .set(Multifile::getEditor,update.getEditor())
+ );
+
insuranceApply.getBaoxiandanFile().setIsdeleted(Constants.ZERO);
insuranceApply.getBaoxiandanFile().setCreator(user.getId());
insuranceApply.getBaoxiandanFile().setObjId(update.getId());
@@ -680,6 +690,14 @@
update.setId(model.getId());
insuranceApplyMapper.updateById(update);
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
+ .eq(Multifile::getObjId,update.getId())
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,update.getEditDate())
+ .set(Multifile::getEditor,update.getEditor())
+ );
insuranceApply.getToubaodanFile().setIsdeleted(Constants.ZERO);
insuranceApply.getToubaodanFile().setCreator(user.getId());
insuranceApply.getToubaodanFile().setObjId(update.getId());
@@ -784,6 +802,9 @@
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+ if(!(solutions.getIsdeleted().equals(Constants.ZERO)||solutions.getStatus().equals(Constants.ZERO))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏂规淇℃伅宸茶绂佺敤");
}
List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
//鍒ゆ柇鏄惁瀛樺湪閲嶅淇℃伅
@@ -987,6 +1008,8 @@
member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
member.setIdcardNo(applyDetail.getIdcardNo());
member.setApplyId(insuranceApply.getId());
+ member.setStartTime(applyDetail.getStartTime());
+ member.setEndTime(applyDetail.getEndTime());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
memberMapper.insert(member);
@@ -994,6 +1017,8 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
+ member.setStartTime(applyDetail.getStartTime());
+ member.setEndTime(applyDetail.getEndTime());
memberMapper.updateById(member);
}
}else{
@@ -1004,8 +1029,18 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
+ 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