Ver código fonte

测试,新增

Your Name 9 meses atrás
pai
commit
2c9ec755ff

+ 29 - 7
src/main/java/com/sqx/modules/firstLogin/control/UserFirstRegistCotroller.java

@@ -1,11 +1,13 @@
 package com.sqx.modules.firstLogin.control;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
-import com.sqx.modules.firstLogin.entity.DepartmentEntity;
-import com.sqx.modules.firstLogin.entity.WorkExpEntity;
+import com.sqx.modules.firstLogin.entity.Department;
+import com.sqx.modules.firstLogin.entity.PostSkill;
+import com.sqx.modules.firstLogin.entity.WorkExp;
 import com.sqx.modules.firstLogin.service.DepartmentService;
+import com.sqx.modules.firstLogin.service.WorkExpService;
+import com.sqx.modules.firstLogin.service.PostSkillService;
 import com.sqx.modules.resumes.entity.Resumes;
 import com.sqx.modules.resumes.service.ResumesService;
 import io.swagger.annotations.ApiOperation;
@@ -22,12 +24,15 @@ public class UserFirstRegistCotroller {
     private ResumesService resumesService;
     @Autowired
     private DepartmentService departmentService;
+    @Autowired
+    private WorkExpService workExpService;
+    @Autowired
+    private PostSkillService postSkillService;
 
     @Login
     @PostMapping("regist")
     @ApiOperation("初次加载信息")
     public void  userFirstRegist(Long userId, String minWage, String maxWages, String city,Integer ifExp){
-        System.out.println("?????????" + userId);
         Resumes resumes1 = resumesService.selectResumesByUserId(userId);
         resumes1.setCity(city);
         resumes1.setIfExp(ifExp);
@@ -37,14 +42,31 @@ public class UserFirstRegistCotroller {
     }
 @GetMapping ("getDepartment" )
 @ApiOperation("获取工作部门列表")
-    public  Result  getDepartment(DepartmentEntity departmentEntity){
+    public  Result  getDepartment(Department department){
 
-        return Result.success().put("data",departmentService.getDepartmentList(departmentEntity));
+        return Result.success().put("data",departmentService.getDepartmentList(department));
 }
+    @GetMapping ("getPostSkill" )
+    @ApiOperation("获取专业技能")
+    public  Result getPostSkill(PostSkill postSkill){
+        return  Result.success().put("data",postSkillService.getPostSkill(postSkill));
+    }
 
 @PostMapping("workExp")
 @ApiOperation("工作经验")
-    public  void workExp(WorkExpEntity workExp){
+    public  void workExp(Long userId,WorkExp workExp){
+    Resumes resumes1 = resumesService.selectResumesByUserId(userId);
+    WorkExp workExp1 = new WorkExp();
+    resumes1.setWorkExpId(Math.toIntExact(workExp1.getWorkExpId()));
+    resumesService.updateById(resumes1);
+    workExp1.setType(workExp.getType());
+    workExp1.setDepartment(workExp.getDepartment());
+    workExp1.setPostSkills(workExp.getPostSkills());
+    workExp1.setPostLevel(workExp.getPostLevel());
+    workExp1.setWorkContent(workExp.getWorkContent());
+    workExp1.setWorkAchieve(workExp.getWorkAchieve());
+    workExp1.setIndustry(workExp.getIndustry());
+    workExpService.updateById(workExp1);
 }
 @PostMapping("registe")
 @ApiOperation("补充详细信息")

+ 2 - 2
src/main/java/com/sqx/modules/firstLogin/dao/DepartmentDao.java

@@ -1,10 +1,10 @@
 package com.sqx.modules.firstLogin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sqx.modules.firstLogin.entity.DepartmentEntity;
+import com.sqx.modules.firstLogin.entity.Department;
 import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper
-  public interface DepartmentDao extends BaseMapper<DepartmentEntity> {
+  public interface DepartmentDao extends BaseMapper<Department> {
 }

+ 2 - 2
src/main/java/com/sqx/modules/firstLogin/dao/PostSkillDao.java

@@ -1,9 +1,9 @@
 package com.sqx.modules.firstLogin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sqx.modules.firstLogin.entity.PostSkillEntity;
+import com.sqx.modules.firstLogin.entity.PostSkill;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface PostSkillDao extends BaseMapper<PostSkillEntity> {
+public interface PostSkillDao extends BaseMapper<PostSkill> {
 }

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

@@ -1,10 +1,10 @@
 package com.sqx.modules.firstLogin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sqx.modules.firstLogin.entity.WorkExpEntity;
+import com.sqx.modules.firstLogin.entity.WorkExp;
 import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper
-public interface WorkExpDao extends BaseMapper<WorkExpEntity> {
+public interface WorkExpDao extends BaseMapper<WorkExp> {
 }

+ 2 - 2
src/main/java/com/sqx/modules/firstLogin/entity/DepartmentEntity.java → src/main/java/com/sqx/modules/firstLogin/entity/Department.java

@@ -11,13 +11,13 @@ import org.joda.time.DateTime;
 import java.io.Serializable;
 import java.util.List;
 @Data
-public class DepartmentEntity implements Serializable {
+public class Department implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 部门id
      */
-    @TableId(value = "industry_id", type = IdType.AUTO)
+    @TableId(value = "department_id", type = IdType.AUTO)
     private Long departmentId;
 
     /**

+ 5 - 1
src/main/java/com/sqx/modules/firstLogin/entity/PostSkillEntity.java → src/main/java/com/sqx/modules/firstLogin/entity/PostSkill.java

@@ -8,8 +8,10 @@ import lombok.Data;
 import org.joda.time.DateTime;
 
 import java.io.Serializable;
+import java.util.List;
+
 @Data
-public class PostSkillEntity implements Serializable {
+public class PostSkill implements Serializable {
     /**
      * 岗位技能id
      */
@@ -40,4 +42,6 @@ public class PostSkillEntity implements Serializable {
      * 更新时间
      */
     private DateTime updateTime;
+    @TableField(exist = false)
+    private List<PostSkill> childrenList;
 }

+ 2 - 2
src/main/java/com/sqx/modules/firstLogin/entity/WorkExpEntity.java → src/main/java/com/sqx/modules/firstLogin/entity/WorkExp.java

@@ -7,7 +7,7 @@ import org.joda.time.DateTime;
 
 import java.io.Serializable;
 @Data
-public class WorkExpEntity implements Serializable {
+public class WorkExp implements Serializable {
 
     /**
      * 工作经验id
@@ -45,6 +45,6 @@ private DateTime workTime;
     /**
      * 历史工作岗位id
      */
-private  Integer industryId;
+private  String industry;
 
 }

+ 3 - 4
src/main/java/com/sqx/modules/firstLogin/service/DepartmentService.java

@@ -1,12 +1,11 @@
 package com.sqx.modules.firstLogin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.sqx.modules.firstLogin.entity.DepartmentEntity;
-import org.springframework.stereotype.Service;
+import com.sqx.modules.firstLogin.entity.Department;
 
 import java.util.List;
 
-public interface DepartmentService extends IService<DepartmentEntity> {
+public interface DepartmentService extends IService<Department> {
 
-    List<DepartmentEntity> getDepartmentList(DepartmentEntity departmentEntity);
+    List<Department> getDepartmentList(Department department);
 }

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

@@ -1,7 +1,7 @@
 package com.sqx.modules.firstLogin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.sqx.modules.firstLogin.entity.WorkExpEntity;
+import com.sqx.modules.firstLogin.entity.WorkExp;
 
-public interface WorkExpService extends IService<WorkExpEntity> {
+public interface WorkExpService extends IService<WorkExp> {
 }

+ 4 - 4
src/main/java/com/sqx/modules/firstLogin/service/impl/DepartmentServiceImpl.java

@@ -3,17 +3,17 @@ 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.DepartmentDao;
-import com.sqx.modules.firstLogin.entity.DepartmentEntity;
+import com.sqx.modules.firstLogin.entity.Department;
 import com.sqx.modules.firstLogin.service.DepartmentService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
-public class DepartmentServiceImpl extends ServiceImpl<DepartmentDao,DepartmentEntity> implements DepartmentService {
+public class DepartmentServiceImpl extends ServiceImpl<DepartmentDao, Department> implements DepartmentService {
     @Override
-    public List<DepartmentEntity> getDepartmentList(DepartmentEntity departmentEntity){
+    public List<Department> getDepartmentList(Department department){
 
-        return   baseMapper.selectList(new QueryWrapper<>(departmentEntity));
+        return   baseMapper.selectList(new QueryWrapper<>(department));
     }
 }

+ 2 - 3
src/main/java/com/sqx/modules/firstLogin/service/impl/WorkExpServiceImpl.java

@@ -1,12 +1,11 @@
 package com.sqx.modules.firstLogin.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.modules.firstLogin.dao.WorkExpDao;
-import com.sqx.modules.firstLogin.entity.WorkExpEntity;
+import com.sqx.modules.firstLogin.entity.WorkExp;
 import com.sqx.modules.firstLogin.service.WorkExpService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class WorkExpServiceImpl extends ServiceImpl<WorkExpDao,WorkExpEntity>implements WorkExpService {
+public class WorkExpServiceImpl extends ServiceImpl<WorkExpDao, WorkExp>implements WorkExpService {
 }