Your Name 8 mēneši atpakaļ
vecāks
revīzija
81b59c90d7

+ 12 - 0
src/main/java/com/sqx/modules/firstLogin/control/UserFirstRegistController.java

@@ -72,11 +72,23 @@ public class UserFirstRegistController {
         resumesDto.setResumeList( resumesService.selectResumesByUserId(userId));
         resumesDto.setEduList(eduService.selectEdu(Math.toIntExact(userId)));
         resumesDto.setIntentions(intentionService.getIntention(userId));
+        resumesDto.setWorkExps(workExpService.selectWorkExpOnly(userId));
         resumesDto.setWorkExpList(workExpService.selectWorkExp(Math.toIntExact(userId)));
         resumesDto.setSkills(skillService.selectSkill(Math.toIntExact(userId)));
         return Result.success().put("data",resumesDto);
     }
     @Login
+    @GetMapping ("getWorkExpDetailOne")
+    @ApiOperation("获取简历信息")
+    public Result getWorkExpDetailOne(Long workExpId) {
+        WorkExpDto workExpDto = new WorkExpDto();
+        workExpDto.setWorkExp(workExpService.getById(workExpId));
+        QueryWrapper<WorkExpDetail> workExpDetailQueryWrapper = new QueryWrapper<>();
+        workExpDetailQueryWrapper.eq("work_exp_id",workExpId);
+        workExpDto.setWorkExpDetails(workExpDetailService.getBaseMapper().selectList(workExpDetailQueryWrapper));
+        return Result.success().put("data",workExpDto);
+    }
+    @Login
     @PostMapping("savemsg")
     @ApiOperation("更改基础信息")
     public  Result savemsg(@RequestAttribute("userId")Long userId, @RequestBody UserEntity userEntity,@RequestBody Resumes resumes){

+ 3 - 1
src/main/java/com/sqx/modules/firstLogin/dao/WorkExpDao.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.firstLogin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.firstLogin.dto.WorkExpDetailDto;
+import com.sqx.modules.firstLogin.dto.WorkExpDto;
 import com.sqx.modules.firstLogin.entity.WorkExp;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -9,7 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface WorkExpDao extends BaseMapper<WorkExp> {
-    List<Object> selectWorkExpList(Integer userId);
+    List<WorkExpDetailDto> selectWorkExpList(Integer userId);
 
     List<Object> selectWorkExpOne(Integer workExpId);
 }

+ 3 - 2
src/main/java/com/sqx/modules/firstLogin/dto/WorkExpDto.java

@@ -4,10 +4,11 @@ import com.sqx.modules.firstLogin.entity.WorkExp;
 import com.sqx.modules.firstLogin.entity.WorkExpDetail;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 @Data
-public class WorkExpDto {
-
+public class WorkExpDto implements Serializable {
+    private static final long serialVersionUID = 1L;
         private WorkExp workExp;
         private List<WorkExpDetail> workExpDetails;  // List字段
 }

+ 4 - 1
src/main/java/com/sqx/modules/firstLogin/entity/ResumesDto.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.firstLogin.entity;
 
 import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.firstLogin.dto.WorkExpDetailDto;
+import com.sqx.modules.firstLogin.dto.WorkExpDto;
 import com.sqx.modules.intention.entity.Intention;
 import com.sqx.modules.resumes.entity.Resumes;
 import lombok.Data;
@@ -12,8 +14,9 @@ public class ResumesDto {
     // 教育经历列表(假设Education是教育经历实体类)
     private List<Edu> eduList;
     // 工作经历列表(假设WorkExperience是工作经历实体类)
-    private List<Object> workExpList;
+    private List<WorkExpDetailDto> workExpList;
 
+    private List<WorkExp> workExps;
     private UserEntity userEntity;
 
     private List<Intention> intentions;

+ 4 - 1
src/main/java/com/sqx/modules/firstLogin/entity/WorkExpDetail.java

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class WorkExpDetail {
+public class WorkExpDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @TableId(value = "work_exp_detail_id", type = IdType.AUTO)
     private  Integer workExpDetailId;
     private  Integer workExpId;

+ 6 - 1
src/main/java/com/sqx/modules/firstLogin/service/WorkExpService.java

@@ -1,12 +1,17 @@
 package com.sqx.modules.firstLogin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.modules.firstLogin.dto.WorkExpDetailDto;
+import com.sqx.modules.firstLogin.dto.WorkExpDto;
 import com.sqx.modules.firstLogin.entity.WorkExp;
+import com.sqx.modules.firstLogin.entity.WorkExpDetail;
 
 import java.util.List;
 
 public interface WorkExpService extends IService<WorkExp> {
-    List<Object> selectWorkExp(Integer userId);
+    List<WorkExpDetailDto> selectWorkExp(Integer userId);
 
     List<Object> selectWorkExpOne(Integer workExpId);
+
+    List<WorkExp> selectWorkExpOnly(Long userId);
 }

+ 11 - 1
src/main/java/com/sqx/modules/firstLogin/service/impl/WorkExpServiceImpl.java

@@ -1,7 +1,10 @@
 package com.sqx.modules.firstLogin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.modules.firstLogin.dao.WorkExpDao;
+import com.sqx.modules.firstLogin.dto.WorkExpDetailDto;
+import com.sqx.modules.firstLogin.dto.WorkExpDto;
 import com.sqx.modules.firstLogin.entity.WorkExp;
 import com.sqx.modules.firstLogin.service.WorkExpService;
 import org.springframework.stereotype.Service;
@@ -19,7 +22,7 @@ public class WorkExpServiceImpl extends ServiceImpl<WorkExpDao, WorkExp>implemen
     }
 
     @Override
-    public List<Object> selectWorkExp(Integer userId) {
+    public List<WorkExpDetailDto> selectWorkExp(Integer userId) {
         return workExpDao.selectWorkExpList(userId);
     }
 
@@ -27,4 +30,11 @@ public class WorkExpServiceImpl extends ServiceImpl<WorkExpDao, WorkExp>implemen
     public List<Object> selectWorkExpOne(Integer workExpId) {
         return workExpDao.selectWorkExpOne(workExpId);
     }
+
+    @Override
+    public List<WorkExp> selectWorkExpOnly(Long userId) {
+        QueryWrapper<WorkExp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId).eq("is_use",1);
+        return baseMapper.selectList(queryWrapper);
+    }
 }

+ 2 - 2
src/main/resources/mapper/workExp/workExp.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sqx.modules.firstLogin.dao.WorkExpDao">
-   <select id="selectWorkExpList" resultType="com.sqx.modules.firstLogin.dto.WorkExpDto">
+   <select id="selectWorkExpList" resultType="com.sqx.modules.firstLogin.dto.WorkExpDetailDto">
     select *
     from work_exp w
     left join work_exp_detail d on w.work_exp_id = d.work_exp_id
     where w.user_id = #{userId}
     and w.is_use = 1
     </select>
-    <select id="selectWorkExpOne" resultType="com.sqx.modules.firstLogin.dto.WorkExpDto">
+    <select id="selectWorkExpOne" resultType="com.sqx.modules.firstLogin.dto.WorkExpDetailDto">
         select *
         from work_exp w
                  left join work_exp_detail d on w.work_exp_id = d.work_exp_id