Merge branch 'dev'

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitCompanyController.java

@@ -0,0 +1,134 @@
+package com.zhongzheng.controller.recruit;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyService;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 公司管理列Controller
+ * 
+ * @author change
+ * @date 2021-08-12
+ */
+@Api(value = "公司管理列控制器", tags = {"公司管理列管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/companyCon")
+public class RecruitCompanyController extends BaseController {
+
+    private final IRecruitCompanyService iRecruitCompanyService;
+
+
+    private final IRecruitCompanyTradeService iRecruitCompanyTradeService;
+
+
+    /**
+     * 查询公司管理列列表
+     */
+    @ApiOperation("查询公司管理列列表")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:list')")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitCompanyVo> list(RecruitCompanyQueryBo bo) {
+        startPage();
+        List<RecruitCompanyVo> list = iRecruitCompanyService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 查询行业类别列表
+     */
+    @ApiOperation("查询行业类别列表")
+    @PreAuthorize("@ss.hasPermi('system:trade:list')")
+    @GetMapping("/listTrade")
+    public TableDataInfo<RecruitCompanyTradeVo> list(RecruitCompanyTradeQueryBo bo) {
+        startPage();
+        List<RecruitCompanyTradeVo> list = iRecruitCompanyTradeService.queryCompanyTradeVo(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取公司管理列详细信息
+     */
+    @ApiOperation("获取公司管理列详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:query')")
+    @GetMapping("/{companyId}")
+    public AjaxResult<RecruitCompanyVo> getInfo(@PathVariable("companyId" ) Long companyId) {
+        return AjaxResult.success(iRecruitCompanyService.queryById(companyId));
+    }
+
+    /**
+     * 新增公司管理列
+     */
+    @ApiOperation("新增公司管理列")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:add')")
+    @Log(title = "公司管理列", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult<Void> add(@RequestBody RecruitCompanyAddBo bo) {
+        return toAjax(iRecruitCompanyService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改公司管理列
+     */
+    @ApiOperation("修改公司管理列")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:edit')")
+    @Log(title = "公司管理列", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitCompanyEditBo bo) {
+        return toAjax(iRecruitCompanyService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 导入公司
+     */
+    @ApiOperation("导入公司")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:add')")
+    @Log(title = "公司管理列", businessType = BusinessType.INSERT)
+    @PostMapping("/importExcel")
+    public AjaxResult<Void> exc(MultipartFile file, HttpServletRequest request) throws IOException {
+
+        // 判断文件是否为空
+        if (file == null) {
+         throw new RuntimeException("文件为空");
+        }
+
+        // 2.判断上传内容是否符合要求
+        String fileName = file.getOriginalFilename();
+
+        // 判断是否是excel文件
+        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            throw new RuntimeException("请上传正确格式的文件");
+        }
+
+        Boolean excel = iRecruitCompanyService.batchImport(file);
+
+        return toAjax(excel ? 1: 0);
+    }
+
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitInterviewController.java

@@ -0,0 +1,125 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.modules.recruit.vo.CalendarInterviewVo;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewExcel;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewUserVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewVo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewEditBo;
+import com.zhongzheng.modules.recruit.service.IRecruitInterviewService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘面试关联Controller
+ * 
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Api(value = "招聘面试控制器", tags = {"招聘面试联管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/interview")
+public class RecruitInterviewController extends BaseController {
+
+    private final IRecruitInterviewService iRecruitInterviewService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 查询招聘面试关联列表
+     */
+    @ApiOperation("查询招聘面试日历列表")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:list')")
+    @GetMapping("/list")
+    public AjaxResult<CalendarInterviewVo> list(RecruitInterviewQueryBo bo) {
+        startPage();
+        CalendarInterviewVo list = iRecruitInterviewService.queryListCalendar(bo);
+        return  AjaxResult.success(list);
+    }
+
+    /**
+     * 导出招聘面试关联列表
+     */
+    @ApiOperation("导出招聘面试关联列表")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:export')")
+    @Log(title = "招聘面试关联", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<RecruitInterviewVo> export(RecruitInterviewQueryBo bo) {
+        List<RecruitInterviewExcel> list = iRecruitInterviewService.queryExcelsList(bo);
+        ExcelUtil<RecruitInterviewExcel> util = new ExcelUtil<RecruitInterviewExcel>(RecruitInterviewExcel.class);
+        return util.exportExcel(list, "招聘面试安排");
+    }
+
+ /*   *//**
+     * 获取招聘面试关联详细信息
+     *//*
+    @ApiOperation("获取招聘面试关联详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:query')")
+    @GetMapping("/{interviewId}")
+    public AjaxResult<RecruitInterviewVo> getInfo(@PathVariable("interviewId" ) Long interviewId) {
+        return AjaxResult.success(iRecruitInterviewService.queryById(interviewId));
+    }*/
+
+
+
+    /**
+     * 修改招聘面试关联
+     */
+    @ApiOperation("修改招聘面试关联")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:edit')")
+    @Log(title = "招聘面试关联", businessType = BusinessType.UPDATE)
+    @PostMapping()
+    public AjaxResult<Void> edit(@RequestBody RecruitInterviewEditBo bo) {
+        return toAjax(iRecruitInterviewService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 查询招聘面试简历列表
+     */
+    @ApiOperation("查询招聘面试简历列表")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo<RecruitInterviewVo> listAll(RecruitInterviewQueryBo bo) {
+        startPage();
+        List<RecruitInterviewVo> list = iRecruitInterviewService.queryListAll(bo);
+        return  getDataTable(list);
+    }
+
+    /**
+     * 查询招聘面试简历列表
+     */
+    @ApiOperation("查询详情招聘面试简历")
+    @PreAuthorize("@ss.hasPermi('modules.recruit:interview:query')")
+    @GetMapping("/{interviewId}")
+    public AjaxResult<RecruitInterviewUserVo> interviewUserId(@PathVariable("interviewId" ) Long interviewUserId) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iRecruitInterviewService.interviewUserId(interviewUserId,loginUser));
+    }
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitNeedsController.java

@@ -0,0 +1,119 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
+import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
+import com.zhongzheng.modules.recruit.vo.RecruitNeedsVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘需求Controller
+ *
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Api(value = "招聘需求控制器", tags = {"招聘需求管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/needs")
+public class RecruitNeedsController extends BaseController {
+
+    private final IRecruitNeedsService iRecruitNeedsService;
+
+    private final TokenService tokenService;
+
+    /**
+     * 查询招聘需求列表
+     */
+    @ApiOperation("查询招聘需求列表")
+    @PreAuthorize("@ss.hasPermi('recruit:needs:list')")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitNeeds> list(RecruitNeedsQueryBo bo) {
+        startPage();
+        List<RecruitNeeds> list = iRecruitNeedsService.queryRecruitNeedsList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招聘需求列表
+     */
+    /*@ApiOperation("导出招聘需求列表")
+    @PreAuthorize("@ss.hasPermi('recruit:needs:export')")
+    @Log(title = "招聘需求", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<RecruitNeedsVo> export(RecruitNeedsQueryBo bo) {
+        List<RecruitNeedsVo> list = iRecruitNeedsService.queryList(bo);
+        ExcelUtil<RecruitNeedsVo> util = new ExcelUtil<RecruitNeedsVo>(RecruitNeedsVo.class);
+        return util.exportExcel(list, "招聘需求");
+    }*/
+
+    /**
+     * 获取招聘需求详细信息
+     */
+    @ApiOperation("获取招聘需求详细信息")
+    @PreAuthorize("@ss.hasPermi('recruit:needs:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<RecruitNeedsVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iRecruitNeedsService.queryById(id));
+    }
+
+    /**
+     * 新增招聘需求
+     */
+    @ApiOperation("新增招聘需求")
+    @PreAuthorize("@ss.hasPermi('recruit:needs:add')")
+    @Log(title = "招聘需求", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitNeedsAddBo bo) {
+        return toAjax(iRecruitNeedsService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改招聘需求
+     */
+    @ApiOperation("修改招聘需求")
+    @PreAuthorize("@ss.hasPermi('recruit:needs:edit')")
+    @Log(title = "招聘需求", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitNeedsEditBo bo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return toAjax(iRecruitNeedsService.updateByEditBo(bo,loginUser.getUser().getNickName()) ? 1 : 0);
+    }
+
+    /**
+     * 删除招聘需求
+     */
+   /* @ApiOperation("删除招聘需求")
+    @PreAuthorize("@ss.hasPermi('system:needs:remove')")
+    @Log(title = "招聘需求" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iRecruitNeedsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitTemplateController.java

@@ -0,0 +1,113 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.recruit.bo.RecruitTemplateAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitTemplateEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
+import com.zhongzheng.modules.recruit.service.IRecruitTemplateService;
+import com.zhongzheng.modules.recruit.vo.RecruitTemplateVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘模板Controller
+ *
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Api(value = "招聘模板控制器", tags = {"招聘模板管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/template")
+public class RecruitTemplateController extends BaseController {
+
+    private final IRecruitTemplateService iRecruitTemplateService;
+
+    /**
+     * 查询招聘模板列表
+     */
+    @ApiOperation("查询招聘模板列表")
+    @PreAuthorize("@ss.hasPermi('recruit:template:list')")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitTemplate> list(RecruitTemplateQueryBo bo) {
+        startPage();
+        List<RecruitTemplate> list = iRecruitTemplateService.queryRecruitTemplateList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招聘模板列表
+     */
+    /*@ApiOperation("导出招聘模板列表")
+    @PreAuthorize("@ss.hasPermi('recruit:template:export')")
+    @Log(title = "招聘模板", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<RecruitTemplateVo> export(RecruitTemplateQueryBo bo) {
+        List<RecruitTemplateVo> list = iRecruitTemplateService.queryList(bo);
+        ExcelUtil<RecruitTemplateVo> util = new ExcelUtil<RecruitTemplateVo>(RecruitTemplateVo.class);
+        return util.exportExcel(list, "招聘模板");
+    }*/
+
+    /**
+     * 获取招聘模板详细信息
+     */
+    @ApiOperation("获取招聘模板详细信息")
+    @PreAuthorize("@ss.hasPermi('recruit:template:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<RecruitTemplateVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iRecruitTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增招聘模板
+     */
+    @ApiOperation("新增招聘模板")
+    @PreAuthorize("@ss.hasPermi('recruit:template:add')")
+    @Log(title = "招聘模板", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitTemplateAddBo bo) {
+        return toAjax(iRecruitTemplateService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改招聘模板
+     */
+    @ApiOperation("修改招聘模板")
+    @PreAuthorize("@ss.hasPermi('system:template:edit')")
+    @Log(title = "招聘模板", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitTemplateEditBo bo) {
+        return toAjax(iRecruitTemplateService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除招聘模板
+     */
+    /*@ApiOperation("删除招聘模板")
+    @PreAuthorize("@ss.hasPermi('system:template:remove')")
+    @Log(title = "招聘模板" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iRecruitTemplateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysLoginController.java

@@ -13,6 +13,8 @@ import com.zhongzheng.framework.web.service.SysLoginService;
 import com.zhongzheng.framework.web.service.SysPermissionService;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.modules.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.vo.SysTenantVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,9 @@ public class SysLoginController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
     /**
      * 登录方法
      *
@@ -81,10 +86,13 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenantVo sysTenantVo = iSysTenantService.queryById(Long.parseLong(tenantId));
         Map<String,Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roles", roles);
         map.put("permissions", permissions);
+        map.put("tenant", sysTenantVo);
         return AjaxResult.success(map);
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolController.java

@@ -53,9 +53,10 @@ public class SchoolController extends BaseController {
     @ApiOperation("查询高校列表")
     @PreAuthorize("@ss.hasPermi('user:school:list')")
     @GetMapping("/list")
-    public AjaxResult<List<School>> list(SchoolQueryBo bo) {
+    public TableDataInfo<School> list(SchoolQueryBo bo) {
+        startPage();
         List<School> list = iSchoolService.selectList(bo);
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     /**

zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -82,7 +82,7 @@ public class ActivityConfigurationController extends BaseController {
      */
     @ApiOperation("領取活動發送請求")
     @PostMapping("/receive")
-    public AjaxResult<Void> receive(ActivityConfigurationUseAddBo bo) {
+    public AjaxResult<Void> receive(@RequestBody ActivityConfigurationUseAddBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityConfigurationUseServiceImpl.receive(bo) ? 1 : 0);

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Api(value = "【专业分类】控制器", tags = {"专业分类"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/course/category")
+@RequestMapping("/app/common/course/category")
 public class MajorCategoryController extends BaseController {
 
     private final IMajorCategoryService iMajorCategoryService;

zhongzheng-api/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.controller.exam;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.exam.bo.*;
+import com.zhongzheng.modules.exam.service.IExamArrangementGuideService;
+import com.zhongzheng.modules.exam.service.IExamArrangementService;
+import com.zhongzheng.modules.exam.vo.ExamArrangementGuideVo;
+import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
+import com.zhongzheng.modules.exam.vo.ExamUserVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 考试安排，包含考试指引Controller
+ * 
+ * @author change
+ * @date 2021-05-19
+ */
+@Api(value = "考试报名指引", tags = {"考试安排，学员计划，考试指南"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/exam/arrangement")
+public class ExamArrangementController extends BaseController {
+
+    private final IExamArrangementService iExamArrangementService;
+
+    private final IExamArrangementGuideService iExamArrangementGuideService;
+
+
+
+    /**
+     * 查询考试安排，包含考试指引列表
+     */
+    @ApiOperation("考试报名指引")
+    @GetMapping("/list")
+    public TableDataInfo<ExamArrangementVo> list(ExamArrangementQueryBo bo) {
+        startPage();
+        List<ExamArrangementVo> list = iExamArrangementService.queryList(bo);
+        return getDataTable(list);
+    }
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 保利威视频信息Controller
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Api(value = "保利威视频信息控制器", tags = {"保利威视频信息管理"})

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitAttachResumeController.java

@@ -0,0 +1,95 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitAttachResumeService;
+import com.zhongzheng.modules.recruit.vo.RecruitAttachResumeVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 附件简历Controller
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Api(value = "附件简历控制器", tags = {"附件简历管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/attach")
+public class RecruitAttachResumeController extends BaseController {
+
+    private final IRecruitAttachResumeService iRecruitAttachResumeService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询附件简历列表
+     */
+    @ApiOperation("查询附件简历列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitAttachResumeVo> list(RecruitAttachResumeQueryBo bo) {
+        startPage();
+        List<RecruitAttachResumeVo> list = iRecruitAttachResumeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取附件简历详细信息
+     */
+    @ApiOperation("获取附件简历详细信息")
+    @GetMapping("/{attachResumeId}")
+    public AjaxResult<RecruitAttachResumeVo> getInfo(@PathVariable("attachResumeId" ) Long attachResumeId) {
+        return AjaxResult.success(iRecruitAttachResumeService.queryById(attachResumeId));
+    }
+
+    /**
+     * 新增附件简历
+     */
+    @ApiOperation("新增附件简历")
+    @Log(title = "附件简历", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitAttachResumeAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iRecruitAttachResumeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改附件简历
+     */
+    @ApiOperation("修改附件简历")
+    @Log(title = "附件简历", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitAttachResumeEditBo bo) {
+        return toAjax(iRecruitAttachResumeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitCompanyController.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.controller.recruit;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyService;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyNeedVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 公司管理列Controller
+ * 
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Api(value = "公司管理列控制器", tags = {"公司管理列管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/recruit/companyCon")
+public class RecruitCompanyController extends BaseController {
+
+    private final IRecruitCompanyService iRecruitCompanyService;
+
+
+    private final IRecruitCompanyTradeService iRecruitCompanyTradeService;
+
+
+    /**
+     * 查询公司管理列列表
+     */
+    @ApiOperation("查询公司管理列列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitCompanyNeedVo> list(RecruitCompanyQueryBo bo) {
+        startPage();
+        List<RecruitCompanyNeedVo> list = iRecruitCompanyService.queryNeedsList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取公司管理列详细信息
+     */
+    @ApiOperation("获取公司管理列详细信息")
+    @GetMapping("/{companyId}")
+    public AjaxResult<RecruitCompanyNeedVo> getInfo(@PathVariable("companyId" ) Long companyId) {
+        return AjaxResult.success(iRecruitCompanyService.queryNeedsId(companyId));
+    }
+
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitInterviewController.java

@@ -0,0 +1,113 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitInterviewService;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘面试关联Controller
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Api(value = "投递简历控制器", tags = {"投递简历管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/interview")
+public class RecruitInterviewController extends BaseController {
+
+    private final IRecruitInterviewService iRecruitInterviewService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询招聘面试关联列表
+     */
+    @ApiOperation("查询邀请面试列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitInterviewVo> list(RecruitInterviewQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<RecruitInterviewVo> list = iRecruitInterviewService.queryListAppAll(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询招聘面试简历列表
+     */
+    @ApiOperation("全部投递面试简历列表")
+    @GetMapping("/listAll")
+    public TableDataInfo<RecruitInterviewVo> listAll(RecruitInterviewQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<RecruitInterviewVo> list = iRecruitInterviewService.queryListAll(bo);
+        return  getDataTable(list);
+    }
+
+
+    /**
+     * 获取招聘面试关联详细信息
+     */
+    @ApiOperation("获取招聘面试关联详细信息")
+    @GetMapping("/{interviewId}")
+    public AjaxResult<RecruitInterviewVo> getInfo(@PathVariable("interviewId" ) Long interviewId) {
+        return AjaxResult.success(iRecruitInterviewService.queryById(interviewId));
+    }
+
+    /**
+     * 新增招聘面试关联
+     */
+    @ApiOperation("投递简历")
+    @Log(title = "投递简历", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitInterviewAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iRecruitInterviewService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改招聘面试关联
+     */
+    @ApiOperation("修改招聘面试关联")
+    @Log(title = "招聘面试关联", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitInterviewEditBo bo) {
+        return toAjax(iRecruitInterviewService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitNeedsController.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.controller.recruit;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
+import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
+import com.zhongzheng.modules.recruit.vo.RecruitNeedsVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 招聘需求Controller
+ *
+ * @author hjl
+ * @date 2021-08-12
+ */
+@Api(value = "招聘需求控制器", tags = {"招聘需求管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/recruit/needs")
+public class RecruitNeedsController extends BaseController {
+
+    private final IRecruitNeedsService iRecruitNeedsService;
+
+    private final TokenService tokenService;
+
+    /**
+     * 查询招聘需求列表
+     */
+    @ApiOperation("查询招聘需求列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitNeeds> list(RecruitNeedsQueryBo bo) {
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(2);
+        bo.setStatus(statusList);
+        startPage();
+        List<RecruitNeeds> list = iRecruitNeedsService.queryRecruitNeedsList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取招聘需求详细信息
+     */
+    @ApiOperation("获取招聘需求详细信息")
+    @GetMapping("/{id}")
+    public AjaxResult<RecruitNeedsVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iRecruitNeedsService.queryById(id));
+    }
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitResumeController.java

@@ -0,0 +1,99 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitResumeService;
+import com.zhongzheng.modules.recruit.vo.RecruitResumeVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘用户简历Controller
+ *
+ * @author hjl
+ * @date 2021-08-18
+ */
+@Api(value = "招聘用户简历控制器", tags = {"招聘用户简历管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/resume")
+public class RecruitResumeController extends BaseController {
+
+    private final IRecruitResumeService iRecruitResumeService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询招聘用户简历列表
+     */
+    @ApiOperation("查询招聘用户简历列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitResumeVo> list(RecruitResumeQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        bo.setStatus(1);
+        startPage();
+        List<RecruitResumeVo> list = iRecruitResumeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取招聘用户简历详细信息
+     */
+    @ApiOperation("获取招聘用户简历详细信息")
+    @GetMapping("/{resumeId}")
+    public AjaxResult<RecruitResumeVo> getInfo(@PathVariable("resumeId" ) Long resumeId) {
+        return AjaxResult.success(iRecruitResumeService.queryById(resumeId));
+    }
+
+    /**
+     * 新增招聘用户简历
+     */
+    @ApiOperation("新增招聘用户简历")
+    @Log(title = "招聘用户简历", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitResumeAddBo bo) throws IllegalAccessException {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iRecruitResumeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改招聘用户简历
+     */
+    @ApiOperation("修改招聘用户简历")
+    @Log(title = "招聘用户简历", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitResumeEditBo bo) throws IllegalAccessException {
+        return toAjax(iRecruitResumeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/system/SysDictDataController.java

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @Api(tags ="字典数据管理")
 @RestController
-@RequestMapping("/system/dict/data")
+@RequestMapping("/app/common/system/dict/data")
 public class SysDictDataController extends BaseController
 {
     @Autowired

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/OrderPossessUserController.java

@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 【请填写功能名称】Controller
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-25
  */
 @Api(value = "【用户拥有课程或题库】控制器", tags = {"【用户拥有课程或题库】管理"})

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -63,15 +63,10 @@ public class CustomTenantLineHandler implements TenantLineHandler {
     @SneakyThrows
     @Override
     public Expression getTenantId() {
-
-      /*  if(StrUtil.isNotBlank(CustomTenantLineHandler.TENANT_ID)){
-            System.out.println("获取企业ID"+CustomTenantLineHandler.TENANT_ID);
-            return new LongValue(CustomTenantLineHandler.TENANT_ID);
-        }*/
         String TenantId = ServletUtils.getRequest().getHeader("TenantId");
         if(!StrUtil.isNotBlank(TenantId)||TenantId==null){
+            TenantId = ServletUtils.getResponse().getHeader("TenantId");
             if(enabledTenant){
-                TenantId = ServletUtils.getResponse().getHeader("TenantId");
                 if(!StrUtil.isNotBlank(TenantId)||TenantId==null){
                     int code = HttpStatus.HTTP_UNAVAILABLE;
                     String msg = "企业非法访问";
@@ -79,8 +74,6 @@ public class CustomTenantLineHandler implements TenantLineHandler {
                     ServletUtils.getResponse().getWriter().flush();
                     ServletUtils.getResponse().getWriter().close();
                 }
-            }else{
-                TenantId = ServletUtils.getResponse().getHeader("TenantId");
             }
         }
         return new LongValue(TenantId);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -323,6 +323,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
+                for (int i = 0; i < ranKingUsers.size(); i++) {
+                    ranKingUsers.get(i).setRank(i+1);
+                }
                 ranKingUser.setRanKingUsers(ranKingUsers);
             } else {
                 ranKingUser.setRanKingUsers(new ArrayList<>());
@@ -344,6 +347,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
+                for (int i = 0; i < ranKingUsers.size(); i++) {
+                    ranKingUsers.get(i).setRank(i+1);
+                }
                 ranKingUser.setRanKingUsers(ranKingUsers);
             } else {
                 ranKingUser.setRanKingUsers(new ArrayList<>());

zhongzheng-generator/src/main/resources/vm/java/addBo.java.vm

@@ -23,6 +23,7 @@ public class ${ClassName}AddBo {
 
 #foreach ($column in $columns)
 #if($column.isInsert && $column.isPk!=1)
+#if($column.columnName != 'tenant_id')
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
 #if($column.javaType == 'Date')
@@ -31,6 +32,7 @@ public class ${ClassName}AddBo {
     private $column.javaType $column.javaField;
 #end
 #end
+#end
 #if($table.sub)
 
     /** $table.subTable.functionName信息 */

zhongzheng-generator/src/main/resources/vm/java/domain.java.vm

@@ -11,7 +11,7 @@ import com.zhongzheng.common.annotation.Excel;
 
 /**
  * ${functionName}对象 ${tableName}
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
@@ -24,7 +24,7 @@ public class ${ClassName} implements Serializable {
 private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
-
+#if($column.columnName != 'tenant_id')
     /** $column.columnComment */
 #if($column.javaField=="createBy"||$column.javaField=="createTime")
     @TableField(fill = FieldFill.INSERT)
@@ -40,5 +40,5 @@ private static final long serialVersionUID=1L;
 #end
     private $column.javaType $column.javaField;
 #end
-
+#end
 }

zhongzheng-generator/src/main/resources/vm/java/editBo.java.vm

@@ -22,7 +22,7 @@ public class ${ClassName}EditBo {
 
 #foreach ($column in $columns)
 #if($column.isEdit || $column.isPk==1)
-
+#if($column.columnName != 'tenant_id')
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
 #if($column.javaType == 'Date')
@@ -30,6 +30,8 @@ public class ${ClassName}EditBo {
 #end
     private $column.javaType $column.javaField;
 #end
+
+#end
 #end
 #if($table.sub)
 

zhongzheng-generator/src/main/resources/vm/java/queryBo.java.vm

@@ -49,6 +49,7 @@ public class ${ClassName}QueryBo extends ${Entity} {
 
 
 #foreach ($column in $columns)
+#if($column.columnName != 'tenant_id')
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
 	/** $column.columnComment */
 #if($column.javaType == 'Date')
@@ -58,5 +59,5 @@ public class ${ClassName}QueryBo extends ${Entity} {
 	private $column.javaType $column.javaField;
 #end
 #end
-
+#end
 }

zhongzheng-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -40,6 +40,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo) {
         LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
 #foreach($column in $columns)
+#if($column.columnName != 'tenant_id')
 #if($column.query)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
@@ -63,6 +64,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         }
 #end
 #end
+#end
 #end
         return entity2Vo(this.list(lqw));
     }

zhongzheng-generator/src/main/resources/vm/java/vo.java.vm

@@ -28,6 +28,7 @@ public class ${ClassName}Vo {
 	private ${pkColumn.javaType} ${pkColumn.javaField};
 
 #foreach ($column in $columns)
+#if($column.columnName != 'tenant_id')
 #if($column.isList)
 	/** $column.columnComment */
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -48,5 +49,5 @@ public class ${ClassName}Vo {
 	private $column.javaType $column.javaField;
 #end
 #end
-
+#end
 }

zhongzheng-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -6,9 +6,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
+#if($column.columnName != 'tenant_id')
         <result property="${column.javaField}" column="${column.columnName}"/>
+#end
 #end
     </resultMap>
 
 
-</mapper>
+</mapper>

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingAddBo.java

@@ -56,4 +56,7 @@ public class ActivityAdvertisingAddBo {
     @ApiModelProperty("广告名称")
     @NotNull(message = "广告名称 不能为空")
     private String advName;
+    /** 广告类型 1学习中心 2求职 */
+    @ApiModelProperty("广告类型 1学习中心 2求职")
+    private Integer type;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingEditBo.java

@@ -58,4 +58,9 @@ public class ActivityAdvertisingEditBo {
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     private String advName;
+
+    /** 广告类型 1学习中心 2求职 */
+    @ApiModelProperty("广告类型 1学习中心 2求职")
+    private Integer type;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingQueryBo.java

@@ -70,5 +70,8 @@ public class ActivityAdvertisingQueryBo extends BaseEntity {
 	/** 有效期过期时间 */
 	@ApiModelProperty("发布时间结束")
 	private Long endIssueTime;
+	/** 广告类型 1学习中心 2求职 */
+	@ApiModelProperty("广告类型 1学习中心 2求职")
+	private Integer type;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -82,6 +82,11 @@ public class ActivityConfigurationAddBo {
     @ApiModelProperty("活动地址")
     private String activityUrl;
 
+    /** 活动详情 */
+    @Excel(name = "活动详情")
+    @ApiModelProperty("活动详情")
+    private String activityContentUrl;
+
     /** 绑定课程 */
     @Excel(name = "绑定课程")
     @ApiModelProperty("绑定课程")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -83,6 +83,11 @@ public class ActivityConfigurationEditBo {
     @ApiModelProperty("活动图标")
     private String activityLogo;
 
+    /** 活动详情 */
+    @Excel(name = "活动详情")
+    @ApiModelProperty("活动详情")
+    private String activityContentUrl;
+
 
 
     /** 活动地址 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -90,7 +90,10 @@ public class ActivityConfigurationQueryBo extends BaseEntity {
 	@ApiModelProperty("活动图标")
 	private String activityLogo;
 
-
+	/** 活动详情 */
+	@Excel(name = "活动详情")
+	@ApiModelProperty("活动详情")
+	private String activityContentUrl;
 
 	/** 活动地址 */
 	@Excel(name = "活动地址")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data
@@ -32,10 +32,14 @@ public class ActivityConfigurationUseAddBo {
     private Integer activityType;
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
     @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     @ApiModelProperty("领取时间")
     private Long createTime;
 
+    /** 领取时间 */
+    @ApiModelProperty("领取时间")
+    private Long updateTime;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data
@@ -32,7 +32,7 @@ public class ActivityConfigurationUseEditBo {
 
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
     @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     @ApiModelProperty("领取时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 activity_configuration_use
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data
@@ -41,7 +41,7 @@ public class ActivityConfigurationUseQueryBo extends BaseEntity {
 	private Integer activityType;
 	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
 	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer use;
+	private Integer useStatus;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserAddBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 用户领取记录添加对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 用户领取记录编辑对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 用户领取记录分页查询对象 activity_task_user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityAdvertising.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 
 /**
  * 广告发布储存对象 activity_advertising
- * 
+ *
  * @author change
  * @date 2021-05-17
  */
@@ -62,9 +62,10 @@ private static final long serialVersionUID=1L;
     /** 0删除 1待发布 2 撤回 3发布成功 */
     private Integer status;
 
-
-
     /** 广告名称 */
     private String advName;
 
+    /** 广告类型 1学习中心 2求职 */
+    private Integer type;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -79,4 +79,7 @@ private static final long serialVersionUID=1L;
     /** 活动地址 */
     private String activityUrl;
 
+    /** 活动详情 */
+    private String activityContentUrl;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationUse.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 activity_configuration_use
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data
@@ -34,9 +34,12 @@ private static final long serialVersionUID=1L;
     private Integer activityType;
 
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     private Long createTime;
 
+    /** 领取时间 */
+    private Long updateTime;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTaskUser.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 用户领取记录对象 activity_task_user
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -42,7 +42,7 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      * @param bo 详细配置信息
      * @return Collection<CourseConfigurationVo> 详细配置
      */
-    Collection<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
+    List<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
 
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationUseMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface ActivityConfigurationUseMapper extends BaseMapper<ActivityConfigurationUse> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskUserMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 用户领取记录Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 public interface ActivityTaskUserMapper extends BaseMapper<ActivityTaskUser> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationUseService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface IActivityConfigurationUseService extends IService<ActivityConfigurationUse> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskUserService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 用户领取记录Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 public interface IActivityTaskUserService extends IService<ActivityTaskUser> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -56,6 +56,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.apply(bo.getStarIssueTime() != null,"start_time BETWEEN {0} and {1}",bo.getStarIssueTime(),bo.getEndIssueTime());
         lqw.orderByDesc(ActivityAdvertising::getUpdateTime);
         List<ActivityAdvertising> list = this.list(lqw);
+        lqw.eq(bo.getType() != null, ActivityAdvertising::getType, bo.getType());
         return entity2Vo(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -167,7 +167,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Override
     public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
         bo.setStartTime(DateUtils.getNowTime());
-        List<ActivityConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
+        List<ActivityConfigurationVo> courseConfigurationVos = baseMapper.selectConfiguraIssueList(bo);
         return courseConfigurationVos;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Service
@@ -41,6 +42,9 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     @Autowired
     private ICouponService couponService;
 
+    @Autowired
+    private IActivityConfigurationUseService activityConfigurationUseService;
+
     @Override
     public ActivityConfigurationUseVo queryById(Long userId){
         ActivityConfigurationUse db = this.baseMapper.selectById(userId);
@@ -51,7 +55,7 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     public List<ActivityConfigurationUseVo> queryList(ActivityConfigurationUseQueryBo bo) {
         LambdaQueryWrapper<ActivityConfigurationUse> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getActivityType() != null, ActivityConfigurationUse::getActivityType, bo.getActivityType());
-        lqw.eq(bo.getUse() != null, ActivityConfigurationUse::getUse, bo.getUse());
+        lqw.eq(bo.getUseStatus() != null, ActivityConfigurationUse::getUseStatus, bo.getUseStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -79,6 +83,8 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     public Boolean insertByAddBo(ActivityConfigurationUseAddBo bo) {
         ActivityConfigurationUse add = BeanUtil.toBean(bo, ActivityConfigurationUse.class);
         validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);
     }
 
@@ -119,17 +125,21 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         //未领取过领取活动
         bo.setCreateTime(DateUtils.getNowTime());
         ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());
+        if (activityConfigurationUseService.countConfig(activityConfigurationVo.getId()).equals(activityConfigurationVo.getQuantity())){
+            throw new IllegalArgumentException("活动已领取结束");
+        }
+
         bo.setActivityType(Convert.toInt(activityConfigurationVo.getActivityType()));
         switch (bo.getActivityType()){
             case 3:
             case 4:
             case 2:
             case 5:
-                bo.setUse(1);
+                bo.setUseStatus(1);
                 break;
             //向卡券表中生成优惠券或折扣券
             default:
-                bo.setUse(0);
+                bo.setUseStatus(0);
                 CouponAddBo couponAddBo = new CouponAddBo();
                 couponAddBo.setPrice(activityConfigurationVo.getPrice());
                 couponAddBo.setEndTime(afterSixMonthDate(new Date(),activityConfigurationVo.getCouponEnd()));
@@ -160,7 +170,7 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         c.setTime(currentDate);
         c.add(Calendar.MONTH, amount);
         Date m3 = c.getTime();
-        return m3.getTime();
+        return m3.getTime()/1000;
     }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityAdvertisingVo.java

@@ -64,4 +64,8 @@ public class ActivityAdvertisingVo {
 	@Excel(name = "创建时间")
 	@ApiModelProperty("创建时间")
 	private Long createTime;
+	/** 1学习中心 2求职 */
+	@Excel(name = "1学习中心 2求职")
+	@ApiModelProperty("广告类型 1学习中心 2求职")
+	private Integer type;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationUseVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data
@@ -31,7 +31,7 @@ public class ActivityConfigurationUseVo {
 	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
 	@Excel(name = "是否已使用该次活动   0未使用  1已使用   线上直播 3")
 	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer use;
+	private Integer useStatus;
 
 	/** 领取时间 */
 	@Excel(name = "领取时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -63,6 +63,10 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("参与人数")
 	private Integer userNumber;
 
+	@Excel(name = "是否参与过活动 yes 参与 no未参与")
+	@ApiModelProperty("是否参与过活动 yes 参与 no未参与")
+	private String useStatus;
+
 	/** 直播内容（适用直播） */
 	@Excel(name = "直播内容" , readConverterExp = "适=用直播")
 	@ApiModelProperty("直播内容（适用直播）")
@@ -105,11 +109,16 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("活动地址")
 	private String activityUrl;
 
+	/** 活动详情 */
+	@Excel(name = "活动详情")
+	@ApiModelProperty("活动详情")
+	private String activityContentUrl;
+
 
 	/** 绑定课程 */
-	/*@Excel(name = "绑定课程")
+	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")
-	private List<CourseVo> courses;*/
+	private List<CourseVo> courseList;
 
 
 	@Excel(name = "绑定课程")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskUserVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 用户领取记录视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-16
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -167,7 +167,7 @@ public class OssServiceImpl implements OssService {
             //第三个参数  上传文件输入流
              PutObjectResult putObjectResult = ossClient.putObject(ALIYUN_OSS_BUCKET_NAME, fileName, inputStream);
              // 关闭OSSClient。
-            ossClient.shutdown();
+            //ossClient.shutdown();
 
                 System.out.println(fileName);
             return fileName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementGuideEditBo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】编辑对象 exam_arrangement_guide
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementGuideQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 exam_arrangement_guide
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】添加对象 exam_arrangement_sub
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 exam_arrangement_sub
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementGuide.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 exam_arrangement_guide
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementSub.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 exam_arrangement_sub
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementGuideMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 public interface ExamArrangementGuideMapper extends BaseMapper<ExamArrangementGuide> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementSubMapper.java

@@ -6,7 +6,7 @@ import com.zhongzheng.modules.exam.domain.ExamArrangementSub;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 public interface ExamArrangementSubMapper extends BaseMapper<ExamArrangementSub> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementGuideServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementSubServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementGuideVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementSubVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-08
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponAddBo.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 【请填写功能名称】添加对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponEditBo.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 /**
  * 【请填写功能名称】编辑对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 【请填写功能名称】分页查询对象 coupon
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Coupon.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 【请填写功能名称】对象 coupon
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/CouponMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface CouponMapper extends BaseMapper<Coupon> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/ICouponService.java

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 【请填写功能名称】Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 public interface ICouponService extends IService<Coupon> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
@@ -124,6 +125,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private ICollectCourseService iCollectCourseService;
 
+    @Autowired
+    private IActivityConfigurationUseService activityConfigurationUseServiceImpl;
+
     @Override
     public OrderVo queryById(Long orderId){
         Order db = this.baseMapper.selectById(orderId);
@@ -419,6 +423,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 if(!oOrderActivityService.insertByAddBo(orderActivityAddBo)){
                     throw new CustomException("活動錯誤");
                 }
+                //添加领取活动记录
+                ActivityConfigurationUseAddBo activityConfigurationUseAddBo = new ActivityConfigurationUseAddBo();
+                activityConfigurationUseAddBo.setUserId(add.getUserId());
+                activityConfigurationUseAddBo.setConfigurationId(activity);
+                activityConfigurationUseAddBo.setActivityType(activityConfigurationVo.getActivityType());
+                activityConfigurationUseAddBo.setUseStatus(1);
+                if(!activityConfigurationUseServiceImpl.insertByAddBo(activityConfigurationUseAddBo)){
+                    throw new CustomException("活動錯誤");
+                }
             }
 
             payPrice = payPrice.add(g.getGoodsPrice());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CouponVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-15
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 保利威视频信息添加对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 保利威视频信息编辑对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 保利威视频信息分页查询对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/domain/PolyvVideDo.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 保利威视频信息对象 polyv_video
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -40,7 +40,7 @@ import static com.squareup.okhttp.internal.Util.md5Hex;
 /**
  * 保利威视频信息Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/vo/PolyvVideoQuerVo.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 保利威视频信息视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/vo/PolyvVideoVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 保利威视频信息视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-06-11
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitAttachResumeAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 附件简历添加对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@ApiModel("附件简历添加对象")
+public class RecruitAttachResumeAddBo {
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 附件简历名称 */
+    @ApiModelProperty("附件简历名称")
+    private String attachName;
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String attachUrl;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 1正常 -1删除 */
+    @ApiModelProperty("1正常 -1删除")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitAttachResumeEditBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 附件简历编辑对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@ApiModel("附件简历编辑对象")
+public class RecruitAttachResumeEditBo {
+
+
+    /** 附件简历ID */
+    @ApiModelProperty("附件简历ID")
+    private Long attachResumeId;
+
+
+    /** 附件简历名称 */
+    @ApiModelProperty("附件简历名称")
+    private String attachName;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String attachUrl;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 1正常 -1删除 */
+    @ApiModelProperty("1正常 -1删除")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitAttachResumeQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 附件简历分页查询对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("附件简历分页查询对象")
+public class RecruitAttachResumeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 附件简历名称 */
+	@ApiModelProperty("附件简历名称")
+	private String attachName;
+	/** 地址 */
+	@ApiModelProperty("地址")
+	private String attachUrl;
+	/** 1正常 -1删除 */
+	@ApiModelProperty("1正常 -1删除")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyAddBo.java

@@ -0,0 +1,81 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 公司管理列添加对象 recruit_company
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel("公司管理列添加对象")
+public class RecruitCompanyAddBo {
+
+    /** 公司名称 */
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /** 公司类型 */
+    @ApiModelProperty("公司类型")
+    private Long companyTypeId;
+    /** 公司规模 */
+    @ApiModelProperty("公司规模")
+    private Long companySizeId;
+    /** 行业类别id */
+    @ApiModelProperty("行业类别id")
+    private Long industryTypeId;
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
+    /** 公司介绍 */
+    @ApiModelProperty("公司介绍")
+    private String companyIntroduce;
+    /** 公司logo */
+    @ApiModelProperty("公司logo")
+    private String logoUrl;
+    /** 营业执照 */
+    @ApiModelProperty("营业执照")
+    private String licenseUrl;
+    /** 统一社会信用代码 */
+    @ApiModelProperty("统一社会信用代码")
+    private String societyCode;
+    /** 省份 */
+    @ApiModelProperty("省份")
+    private String province;
+    /** 城市 */
+    @ApiModelProperty("城市")
+    private String city;
+    /** 区 */
+    @ApiModelProperty("区")
+    private String district;
+    /** 详细地址 */
+    @ApiModelProperty("详细地址")
+    private String address;
+    /** 公司电话 */
+    @ApiModelProperty("公司电话")
+    private String companyPh;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+    /** 邮箱 */
+    @ApiModelProperty("邮箱")
+    private String postBox;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** -1 删除  1正常 */
+    @ApiModelProperty("-1 删除  1正常")
+    private Integer status;
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyEditBo.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 公司管理列编辑对象 recruit_company
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel("公司管理列编辑对象")
+public class RecruitCompanyEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long companyId;
+
+    /** 公司名称 */
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /** 公司类型 */
+    @ApiModelProperty("公司类型")
+    private Long companyTypeId;
+
+    /** 公司规模 */
+    @ApiModelProperty("公司规模")
+    private Long companySizeId;
+
+    /** 行业类别id */
+    @ApiModelProperty("行业类别id")
+    private Long industryTypeId;
+
+    /** 行业类别名字 */
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
+
+    /** 公司介绍 */
+    @ApiModelProperty("公司介绍")
+    private String companyIntroduce;
+
+    /** 公司logo */
+    @ApiModelProperty("公司logo")
+    private String logoUrl;
+
+    /** 营业执照 */
+    @ApiModelProperty("营业执照")
+    private String licenseUrl;
+
+    /** 统一社会信用代码 */
+    @ApiModelProperty("统一社会信用代码")
+    private String societyCode;
+
+    /** 省份 */
+    @ApiModelProperty("省份")
+    private String province;
+
+    /** 城市 */
+    @ApiModelProperty("城市")
+    private String city;
+
+    /** 区 */
+    @ApiModelProperty("区")
+    private String district;
+
+    /** 详细地址 */
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    /** 公司电话 */
+    @ApiModelProperty("公司电话")
+    private String companyPh;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+
+    /** 邮箱 */
+    @ApiModelProperty("邮箱")
+    private String postBox;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** -1 删除  1正常 */
+    @ApiModelProperty("-1 删除  1正常")
+    private Integer status;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyQueryBo.java

@@ -0,0 +1,106 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 公司管理列分页查询对象 recruit_company
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("公司管理列分页查询对象")
+public class RecruitCompanyQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 公司名称 */
+	@ApiModelProperty("公司名称")
+	private Long companyId;
+	/** 公司名称 */
+	@ApiModelProperty("公司名称")
+	private String companyName;
+	/** 公司类型 */
+	@ApiModelProperty("公司类型")
+	private Long companyTypeId;
+	/** 公司规模 */
+	@ApiModelProperty("公司规模")
+	private Long companySizeId;
+	/** 行业类别id */
+	@ApiModelProperty("行业类别id")
+	private Long industryTypeId;
+	/** 行业类别名字 */
+	@ApiModelProperty("行业类别名字")
+	private String industryTypeName;
+	/** 公司介绍 */
+	@ApiModelProperty("公司介绍")
+	private String companyIntroduce;
+	/** 公司logo */
+	@ApiModelProperty("公司logo")
+	private String logoUrl;
+	/** 营业执照 */
+	@ApiModelProperty("营业执照")
+	private String licenseUrl;
+	/** 统一社会信用代码 */
+	@ApiModelProperty("统一社会信用代码")
+	private String societyCode;
+	/** 省份 */
+	@ApiModelProperty("省份")
+	private String province;
+	/** 城市 */
+	@ApiModelProperty("城市")
+	private String city;
+	/** 区 */
+	@ApiModelProperty("区")
+	private String district;
+	/** 详细地址 */
+	@ApiModelProperty("详细地址")
+	private String address;
+	/** 公司电话 */
+	@ApiModelProperty("公司电话")
+	private String companyPh;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String linkMan;
+	/** 邮箱 */
+	@ApiModelProperty("邮箱")
+	private String postBox;
+	/** -1 删除  1正常 */
+	@ApiModelProperty("-1 删除  1正常")
+	private Integer status;
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+
+	/** 公司规模集合 */
+	@ApiModelProperty("公司规模集合")
+	private List<Integer> sizeIds;
+
+	/** 公司类型集合 */
+	@ApiModelProperty("公司类型集合")
+	private List<Integer> typeIds;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyTradeAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 行业类别添加对象 recruit_company_trade
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel("行业类别添加对象")
+public class RecruitCompanyTradeAddBo {
+
+    /** 行业类别 */
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+    /** 父类 0为顶类  1为子类 以此类推 */
+    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+    private Integer father;
+    /** 父类ID */
+    @ApiModelProperty("父类ID")
+    private Long fatherId;
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyTradeEditBo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 行业类别编辑对象 recruit_company_trade
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel("行业类别编辑对象")
+public class RecruitCompanyTradeEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long tradeId;
+
+    /** 行业类别 */
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+
+    /** 父类 0为顶类  1为子类 以此类推 */
+    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+    private Integer father;
+
+    /** 父类ID */
+    @ApiModelProperty("父类ID")
+    private Long fatherId;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyTradeQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 行业类别分页查询对象 recruit_company_trade
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("行业类别分页查询对象")
+public class RecruitCompanyTradeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 行业类别 */
+	@ApiModelProperty("行业类别")
+	private String tradeName;
+	/** 父类 0为顶类  1为子类 以此类推 */
+	@ApiModelProperty("父类 0为顶类  1为子类 以此类推")
+	private Integer father;
+	/** 父类ID */
+	@ApiModelProperty("父类ID")
+	private Long fatherId;
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitIncomeQueryBo.java

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * @author change
+ * @date 2021年08月20日 16:46
+ */
+@Data
+@ApiModel("招聘需求分页查询对象")
+public class RecruitIncomeQueryBo {
+
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewAddBo.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 招聘面试关联添加对象 recruit_interview
+ *
+ * @author ruoyi
+ * @date 2021-08-24
+ */
+@Data
+@ApiModel("招聘面试关联添加对象")
+public class RecruitInterviewAddBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long resumeId;
+    /** 年 */
+    @ApiModelProperty("年")
+    private Integer year;
+    /** 月 */
+    @ApiModelProperty("月")
+    private Integer month;
+    /** 日 */
+    @ApiModelProperty("日")
+    private Integer day;
+    /** 时间段开始 */
+    @ApiModelProperty("时间段开始")
+    private Long timingStart;
+    /** 时间段结束 */
+    @ApiModelProperty("时间段结束")
+    private Long timingEnd;
+    /** 面试需求岗位ID */
+    @ApiModelProperty("面试需求岗位ID")
+    private Long needsId;
+    /** 面试简历json */
+    @ApiModelProperty("面试简历json")
+    private String resumeJson;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    private Integer status;
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+    /** 面试用户id */
+    @ApiModelProperty("面试用户id")
+    private Long userId;
+    /** 附件简历 */
+    @ApiModelProperty("附件简历")
+    private String attachUrl;
+    /** 拒绝理由 */
+    @ApiModelProperty("拒绝理由")
+    private String refuse;
+    /** 面试时间 */
+    @ApiModelProperty("面试时间")
+    private Long resumeTime;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+    /** 公司 */
+    @ApiModelProperty("公司")
+    private String companyName;
+    /** 转发邮箱 */
+    @ApiModelProperty("转发邮箱")
+    private String emall;
+    /** 开始工作年  例如 2019 */
+    @ApiModelProperty("开始工作年  例如 2019")
+    private Long startYear;
+    /** 出生年月 */
+    @ApiModelProperty("出生年月")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date userBirth;
+    /** 教育层次 */
+    @ApiModelProperty("教育层次")
+    private String eduLevel;
+    /** 简历完成度 */
+    @ApiModelProperty("简历完成度")
+    private Integer completeness;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewEditBo.java

@@ -0,0 +1,120 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 招聘面试关联编辑对象 recruit_interview
+ *
+ * @author ruoyi
+ * @date 2021-08-24
+ */
+@Data
+@ApiModel("招聘面试关联编辑对象")
+public class RecruitInterviewEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long interviewId;
+
+    /** 年 */
+    @ApiModelProperty("年")
+    private Integer year;
+
+    /** 月 */
+    @ApiModelProperty("月")
+    private Integer month;
+
+    /** 日 */
+    @ApiModelProperty("日")
+    private Integer day;
+
+    /** 时间段开始 */
+    @ApiModelProperty("时间段开始")
+    private Long timingStart;
+
+    /** 时间段结束 */
+    @ApiModelProperty("时间段结束")
+    private Long timingEnd;
+
+    /** 面试需求岗位ID */
+    @ApiModelProperty("面试需求岗位ID")
+    private Long needsId;
+
+    /** 面试简历json */
+    @ApiModelProperty("面试简历json")
+    private String resumeJson;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    private Integer status;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+
+    /** 面试用户id */
+    @ApiModelProperty("面试用户id")
+    private Long userId;
+
+    /** 附件简历 */
+    @ApiModelProperty("附件简历")
+    private String attachUrl;
+
+    /** 拒绝理由 */
+    @ApiModelProperty("拒绝理由")
+    private String refuse;
+
+    /** 面试时间 */
+    @ApiModelProperty("面试时间")
+    private Long resumeTime;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+
+    /** 公司 */
+    @ApiModelProperty("公司")
+    private String companyName;
+
+    /** 转发邮箱 */
+    @ApiModelProperty("转发邮箱")
+    private String emall;
+
+    /** 开始工作年  例如 2019 */
+    @ApiModelProperty("开始工作年  例如 2019")
+    private Long startYear;
+
+    /** 出生年月 */
+    @ApiModelProperty("出生年月")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date userBirth;
+
+    /** 教育层次 */
+    @ApiModelProperty("教育层次")
+    private String eduLevel;
+
+    /** 简历完成度 */
+    @ApiModelProperty("简历完成度")
+    private Integer completeness;
+
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewLogAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 recruit_interview_log
+ *
+ * @author ruoyi
+ * @date 2021-08-25
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class RecruitInterviewLogAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long interviewId;
+    /** 1邀请面试 2查看简历 3投递简历 */
+    @ApiModelProperty("1邀请面试 2查看简历 3投递简历")
+    private Integer status;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 后台用户ID */
+    @ApiModelProperty("后台用户ID")
+    private Long sysUserId;
+    /** 小程序用户id */
+    @ApiModelProperty("小程序用户id")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewLogEditBo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 recruit_interview_log
+ *
+ * @author ruoyi
+ * @date 2021-08-25
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class RecruitInterviewLogEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long interviewId;
+
+    /** 1邀请面试 2查看简历 3投递简历 */
+    @ApiModelProperty("1邀请面试 2查看简历 3投递简历")
+    private Integer status;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 后台用户ID */
+    @ApiModelProperty("后台用户ID")
+    private Long sysUserId;
+
+    /** 小程序用户id */
+    @ApiModelProperty("小程序用户id")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewLogQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】分页查询对象 recruit_interview_log
+ *
+ * @author ruoyi
+ * @date 2021-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class RecruitInterviewLogQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long interviewId;
+	/** 1邀请面试 2查看简历 3投递简历 */
+	@ApiModelProperty("1邀请面试 2查看简历 3投递简历")
+	private Integer status;
+	/** 后台用户ID */
+	@ApiModelProperty("后台用户ID")
+	private Long sysUserId;
+	/** 小程序用户id */
+	@ApiModelProperty("小程序用户id")
+	private Long userId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewQueryBo.java

@@ -0,0 +1,181 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.*;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 招聘面试关联分页查询对象 recruit_interview
+ *
+ * @author ruoyi
+ * @date 2021-08-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("招聘面试关联分页查询对象")
+public class RecruitInterviewQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+
+	/** 岗位 */
+	@ApiModelProperty("岗位")
+	private String job;
+
+	/** 政治面貌 */
+	@ApiModelProperty("政治面貌")
+	private String politic;
+
+	/** 结婚状态 */
+	@ApiModelProperty("结婚状态")
+	private String marry;
+
+	/** 性别 */
+	@ApiModelProperty(" 性别 1男 2女")
+	private Long sex;
+	/** 年 */
+	@ApiModelProperty("年")
+	private Integer year;
+	/** 月 */
+	@ApiModelProperty("月")
+	private Integer month;
+	/** 日 */
+	@ApiModelProperty("日")
+	private Integer day;
+	/** 时间段开始 */
+	@ApiModelProperty("时间段开始")
+	private Long timingStart;
+	/** 时间段结束 */
+	@ApiModelProperty("时间段结束")
+	private Long timingEnd;
+	/** 面试需求岗位ID */
+	@ApiModelProperty("面试需求岗位ID")
+	private Long needsId;
+	/** 面试简历json */
+	@ApiModelProperty("面试简历json")
+	private String resumeJson;
+	/** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	private Integer status;
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+	/** 面试用户id */
+	@ApiModelProperty("面试用户id")
+	private Long userId;
+	/** 附件简历 */
+	@ApiModelProperty("附件简历")
+	private String attachUrl;
+	/** 拒绝理由 */
+	@ApiModelProperty("拒绝理由")
+	private String refuse;
+	/** 面试时间 */
+	@ApiModelProperty("面试时间")
+	private Long resumeTime;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String linkMan;
+	/** 联系电话 */
+	@ApiModelProperty("联系电话")
+	private String linkTel;
+	/** 公司 */
+	@ApiModelProperty("公司")
+	private String companyName;
+	/** 转发邮箱 */
+	@ApiModelProperty("转发邮箱")
+	private String emall;
+	/** 开始工作年  例如 2019 */
+	@ApiModelProperty("开始工作年  例如 2019")
+	private Long startYear;
+
+	/** 工作年限开始 */
+	@ApiModelProperty("工作年限开始")
+	private Long workStart;
+
+	/** 工作年限结束 */
+	@ApiModelProperty("工作年限结束")
+	private Long workEnd;
+	/** 出生年月 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("出生年月")
+	private Date userBirth;
+
+	/** 开始工作年  例如 2019 */
+	@ApiModelProperty("年龄开始")
+	private Long ageStart;
+
+	/** 开始工作年  例如 2019 */
+	@ApiModelProperty("年龄结束")
+	private Long ageEnd;
+	/** 教育层次 */
+	@ApiModelProperty("教育层次")
+	private String eduLevel;
+	/** 简历完成度 */
+	@ApiModelProperty("简历完成度")
+	private Integer completeness;
+	/** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	private List<Integer> statusIds;
+
+	/** 区 */
+	@ApiModelProperty("区")
+	private String district;
+	/** 省份 */
+	@ApiModelProperty("省份")
+	private String province;
+	/** 城市 */
+	@ApiModelProperty("城市")
+	private String city;
+
+	/** 户籍省份 */
+	@ApiModelProperty("户籍省份")
+	private String houseProvince;
+
+	/** 户籍城市 */
+	@ApiModelProperty("户籍城市")
+	private String houseCity;
+
+	/** 户籍区 */
+	@ApiModelProperty("户籍区")
+	private String houseDistrict;
+
+	/** 公司区 */
+	@Excel(name = "公司区")
+	@ApiModelProperty("公司区")
+	private String companyDistrict;
+	/** 公司城市 */
+	@Excel(name = "公司城市")
+	@ApiModelProperty("公司城市")
+	private String companyCity;
+
+
+
+	/** 公司省份 */
+	@ApiModelProperty("公司省份")
+	private String companyProvince;
+
+	/** 公司地址 */
+	@ApiModelProperty("公司地址")
+	private String companyAddress;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsAddBo.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 招聘需求添加对象 recruit_needs
+ *
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Data
+@ApiModel("招聘需求添加对象")
+public class RecruitNeedsAddBo {
+
+    /** 公司ID，母公司ID为0 */
+    @ApiModelProperty("公司ID，母公司ID为0")
+    private Long companyId;
+    /** 岗位 */
+    @ApiModelProperty("岗位")
+    private String job;
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
+    /** 工作职责 */
+    @ApiModelProperty("工作职责")
+    private String duty;
+    /** 任职要求 */
+    @ApiModelProperty("任职要求")
+    private String requirement;
+    /** 福利，多个,拼接 */
+    @ApiModelProperty("福利，多个,拼接")
+    private String welfare;
+    /** 岗位关键词 */
+    @ApiModelProperty("岗位关键词")
+    private String jobKey;
+    /** 工作年限字典值 */
+    @ApiModelProperty("工作年限字典值")
+    private String workingYearsDict;
+    /** 工作年限起 */
+    @ApiModelProperty("工作年限起")
+    private Integer workingYearsStart;
+    /** 工作年限结束 */
+    @ApiModelProperty("工作年限结束")
+    private Integer workingYearsEnd;
+    /** 最低学历字典值 */
+    @ApiModelProperty("最低学历字典值")
+    private String minimumEduDict;
+    /** 专业 */
+    @ApiModelProperty("专业")
+    private String major;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 0 失效 1启用 */
+    @ApiModelProperty("0 停止 1未发布 2已发布")
+    private Integer status;
+    /** 1月薪 2年薪 */
+    @ApiModelProperty("1月薪 2年薪")
+    private Integer incomeType;
+    /** 省份 */
+    @ApiModelProperty("省份")
+    private String province;
+    /** 城市 */
+    @ApiModelProperty("城市")
+    private String city;
+    /** 区 */
+    @ApiModelProperty("区")
+    private String district;
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+    /** 招聘人数 */
+    @ApiModelProperty("招聘人数")
+    private Long peopleNum;
+    /** 工作性质，多个,拼接 */
+    @ApiModelProperty("工作性质，多个,拼接")
+    private String jobNature;
+    /** 加分证书，多个,拼接 */
+    @ApiModelProperty("加分证书，多个,拼接")
+    private String bonusCertificate;
+    /** 是否加急 0不是 1是 */
+    @ApiModelProperty("是否加急 0不是 1是")
+    private Integer isUrgent;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsEditBo.java

@@ -0,0 +1,137 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 招聘需求编辑对象 recruit_needs
+ *
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Data
+@ApiModel("招聘需求编辑对象")
+public class RecruitNeedsEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 公司ID，母公司ID为0 */
+    @ApiModelProperty("公司ID，母公司ID为0")
+    private Long companyId;
+
+    /** 岗位 */
+    @ApiModelProperty("岗位")
+    private String job;
+
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
+
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
+
+    /** 工作职责 */
+    @ApiModelProperty("工作职责")
+    private String duty;
+
+    /** 任职要求 */
+    @ApiModelProperty("任职要求")
+    private String requirement;
+
+    /** 福利，多个,拼接 */
+    @ApiModelProperty("福利，多个,拼接")
+    private String welfare;
+
+    /** 岗位关键词 */
+    @ApiModelProperty("岗位关键词")
+    private String jobKey;
+
+    /** 工作年限字典值 */
+    @ApiModelProperty("工作年限字典值")
+    private String workingYearsDict;
+
+    /** 工作年限起 */
+    @ApiModelProperty("工作年限起")
+    private Integer workingYearsStart;
+
+    /** 工作年限结束 */
+    @ApiModelProperty("工作年限结束")
+    private Integer workingYearsEnd;
+
+    /** 最低学历字典值 */
+    @ApiModelProperty("最低学历字典值")
+    private String minimumEduDict;
+
+    /** 专业 */
+    @ApiModelProperty("专业")
+    private String major;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 0 失效 1启用 */
+    @ApiModelProperty("0 停止 1未发布 2已发布")
+    private Integer status;
+
+    /** 1月薪 2年薪 */
+    @ApiModelProperty("1月薪 2年薪")
+    private Integer incomeType;
+
+    /** 省份 */
+    @ApiModelProperty("省份")
+    private String province;
+
+    /** 城市 */
+    @ApiModelProperty("城市")
+    private String city;
+
+    /** 区 */
+    @ApiModelProperty("区")
+    private String district;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+
+    /** 招聘人数 */
+    @ApiModelProperty("招聘人数")
+    private Long peopleNum;
+
+    /** 工作性质，多个,拼接 */
+    @ApiModelProperty("工作性质，多个,拼接")
+    private String jobNature;
+
+    /** 加分证书，多个,拼接 */
+    @ApiModelProperty("加分证书，多个,拼接")
+    private String bonusCertificate;
+
+    /** 是否加急 0不是 1是 */
+    @ApiModelProperty("是否加急 0不是 1是")
+    private Integer isUrgent;
+
+    /** 发布时间 */
+    @ApiModelProperty("发布时间")
+    private Long pushTime;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+
+    /** 发布人 */
+    @ApiModelProperty("发布人")
+    private String pushMan;
+}