From 9dc6e13e7aea2e6e6f8e32fdd2152d4ce9cb76a1 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期五, 29 三月 2024 18:08:33 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 51 +++++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 22 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 9cc0e6a..e352d37 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 @@ -515,7 +515,7 @@ InsuranceApply update = new InsuranceApply(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); - update.setStatus(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()); + update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�"); update.setCheckUserId(model.getCreator()); @@ -771,10 +771,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } //濮旀墭淇� 浼佷笟绛剧讲鎶曚繚纭涔� @@ -799,10 +799,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadFAQRSSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -828,10 +828,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadApplyMemberListSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -858,10 +858,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadTBSQSSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -890,10 +890,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadChangeSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -920,10 +920,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadChangeMemberListSignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -947,10 +947,10 @@ String fileUrl = uploadSignFile(link); if(StringUtils.isBlank(fileUrl)){ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚� - return; + continue; } uploadUnionApplySignedFileDo(model,fileUrl,path+fileUrl); - return; +// return; } } @@ -1623,6 +1623,9 @@ } public List<Integer> getCollectStatus(Integer collectStatus){ + if(collectStatus ==null){ + return new ArrayList<>(); + } List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus); if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey())); @@ -2184,14 +2187,14 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - - smsEmailService.validateCode(smsCheckDTO.getCode()); - + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() .selectAll(InsuranceApply.class) .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) - .eq(InsuranceApply::getId,smsCheckDTO.getCode()) + .eq(InsuranceApply::getId,smsCheckDTO.getBusinessId()) .last("limit 1"); InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper); @@ -2202,7 +2205,7 @@ if(Objects.isNull(solutions)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�"); } - if(solutions.getType().equals(Constants.ZERO)){ + if(Constants.equalsInteger(solutions.getType(),(Constants.ZERO))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝闈炲鎵樹繚鏂规淇濆崟!"); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); @@ -2282,7 +2285,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //楠岃瘉 楠岃瘉鐮� - smsEmailService.validateCode(smsCheckDTO.getCode()); + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId()); if(Objects.isNull(model)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�"); @@ -2343,7 +2348,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //楠岃瘉 楠岃瘉鐮� - smsEmailService.validateCode(smsCheckDTO.getCode()); + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() .selectAll(InsuranceApply.class) .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword) -- Gitblit v1.9.3