diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java index 965b077..7294d95 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java @@ -144,4 +144,12 @@ public class AppCompanyController extends BaseController } return AjaxResult.success(companyService.queryCodeCompany(code)); } + + @ApiOperation("模糊查询公司列表") + @GetMapping("/likeList") + public TableDataInfo likeList(Company company) + { + List list = companyService.selectLikeCompanyList(company); + return getDataTable(list); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java index 8da78b6..ef2f60a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java @@ -49,7 +49,7 @@ public class AppUserController extends BaseController @ApiOperation("保存注册信息") @PostMapping("/registerUser") @BussinessLog(title = "保存简历") - public AjaxResult saveResume(@RequestBody RegisterBody registerBody) + public AjaxResult registerUser(@RequestBody RegisterBody registerBody) { appUserService.registerAppUser(registerBody); return AjaxResult.success(); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 8198b14..bee6b12 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -163,7 +163,7 @@ public class Job extends BaseEntity @ApiModelProperty("岗位类型 0疆内 1疆外") private String jobType; - @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 对应字段字典position_type") + @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 4零工 对应字段字典position_type") private String type; @TableField(exist = false) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java index b21e1e9..9a431ab 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java @@ -25,4 +25,6 @@ public interface CompanyMapper extends BaseMapper void updateJobCountOfCompany(); List label(@Param("companyNature") String companyNature, @Param("targ")String targ,@Param("companyName")String companyName); + + List selectLikeCompanyList(Company company); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java index 73f8785..f69f93e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java @@ -77,4 +77,6 @@ public interface ICompanyService Company approval(Company company); Company queryCodeCompany(String code); + + List selectLikeCompanyList(Company company); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index 2fc4e44..08622fc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.core.domain.entity.Company; @@ -59,6 +60,11 @@ public class AppUserServiceImpl extends ServiceImpl imple List jobs = jobTitleMapper.selectBatchIds(collect); appUser.setJobTitle(jobs.stream().map(JobTitle::getJobName).collect(Collectors.toList())); } + //查询企业信息 + if("0".equals(appUser.getIsCompanyUser())){ + Company company=companyMapper.selectOne(Wrappers.lambdaQuery().eq(Company::getCode, appUser.getIdCard()).orderByDesc(Company::getUpdateTime).last("LIMIT 1")); + appUser.setCompany(company); + } return appUser; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java index 2886049..9d7ed0c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java @@ -301,4 +301,9 @@ public class CompanyServiceImpl extends ServiceImpl impl Company companyResult = companyMapper.selectOne(Wrappers.lambdaQuery().eq(Company::getCode, code).orderByDesc(Company::getUpdateTime).last("LIMIT 1")); return companyResult; } + + @Override + public List selectLikeCompanyList(Company company) { + return companyMapper.selectLikeCompanyList(company); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml index 754f800..d8b6e47 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml @@ -89,4 +89,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) and name like concat('%',#{companyName},'%') + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 0348b83..229a124 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -130,4 +130,8 @@ public class AppUser extends BaseEntity @ApiModelProperty("工作经验") private String workExperience; + + @TableField(exist = false) + @ApiModelProperty("公司信息") + private Company company; }