From c4a4786b5c93882aaded3164dc329e35b88eca5b Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期五, 29 三月 2024 16:18:20 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 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 6292a25..795e597 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 @@ -1621,13 +1621,37 @@ QueryWrapper<InsuranceApply> wrapper = new QueryWrapper<>(insuranceApply); return insuranceApplyMapper.selectList(wrapper); } + + 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())); + }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){ + statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey())); + }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){ + statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey())); + }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){ + statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey())); + }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){ + statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey())); + }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){ + statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey())); + } + + return statusList; + } @Override public PageData<InsuranceApply> findPage(PageWrap<InsuranceApplyQueryDTO> pageWrap) { 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()); + + List<Integer> statusList = this.getCollectStatus(pageWrap.getModel().getStatusCollect()); + queryWrapper.selectAll(InsuranceApply.class); queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName); queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName); @@ -2163,8 +2187,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) @@ -2260,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(),"鏈煡璇繚鍗曚俊鎭�"); @@ -2321,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