From c28a6a9f00376a13781bfab55adaf401cd651336 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期日, 07 四月 2024 15:25:27 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 125 +++++++++++++++++++++++++++++++---------- 1 files changed, 93 insertions(+), 32 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 68e0d51..fe9edfc 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 @@ -105,6 +105,8 @@ private UnionApplyJoinMapper unionApplyJoinMapper; @Autowired private UnionChangeJoinMapper unionChangeJoinMapper; + @Autowired + private CompanySolutionMapper companySolutionMapper; @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @@ -113,24 +115,31 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); - if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } - if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); - } - Solutions solutions = solutionsMapper.selectById(model.getSolutionId()); if(Objects.isNull(solutions)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�"); } - LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); InsuranceApply update = new InsuranceApply(); + if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){ + if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()); + }else{ + if( !(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey()) + || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()) + || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()))){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey()); + } + update.setEditDate(new Date()); update.setEditor(user.getId()); - update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo(insuranceApply.getCheckInfo()); update.setCheckUserId(user.getId()); @@ -517,15 +526,22 @@ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()) .ne(Notices::getType,Constants.NoticeType.SIX.getStatus()) .eq(Notices::getObjId,model.getId())); + //骞冲彴寰呭姙 Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO); noticesMapper.insert(notices); - Solutions solutions = solutionsMapper.selectById(model.getSolutionId()); - if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){ - Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO); + + CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda() + .eq(CompanySolution::getIsdeleted,Constants.ZERO) + .eq(CompanySolution::getSolutionId,model.getSolutionId()) + .eq(CompanySolution::getCompanyId,model.getCompanyId()) + .last("limit 1") + ); + //鍟嗘埛寰呭姙 + if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){ + Notices shopNotices = new Notices(noticeObjectType,Constants.TWO, + model.getId(),model.getSolutionsName(),companySolution.getShopId(),Constants.NoticeType.ZERO); noticesMapper.insert(shopNotices); } - - Multifile f = new Multifile(); f.setIsdeleted(Constants.ZERO); @@ -608,7 +624,7 @@ f.setCreator(model.getCreator()); f.setObjId(update.getId()); f.setCreateDate(update.getEditDate()); - f.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey()); + f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey()); f.setType(Constants.TWO); f.setFileurl(fileurl); f.setFileurlFull(fullUrl); @@ -738,7 +754,7 @@ ApplyChange update = new ApplyChange(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); - update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey()); + update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟"); update.setCheckUserId(model.getCreator()); @@ -750,7 +766,11 @@ f.setCreator(model.getCreator()); f.setObjId(update.getId()); f.setCreateDate(update.getEditDate()); - f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey()); + if(model.getType().equals(Constants.ZERO)){ + f.setObjType(Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()); + }else{ + f.setObjType(Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()); + } f.setType(Constants.TWO); f.setFileurl(fileurl); f.setFileurlFull(fullurl); @@ -842,8 +862,8 @@ f.setType(Constants.TWO); f.setFileurl(fileurl); f.setFileurlFull(fullUrl); - f.setInfo("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�"); - f.setName("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�.pdf"); + f.setInfo("鎶曚繚鐢宠鍗� -鐢宠鍗�"); + f.setName("鎶曚繚鐢宠鍗�.pdf"); multifileMapper.insert(f); Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD; @@ -1455,6 +1475,8 @@ applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS; if(Constants.equalsObject(solutions.getType(),Constants.ONE)){ update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey()); + }else{ + update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()); } } insuranceApplyMapper.updateById(update); @@ -1533,6 +1555,7 @@ insuranceApply.setCurrentFee(BigDecimal.ZERO); insuranceApply.setCheckUserId(loginUserInfo.getId()); insuranceApply.setStatus(insuranceApplyStatus.getKey()); + insuranceApply.setUnionApplyTbdStatus(Constants.ZERO); CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO(); countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId()); @@ -1567,10 +1590,16 @@ //瀛樺偍骞冲彴寰呭姙 Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO); noticesMapper.insert(notices); + CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda() + .eq(CompanySolution::getIsdeleted,Constants.ZERO) + .eq(CompanySolution::getSolutionId,solutions.getId()) + .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()) + .last("limit 1") + ); //鍟嗘埛寰呭姙 - if(Objects.nonNull(solutions.getShopId())){ + if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO, - insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO); + insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.ZERO); noticesMapper.insert(shopNotices); } } @@ -1887,6 +1916,7 @@ queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO); queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId()); queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList); + queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName()); 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())); @@ -1987,11 +2017,13 @@ @Override public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(InsuranceApply.class); queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName); queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName); queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType); + queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum"); queryWrapper.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate"); 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 "); @@ -1999,6 +2031,7 @@ queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId); queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO); queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId()); + queryWrapper.eq(model.getBaseSolutionId()!=null,Solutions::getBaseId,model.getBaseSolutionId()); //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹� if(loginUserInfo.getType().equals(Constants.ONE)){ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId()); @@ -2066,7 +2099,7 @@ List<Integer> objList = new ArrayList<>(); if(list!=null && list.size()>0){ for(InsuranceApply param : list){ - objList.get(param.getId()); + objList.add(param.getId()); } }else{ return; @@ -2315,7 +2348,10 @@ if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey()) ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()) ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()) - ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){ + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()) + || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()) + || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!"); } if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())){ @@ -2328,20 +2364,42 @@ insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS; } + else if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()) + || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()) + || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){ + insuranceApplyStatus = Constants.InsuranceApplyStatus.WTB_RETURN; + } + //瀛樺偍寰呭姙淇℃伅 //鍒犻櫎鍏朵粬寰呭姙 noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()) .ne(Notices::getType,Constants.NoticeType.SIX.getStatus()) .eq(Notices::getObjId,insuranceApply.getId())); - Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(), - insuranceApply.getCompanyId(), Constants.NoticeType.THREE); - noticesMapper.insert(notices); - //鍟嗘埛寰呭姙 - if(Objects.nonNull(solutions.getShopId())){ - Notices shopNotices = new Notices(noticeObjectType,Constants.TWO, - insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE); - noticesMapper.insert(shopNotices); + if(!loginUserInfo.getCompanyId().equals(insuranceApply.getCompanyId())){ + Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(), + insuranceApply.getCompanyId(), Constants.NoticeType.THREE); + noticesMapper.insert(notices); } + + +// CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda() +// .eq(CompanySolution::getIsdeleted,Constants.ZERO) +// .eq(CompanySolution::getSolutionId,solutions.getId()) +// .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()) +// .last("limit 1") +// ); +// //鍟嗘埛寰呭姙 +// if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){ +// Notices shopNotices = new Notices(noticeObjectType,Constants.TWO, +// insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE); +// noticesMapper.insert(shopNotices); +// } + + + + + + }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){ insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE; if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){ @@ -2350,7 +2408,10 @@ if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()) ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()) ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()) - ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){ + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_RETURN.getKey()) + ) + ){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!"); } //鍒犻櫎鍏朵粬寰呭姙 @@ -2687,7 +2748,7 @@ Constants.ApplyLogType applyLogType = null; String info = ""; //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣� - if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){ + if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); } Company company = user.getCompany(); @@ -2699,7 +2760,7 @@ } Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda() .eq(Multifile::getObjId,model.getId()) - .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey()) + .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey()) .eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1")); if(f == null || StringUtils.isBlank(f.getFileurl())){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇纭涔︽枃浠跺け璐ワ紝璇疯仈绯诲晢鎴风‘璁ゆ姇淇濈敵璇蜂功鏄惁姝g‘锛�"); -- Gitblit v1.9.3