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 |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 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 0998336..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
@@ -1764,6 +1764,11 @@
         updBean.setId(insuranceApply.getId());
         updBean.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
         insuranceApplyMapper.updateById(updBean);
+
+//        if(1==1){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+//        }
+
         //瀛樺偍鏃ュ織鏁版嵁
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD;
         String info =applyLogType.getInfo();
@@ -1945,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);
@@ -1976,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)){
@@ -1989,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{
@@ -2001,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());
@@ -2057,13 +2065,11 @@
                             .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
-                                    ,Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey()
-                                    ,Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()
                                     ,Constants.InsuranceApplyStatus.CLOSE.getKey()
-                                    ,Constants.InsuranceApplyStatus.WTB_RETURN.getKey()
                                     ,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
                             .apply(" ( " +
                                     " '"+DateUtil.getPlusTime(startTime)+"'  <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(endTime)+"' " +
@@ -2092,11 +2098,9 @@
                             .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.PLATFORM_RETURN.getKey()
-                                    ,Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()
                                     ,Constants.InsuranceApplyStatus.CLOSE.getKey()
-                                    ,Constants.InsuranceApplyStatus.WTB_RETURN.getKey()
                                     ,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
                             .apply(" ( " +
                                     " '"+DateUtil.getPlusTime(startTime)+"'  <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(endTime)+"' " +
@@ -2605,7 +2609,8 @@
                 .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                 .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum")
+                .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+                .select(" ifnull(( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ),0) as guaranteeNum")
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(InsuranceApply::getId,model.getId())
@@ -2627,7 +2632,7 @@
         //鏌ヨ鏄庣粏
         List<ApplyDetail> detailList =applyDetailJoinMapper.selectJoinList(ApplyDetail.class,wrapper1);
         if(detailList!=null){
-            insuranceApply.setInsureNum(detailList.size());
+//            insuranceApply.setInsureNum(detailList.size());
             insuranceApply.setApplyDetailList(detailList);
         }
         insuranceApply.setRemark(model.getRemark());

--
Gitblit v1.9.3