server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1455,7 +1455,8 @@ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId) .in(ApplyDetail::getMemberId,memberList.stream().map(i->i.getId()).collect(Collectors.toList())) .in(CollectionUtils.isNotEmpty(memberList),ApplyDetail::getMemberId,memberList.stream().map(i->i.getId()).collect(Collectors.toList())) .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ") .eq(ApplyDetail::getIsdeleted,Constants.ZERO)); List<ApplyChagneDetail> applyChangeDetailAllList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class, @@ -1464,7 +1465,8 @@ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId) .leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId) .eq(ApplyChange::getApplyId,applyChange.getApplyId()) .in(Member::getIdcardNo,memberList.stream().map(i->i.getId()).collect(Collectors.toList())) .in(CollectionUtils.isNotEmpty(memberList),Member::getIdcardNo,memberList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList())) .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ") .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)); List<ApplyChagneDetail> applyChagneDetailList = new ArrayList<>(); @@ -1516,7 +1518,7 @@ // memberMapper.updateById(member); updMemberList.add(member); applyChagneDetail.setMemberId(member.getId()); if(applyChangeDetailAllList.stream().filter( if(CollectionUtils.isNotEmpty(applyChangeDetailAllList)&&applyChangeDetailAllList.stream().filter( j->Constants.equalsInteger(j.getMemberId(),applyChagneDetail.getMemberId()) ).collect(Collectors.toList()).size()>Constants.ZERO){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "加保人员【" + applyChagneDetail.getMemberName() + "】存在申请中的加减保/换厂单据"); server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -2025,6 +2025,7 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，投保员工信息数据缺失，请按照要求填写员工的有效信息！"); } applyDetail.setId(null); applyDetail.setChangeStatus(Constants.ZERO); applyDetail.setCreateDate(new Date()); applyDetail.setCreator(loginUserInfo.getId()); @@ -2097,7 +2098,7 @@ } Long end = System.currentTimeMillis(); logger.error("处理单数据结束时间:=========================>"+end +";耗时：====》"+(end-start)); applyDetailJoinMapper.insert(applyDetailList); applyDetailMapper.insert(applyDetailList); } } @@ -2397,7 +2398,8 @@ queryWrapper.selectAs(Solutions::getPrice,InsuranceApply::getPrice); queryWrapper.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit); queryWrapper.select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad left join apply_change a on a.id = ad.APPLY_CHANGE_ID where t.id = a.APPLY_ID and a.status = 2 )",InsuranceApply::getChangeMoney); queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays "); // queryWrapper.select(" case when t.START_TIME > now() then 0 when t.END_TIME >= now() then DATEDIFF( now() ,t.START_TIME ) when t.END_TIME <= now() then DATEDIFF( t.END_TIME, t.START_TIME )+1 else 0 end loseEfficacyDays "); queryWrapper.select(" DATEDIFF( t.END_TIME, t.START_TIME )+1 as loseEfficacyDays "); queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum"); queryWrapper.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() and ad.START_TIME < now() ) as guaranteeNum"); if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){ server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -2992,10 +2992,13 @@ settleClaimsDataVO.setSettleClaimsTotal(settleClaimsList.size()); //平均理赔处理时长天数 总计处理时长（单位小时）除以 记录数 换算到天 if(CollectionUtils.isNotEmpty(closeCaseList)){ settleClaimsDataVO.setAverageSettleClaimsTime( new BigDecimal(closeCaseList.stream().map(i->i.getTotalHours()).reduce(Constants.ZERO,Integer::sum).toString()) .divide(new BigDecimal((closeCaseList.size()*24)+"") ,2,BigDecimal.ROUND_HALF_UP) ); } String monthDate = DateUtil.getFomartDate(new Date(),"yyyy-MM"); Calendar calendar = Calendar.getInstance();
