From c21d5551744f8f55aa44157c17985243670bec24 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 26 一月 2024 13:56:53 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 2 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 57e08ea..eb38594 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 @@ -409,6 +409,39 @@ } @Override + public void dealWaitSignedData(){ + List<InsuranceApply> applyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda() + .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WAIT_SIGNATURE) + .isNotNull(InsuranceApply::getSignApplyNo)); + if(applyList !=null && applyList.size()>0 ){ + for(InsuranceApply model : applyList){ + String link = signService.linkFile(model.getSignApplyNo()); + String fileUrl = uploadSignFile(link); + if(StringUtils.isBlank(fileUrl)){ + //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� + return; + } + uploadSignedFileDo(model,fileUrl); + return; + } + } + List<ApplyChange> chagneList = applyChangeMapper.selectList(new QueryWrapper<ApplyChange>().lambda() + .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.UPLOAD) + .isNotNull(ApplyChange::getSignApplyNo)); + if(chagneList !=null && chagneList.size()>0 ){ + for(ApplyChange model : chagneList){ + String link = signService.linkFile(model.getSignApplyNo()); + String fileUrl = uploadSignFile(link); + if(StringUtils.isBlank(fileUrl)){ + //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� + return; + } + uploadChangeSignedFileDo(model,fileUrl); + return; + } + } + } + @Override public void dealSignResult(NotifyDataReq data){ if(data.getApplyNo() == null ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); @@ -724,16 +757,24 @@ IPage<InsuranceApply> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); + List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(pageWrap.getModel().getStatusCollect()); queryWrapper.selectAll(InsuranceApply.class); queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName); queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName); queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays "); queryWrapper.select(" ( select count(1) from apply_detail ad where ad.apply_id = t.id ) as insureNum"); - queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney"); - queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast "); + if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){ + queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney"); + queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast "); + } queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId); queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId); queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO); + queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList); + if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){ + queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()); + queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date())); + } //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹� if(loginUserInfo.getType().equals(Constants.ONE)){ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId()); @@ -776,6 +817,17 @@ } } PageData<InsuranceApply> pageData = PageData.from(insuranceApplyJoinMapper.selectJoinPage(page,InsuranceApply.class, queryWrapper)); + if(pageData.getRecords()!=null){ + for (InsuranceApply apply : pageData.getRecords()){ + apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus())); + if(Constants.equalsInteger(apply.getStatusCollect(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){ + //濡傛灉宸插畬鎴� + if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){ + apply.setStatusCollect(Constants.THREE);//宸茶繃鏈� + } + } + } + } return pageData; } -- Gitblit v1.9.3