修改简历实习与工作经历切换

edac40c1 · zwb · 9ff8730e · edac40c1 · edac40c1
Commit edac40c1 authored Dec 12, 2025 by zwb
Showing with 55 additions and 33 deletions
employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/controller/NewEditionResumeController.java
employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/service/resume/impl/NewEditionResumeServiceImpl.java
--- a/employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/controller/NewEditionResumeController.java
+++ b/employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/controller/NewEditionResumeController.java
@@ -50,8 +50,9 @@ public class NewEditionResumeController {
    /**
     * 新版导入简历
+     *
     * @param file 文件
-     * type 类型(1-文件，2图片)
+     *             type 类型(1-文件，2图片)
     */
    @RequestMapping(value = "/insertNewEditionResume")
    @Operation(description = "新版导入简历")
@@ -60,29 +61,31 @@ public class NewEditionResumeController {
                                    @RequestParam(value = "type", required = false) String type,
                                    @RequestParam(value = "targetPosition", required = false) String targetPosition,
                                    @RequestParam(value = "jobDescription", required = false) String jobDescription) {
-        this.newEditionResumeService.insertNewEditionResume(file,type,targetPosition,jobDescription);
+        this.newEditionResumeService.insertNewEditionResume(file, type, targetPosition, jobDescription);
        return new R<>(Boolean.TRUE);
    }
    /**
     * 根据简历id查询个人简历信息
+     *
     * @param resumeId
     * @return
     */
    @GetMapping("/queryNewEditionResumeId")
-    public R<ResumeVo> queryNewEditionResumeId(@RequestParam("resumeId") String resumeId){
+    public R<ResumeVo> queryNewEditionResumeId(@RequestParam("resumeId") String resumeId) {
        ResumeVo vo = this.newEditionResumeService.queryNewEditionResumeId(resumeId).join();
        return new R<>(vo);
    }
    /**
     * 查询简历模块数据
+     *
     * @param dto
     * @return
     */
    @PostMapping("/queryModelData/{modelName}")
-    public R<Map<String, Object>> queryModelData(@PathVariable("modelName") String modelName, @RequestBody ResumeMakeDto dto){
+    public R<Map<String, Object>> queryModelData(@PathVariable("modelName") String modelName, @RequestBody ResumeMakeDto dto) {
-        if (null == dto.getResumeId()){
+        if (null == dto.getResumeId()) {
            throw new JxgException("简历id不能为空");
        }
        Map<String, Object> resuleMap = this.newEditionResumeService.queryModelData(modelName, dto);
@@ -91,10 +94,11 @@ public class NewEditionResumeController {
    /**
     * 修改简历各个模块信息
+     *
     * @return
     */
    @PostMapping("/updateModule/{modelName}")
-    public R<Object> updateModule(@PathVariable("modelName") String modelName,@RequestBody ResumeMakeDto resumeMakeDto) throws Exception {
+    public R<Object> updateModule(@PathVariable("modelName") String modelName, @RequestBody ResumeMakeDto resumeMakeDto) throws Exception {
        if (null == resumeMakeDto.getResumeId()) {
            throw new WarnException("简历id不能为空");
        }
@@ -104,14 +108,15 @@ public class NewEditionResumeController {
    /**
     * 查询简历列表
+     *
     * @param
     * @return
     */
    @PostMapping("/resumeList")
-    public R<List<ResumeListItemCache>> resumeList(){
+    public R<List<ResumeListItemCache>> resumeList() {
        LoginUser loginUser = LoginHelper.getLoginUser();
        Long userId = 1L;
-        if (null != loginUser){
+        if (null != loginUser) {
            userId = loginUser.getUserId();
        }
        List<ResumeListItemCache> result = this.newEditionResumeService.resumeList(userId);
@@ -120,18 +125,19 @@ public class NewEditionResumeController {
    /**
     * 删除简历
+     *
     * @param dto
     * @return
     */
    @PostMapping("/del-resume")
    @RepeatSubmit
-    public R<Void> delResume(@RequestBody ResumeMakeDto dto)  {
+    public R<Void> delResume(@RequestBody ResumeMakeDto dto) {
-        if (null == dto.getResumeId()){
+        if (null == dto.getResumeId()) {
            throw new JxgException("简历id不能为空");
        }
        this.newEditionResumeService.delResume(dto);
        LoginUser loginUser = LoginHelper.getLoginUser();
-        if (null == loginUser){
+        if (null == loginUser) {
            throw new WarnException("用户信息获取失败");
        }
        Long userId = loginUser.getUserId();
@@ -141,12 +147,13 @@ public class NewEditionResumeController {
    /**
     * 根据模版生成html文件
+     *
     * @param dto
     * @return
     */
    @PostMapping("/create-resume-by-html")
-    public R createResumeHtml(@RequestBody ResumeByPdfDto dto){
+    public R createResumeHtml(@RequestBody ResumeByPdfDto dto) {
-        if (dto.getResumeId()==null){
+        if (dto.getResumeId() == null) {
            throw new WarnException("简历ID不能为空");
        }
        return new R<>(this.newEditionResumeService.createResumeHtml(dto.getResumeId(), dto.getTemplateName()));
@@ -154,22 +161,24 @@ public class NewEditionResumeController {
    /**
     * 根据html生成pdf文件
+     *
     * @param dto
     * @return
     */
    @PostMapping("/create-resume-pdf")
-    public R<ResumeByPdfVo> createResumePdf(@RequestBody ResumeByPdfDto dto){
+    public R<ResumeByPdfVo> createResumePdf(@RequestBody ResumeByPdfDto dto) {
        ResumeByPdfVo vo = this.newEditionResumeService.createResumePdf(dto);
        return new R<>(vo);
    }
    /**
     * 根据html生成小png图片
+     *
     * @param dto
     * @return
     */
    @PostMapping("/create-resume-min-png")
-    public R<ResumeByPdfVo> createResumeMinPng(@RequestBody ResumeByPdfDto dto){
+    public R<ResumeByPdfVo> createResumeMinPng(@RequestBody ResumeByPdfDto dto) {
        ResumeByPdfVo vo = this.newEditionResumeService.createResumeMinPng(dto);
@@ -178,21 +187,22 @@ public class NewEditionResumeController {
    /**
     * 简历模块优化
+     *
     * @param dto
     * @return
     */
    @PostMapping("/queryModuleOptimization")
    public R queryModuleOptimization(@RequestBody ModuleOptimizationDto dto) throws Exception {
-        if (StringUtils.isBlank(dto.getContent())){
+        if (StringUtils.isBlank(dto.getContent())) {
            throw new JxgException("待优化内容不能空");
        }
-        if (StringUtils.isBlank(dto.getModule())){
+        if (StringUtils.isBlank(dto.getModule())) {
            throw new JxgException("模块类型不能为空");
        }
-        if (StringUtils.isBlank(dto.getType())){
+        if (StringUtils.isBlank(dto.getType())) {
            throw new JxgException("优化类型不能为空");
        }
-        if (StringUtils.isBlank(dto.getResumeId())){
+        if (StringUtils.isBlank(dto.getResumeId())) {
            throw new JxgException("简历ID不能为空");
        }
        return new R<>(this.newEditionResumeService.queryModuleOptimization(dto));
@@ -200,13 +210,14 @@ public class NewEditionResumeController {
    /**
     * 根据简历id查询简历模块列表
+     *
     * @param resumeId
     * @return
     */
    @GetMapping(value = "/query-resume-model")
-    public R<List<ResumeModelVo>> queryResumeModel(@RequestParam("resumeId") Long resumeId){
+    public R<List<ResumeModelVo>> queryResumeModel(@RequestParam("resumeId") Long resumeId) {
        List<ResumeModelVo> resumeModelVos = resumeCacheService.queryResumeModelCache(resumeId);
-        if (CollectionUtil.isNotEmpty(resumeModelVos)){
+        if (CollectionUtil.isNotEmpty(resumeModelVos)) {
            resumeModelVos.sort(Comparator.comparing(ResumeModelVo::getDataSort));
            return new R<>(resumeModelVos);
        }
@@ -216,13 +227,14 @@ public class NewEditionResumeController {
    /**
     * 模块排序
+     *
     * @param dto
     * @return
     */
    @PostMapping(value = "/resume-model-sort")
    @RepeatSubmit
-    public R<Void> resumeModelSort(@RequestBody ResumeMakeDto dto){
+    public R<Void> resumeModelSort(@RequestBody ResumeMakeDto dto) {
-        if (null == dto.getResumeId()){
+        if (null == dto.getResumeId()) {
            throw new JxgException("简历id不能为空");
        }
        this.newEditionResumeService.resumeModelSort(dto);
@@ -233,13 +245,14 @@ public class NewEditionResumeController {
    /**
     * 查询个人简历基本信息标签列表
+     *
     * @param dto
     * @return
     */
    @PostMapping(value = "/resume-data-tagList")
    @RepeatSubmit
-    public R<List<Map<String,Object>>> resumeDataTagList(@RequestBody ResumeMakeDto dto){
+    public R<List<Map<String, Object>>> resumeDataTagList(@RequestBody ResumeMakeDto dto) {
-        if (null == dto.getResumeId()){
+        if (null == dto.getResumeId()) {
            throw new JxgException("简历id不能为空");
        }
        return R.ok(this.newEditionResumeService.resumeDataTagList(dto.getResumeId()));
@@ -247,13 +260,14 @@ public class NewEditionResumeController {
    /**
     * 更新个人简历基本信息标签列表
+     *
     * @param dto
     * @return
     */
    @PostMapping(value = "/update-resume-tagList")
    @RepeatSubmit
-    public R<List<Map<String,Object>>> updateResumeTagList(@RequestBody ResumeBaseTagDto dto){
+    public R<List<Map<String, Object>>> updateResumeTagList(@RequestBody ResumeBaseTagDto dto) {
-        if (null == dto.getResumeId()){
+        if (null == dto.getResumeId()) {
            throw new JxgException("简历id不能为空");
        }
        return R.ok(this.newEditionResumeService.updateResumeTagList(dto));
@@ -261,13 +275,14 @@ public class NewEditionResumeController {
    /**
     * 个人简历工作经历与实习经历切换
+     *
     * @param dto
     * @return
     */
    @PostMapping(value = "/reversal-experience")
    @RepeatSubmit
    public R reversalExperience(@RequestBody ResumeExpChangeDto dto) throws Exception {
-        if (null == dto.getWorkExperience()&&dto.getInternshipExperience()==null){
+        if (null == dto.getWorkExperience() && dto.getInternshipExperience() == null) {
            throw new JxgException("切换经历不能为空");
        }
        this.newEditionResumeService.reversalExperience(dto);
@@ -276,11 +291,12 @@ public class NewEditionResumeController {
    /**
     * 查询简历分析详情
+     *
     * @param resumeId
     * @return
     */
    @GetMapping("/query-resume-sketch")
-    public R<FunctionResumeSketch> queryResumeSketch(@RequestParam("resumeId") Long resumeId){
+    public R<FunctionResumeSketch> queryResumeSketch(@RequestParam("resumeId") Long resumeId) {
        FunctionResumeSketch vo = this.resumeMakeService.queryResumeSketch(resumeId);
        return new R<>(vo);
    }

--- a/employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/service/resume/impl/NewEditionResumeServiceImpl.java
+++ b/employmentBusiness-pc-modules/employmentBusiness-pc-system/src/main/java/com/bkty/system/service/resume/impl/NewEditionResumeServiceImpl.java
@@ -954,13 +954,19 @@ public class NewEditionResumeServiceImpl implements NewEditionResumeService {
    public void reversalExperience(ResumeExpChangeDto dto) throws Exception {
        //修改工作经历
        if (dto.getWorkExperience()!=null){
-            if (StringUtils.isNotBlank(dto.getWorkExperience().getModelName()))
+            if (StringUtils.isNotBlank(dto.getWorkExperience().getModelName())){
-            updateModule(dto.getWorkExperience().getModelName(),dto.getWorkExperience());
+                String modelName = dto.getWorkExperience().getModelName();
+                if (modelName.equals(ResumeEnum.ResumeModel.WORK_EXP.getName()))
+                updateModule(ResumeEnum.ResumeModel.WORK_EXP.getWebCode(),dto.getWorkExperience());
+            }
        }
        //修改实习经历
        if (dto.getInternshipExperience()!=null){
-            if (StringUtils.isNotBlank(dto.getInternshipExperience().getModelName()))
+            if (StringUtils.isNotBlank(dto.getInternshipExperience().getModelName())){
-                updateModule(dto.getInternshipExperience().getModelName(),dto.getInternshipExperience());
+                String modelName = dto.getInternshipExperience().getModelName();
+                if (modelName.equals(ResumeEnum.ResumeModel.INTERNSHIP.getName()))
+                    updateModule(ResumeEnum.ResumeModel.INTERNSHIP.getWebCode(),dto.getWorkExperience());
+            }
        }
    }