diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index b1f4136..2cd27d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -277,6 +277,7 @@ public class SysUserController extends BaseController sysUser.setPhonenumber(company1.getContactPersonPhone()); sysUser.setNickName(company1.getContactPersonPhone()); }else{ + sysUser.setPassword("123456"); sysUser.setUserName(company1.getName()); sysUser.setNickName(company1.getName()); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index 2c2f2fd..20df889 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -41,7 +41,7 @@ public class CmsAppUserController extends BaseController * 查询APP用户列表 */ @ApiOperation("查询APP用户列表") - @PreAuthorize("@ss.hasPermi('bussiness:user:list')") + @PreAuthorize("@ss.hasPermi('cms:appUser:list')") @GetMapping("/list") public TableDataInfo list(AppUser appUser) { @@ -54,7 +54,7 @@ public class CmsAppUserController extends BaseController * 导出APP用户列表 */ @ApiOperation("导出APP用户列表") - @PreAuthorize("@ss.hasPermi('bussiness:user:export')") + @PreAuthorize("@ss.hasPermi('cms:appUser:export')") @Log(title = "APP用户", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, AppUser appUser) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index ddaabc3..7f1127a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -37,7 +37,7 @@ public class CmsJobController extends BaseController * 查询岗位列表 */ @ApiOperation("查询岗位列表") - @PreAuthorize("@ss.hasPermi('bussiness:job:list')") + @PreAuthorize("@ss.hasPermi('cms:job:list')") @GetMapping("/list") public TableDataInfo list(Job job) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java index 95fc571..5e6fa82 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java @@ -38,7 +38,7 @@ public class CompanyController extends BaseController * 查询公司列表 */ @ApiOperation("查询公司列表") - @PreAuthorize("@ss.hasPermi('app:company:list')") + @PreAuthorize("@ss.hasPermi('cms:company:list')") @GetMapping("/list") public TableDataInfo list(Company company) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java index 724806c..edd4879 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java @@ -2,15 +2,21 @@ package com.ruoyi.cms.controller.cms; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.service.IJobApplyService; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.AppUser; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; +import java.util.List; @RestController @RequestMapping("/cms/jobApply") @@ -26,4 +32,18 @@ public class JobApplyController extends BaseController { HashMap result = iJobApplyService.trendChart(jobApply); return success(result); } + + /** + * 导出APP用户列表 + */ + @ApiOperation("导出岗位申请APP用户") + @PreAuthorize("@ss.hasPermi('cms:jobApply:export')") + @Log(title = "APP用户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, @PathVariable Long companyId) + { + List list = iJobApplyService.selectAppUserList(companyId); + ExcelUtil util = new ExcelUtil(AppUser.class); + util.exportExcel(response, list, "APP用户数据"); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java index aa48413..7755962 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java @@ -8,6 +8,7 @@ import java.util.List; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.vo.CandidateVO; +import com.ruoyi.common.core.domain.entity.AppUser; /** * 岗位申请Mapper接口 @@ -30,4 +31,6 @@ public interface JobApplyMapper extends BaseMapper List candidates(Long jobId); HashMap trendChart(JobApply jobApply); + + List selectAppUserList(Long companyId); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java index 60acb30..42c58e9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; +import com.ruoyi.common.core.domain.entity.AppUser; /** * 岗位申请Service接口 @@ -59,4 +60,6 @@ public interface IJobApplyService HashMap statistics(); HashMap trendChart(JobApply jobApply); + + List selectAppUserList(Long companyId); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index 465f664..5f5f30a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -8,11 +8,13 @@ import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.query.MineJobQuery; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.service.IJobApplyService; +import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.utils.SiteSecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -121,4 +123,9 @@ public class JobApplyServiceImpl extends ServiceImpl im public HashMap trendChart(JobApply jobApply) { return jobApplyMapper.trendChart(jobApply); } + + @Override + public List selectAppUserList(Long companyId) { + return jobApplyMapper.selectAppUserList(companyId); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index 7b2a3fb..113c900 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -29,11 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,hire from app_user + select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card from app_user + + select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,hire from app_user + + + + \ 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 5a32890..e93a110 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 @@ -104,10 +104,10 @@ public class AppUser extends BaseEntity @ApiModelProperty("身份证") private String idCard; - @ApiModelProperty("是否录用 0录用,1未录用") - private String hire; - - @ApiModelProperty("是否企业用户 0是，1否") + /** + * 是否企业用户 0是，1否改为（0企业，1求职者，2网格员） + */ + @ApiModelProperty("app角色：0企业，1求职者，2网格员") private String isCompanyUser; @TableField(exist = false)