提交一把

jiangping

2024-07-09 ddbb93dae803ea73b06bad25fb12eaa322768d18

 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);
@@ -1994,8 +1994,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,8 +2006,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);
                }

@@ -2062,6 +2062,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 +2095,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() )
@@ -2605,7 +2607,7 @@
                .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
                .selectAs(Company::getName,InsuranceApply::getCompanyName)
                .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
                .select(" isnull(( 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")
                .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())