From c77adabef95e87640b8f86417204b8f6bac2d971 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Mon, 6 Mar 2023 11:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=8A=A5=E5=90=8D=E5=8F=8A?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=AF=81=E6=98=8E=E6=9D=90=E6=96=99=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/controller/ExpertController.java | 8 ------ .../pmapi/expert/manage/ExpertManage.java | 21 ++++++++------- .../req/ExpertRecommendProofSubmitRequest.java | 31 ---------------------- .../req/ExpertUserBasicInfoSubmitRequest.java | 19 ++++++++++--- 4 files changed, 26 insertions(+), 53 deletions(-) delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertRecommendProofSubmitRequest.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java index b0309fa..b8a43cd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java @@ -5,7 +5,6 @@ import com.ningdatech.basic.model.PageVo; import com.ningdatech.pmapi.expert.manage.ExpertAdminManage; import com.ningdatech.pmapi.expert.manage.ExpertManage; import com.ningdatech.pmapi.expert.model.ExpertAdminExpertManageQuery; -import com.ningdatech.pmapi.expert.model.req.ExpertRecommendProofSubmitRequest; import com.ningdatech.pmapi.expert.model.req.ExpertUserBasicInfoSubmitRequest; import com.ningdatech.pmapi.expert.model.vo.ExpertAdminExpertManageListVO; import com.ningdatech.pmapi.expert.model.vo.ExpertFullInfoVO; @@ -36,16 +35,9 @@ public class ExpertController { @PostMapping("/basic-info-submit") @ApiOperation("填写基本信息接口(专家报名使用))") public void expertBasicInfoSubmit(@Valid @RequestBody ExpertUserBasicInfoSubmitRequest request) { -// ExpertUserInfoValidator.expertUserBasicInfoSubmitRequestValidate(request); expertManage.expertBasicInfoSubmit(request); } - @PostMapping("/recommend-proof-submit") - @ApiOperation("推荐证明提交接口(专家报名使用)") - public void expertRecommendProofSubmit(@Valid @RequestBody ExpertRecommendProofSubmitRequest request) { - expertManage.expertRecommendProofSubmit(request); - } - @GetMapping("/detail") @ApiOperation("专家获取专家详细信息") public ExpertFullInfoVO getExpertFullInfoDetail() { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java index 3ca3ddd..a55d6f3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertManage.java @@ -15,7 +15,6 @@ import com.ningdatech.pmapi.expert.model.cmd.ExpertFullInfoSaveCmd; import com.ningdatech.pmapi.expert.model.cmd.ExpertRecommendProofSaveCmd; import com.ningdatech.pmapi.expert.model.dto.ExpertDictionaryDTO; import com.ningdatech.pmapi.expert.model.dto.ExpertFullInfoAllDTO; -import com.ningdatech.pmapi.expert.model.req.ExpertRecommendProofSubmitRequest; import com.ningdatech.pmapi.expert.model.req.ExpertUserBasicInfoSubmitRequest; import com.ningdatech.pmapi.expert.model.vo.ExpertFullInfoVO; import com.ningdatech.pmapi.expert.service.ExpertInfoService; @@ -84,10 +83,16 @@ public class ExpertManage { .buildExpertFullInfoSaveCmd(userId, basicInfo, eduInfo, jobInfo, professionalInfo); expertInfoService.saveExpertInfo(expertFullInfoSaveCmd); } + + // 推荐证明材料 + List recommendedWay = request.getRecommendedWay(); + // 推荐方式 + List recommendProofFile = request.getRecommendProofFile(); + expertRecommendProofSubmit(recommendedWay, recommendProofFile); } - public void expertRecommendProofSubmit(ExpertRecommendProofSubmitRequest request) { + public void expertRecommendProofSubmit(List recommendedWay, List recommendProofFile) { // 用户id Long expertUserId = LoginUserUtil.getUserId(); ExpertUserFullInfo expertUserFullInfo = iExpertUserFullInfoService.getByUserId(expertUserId); @@ -97,20 +102,15 @@ public class ExpertManage { || ExpertUserInfoStepEnum.EVIDENCE_HAS_BEEN_SUBMITTED.getKey().equals(expertUserFullInfo.getUserInfoStep())) { throw new BizException("当前状态无法提交证明材料"); } - // 根据用户id 获取用户信息，获取手机号校验 验证码是否正确 - String phoneNo = expertUserFullInfo.getPhoneNo(); - String verificationCode = request.getVerificationCode(); // 证明材料提交 - List recommendProofFile = request.getRecommendProofFile(); - List recommendedWayList = request.getRecommendedWay(); ExpertRecommendProofSaveCmd expertRecommendProofSaveCmd = new ExpertRecommendProofSaveCmd(); if (CollectionUtils.isNotEmpty(recommendProofFile)) { expertRecommendProofSaveCmd.setRecommendationProofFileIdList(recommendProofFile.stream().map(FileBasicInfo::getFileId).collect(Collectors.toList())); } List recommendedWayDictionaryDTOList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(recommendedWayList)) { - recommendedWayDictionaryDTOList = recommendedWayList.stream().map(r -> { + if (CollectionUtils.isNotEmpty(recommendedWay)) { + recommendedWayDictionaryDTOList = recommendedWay.stream().map(r -> { ExpertDictionaryDTO expertDictionaryDTO = new ExpertDictionaryDTO(); expertDictionaryDTO.setDictionaryCode(r.getDictionaryCode()); expertDictionaryDTO.setExpertInfoField(DictExpertInfoTypeEnum.RECOMMENDED_WAY.getKey()); @@ -133,5 +133,6 @@ public class ExpertManage { } List fileIdList = expertInfoCommonHelper.getExpertFileIdList(expertUserFullInfoAll); List attachFiles = fileService.getByIds(fileIdList); - return expertUserInfoAssembler.buildExpertFullInfoVO(attachFiles, expertUserFullInfoAll); } + return expertUserInfoAssembler.buildExpertFullInfoVO(attachFiles, expertUserFullInfoAll); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertRecommendProofSubmitRequest.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertRecommendProofSubmitRequest.java deleted file mode 100644 index d828e3b..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertRecommendProofSubmitRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ningdatech.pmapi.expert.model.req; - -import com.ningdatech.pmapi.expert.model.DictionaryFieldInfo; -import com.ningdatech.pmapi.expert.model.FileBasicInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.util.List; - -/** - * @author liuxinxin - * @date 2022/7/22 下午5:49 - */ -@Data -@ApiModel("专家证明材料提交Request") -public class ExpertRecommendProofSubmitRequest { - - @NotEmpty - @ApiModelProperty("推荐方式") - private List recommendedWay; - - @ApiModelProperty("推荐证明材料") - private List recommendProofFile; - - @NotBlank - @ApiModelProperty("短信验证码") - private String verificationCode; -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java index 7e8c894..7fc78e7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertUserBasicInfoSubmitRequest.java @@ -1,14 +1,13 @@ package com.ningdatech.pmapi.expert.model.req; -import com.ningdatech.pmapi.expert.model.ExpertBasicInfo; -import com.ningdatech.pmapi.expert.model.ExpertEduInfo; -import com.ningdatech.pmapi.expert.model.ExpertJobInfo; -import com.ningdatech.pmapi.expert.model.ExpertProfessionalInfo; +import com.ningdatech.pmapi.expert.model.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.List; /** * @author liuxinxin @@ -33,4 +32,16 @@ public class ExpertUserBasicInfoSubmitRequest { @NotNull @ApiModelProperty("专业信息") private ExpertProfessionalInfo professionalInfo; + + + /** + * 补充推荐方式 + */ + @NotEmpty + @ApiModelProperty("推荐方式") + private List recommendedWay; + + @ApiModelProperty("推荐证明材料") + private List recommendProofFile; + } \ No newline at end of file