fix 企业

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

@@ -1,36 +1,29 @@
-package com.zhongzheng.controller.conpany;
+package com.zhongzheng.controller.recruit;
 
-import java.io.IOException;
-import java.util.List;
-
-import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
-import com.zhongzheng.modules.company.service.ICompanyTradeService;
-import com.zhongzheng.modules.company.vo.CompanyTradeVo;
-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.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.company.vo.CompanyVo;
-import com.zhongzheng.modules.company.bo.CompanyQueryBo;
-import com.zhongzheng.modules.company.bo.CompanyAddBo;
-import com.zhongzheng.modules.company.bo.CompanyEditBo;
-import com.zhongzheng.modules.company.service.ICompanyService;
 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.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
@@ -42,12 +35,12 @@ import javax.servlet.http.HttpServletRequest;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/companyCon")
-public class CompanyController extends BaseController {
+public class RecruitCompanyController extends BaseController {
 
-    private final ICompanyService iCompanyService;
+    private final IRecruitCompanyService iRecruitCompanyService;
 
 
-    private final ICompanyTradeService iCompanyTradeService;
+    private final IRecruitCompanyTradeService iRecruitCompanyTradeService;
 
 
     /**
@@ -56,9 +49,9 @@ public class CompanyController extends BaseController {
     @ApiOperation("查询公司管理列列表")
     @PreAuthorize("@ss.hasPermi('modules.company:company:list')")
     @GetMapping("/list")
-    public TableDataInfo<CompanyVo> list(CompanyQueryBo bo) {
+    public TableDataInfo<RecruitCompanyVo> list(RecruitCompanyQueryBo bo) {
         startPage();
-        List<CompanyVo> list = iCompanyService.queryList(bo);
+        List<RecruitCompanyVo> list = iRecruitCompanyService.queryList(bo);
         return getDataTable(list);
     }
 
@@ -70,9 +63,9 @@ public class CompanyController extends BaseController {
     @ApiOperation("查询行业类别列表")
     @PreAuthorize("@ss.hasPermi('system:trade:list')")
     @GetMapping("/listTrade")
-    public TableDataInfo<CompanyTradeVo> list(CompanyTradeQueryBo bo) {
+    public TableDataInfo<RecruitCompanyTradeVo> list(RecruitCompanyTradeQueryBo bo) {
         startPage();
-        List<CompanyTradeVo> list = iCompanyTradeService.queryCompanyTradeVo(bo);
+        List<RecruitCompanyTradeVo> list = iRecruitCompanyTradeService.queryCompanyTradeVo(bo);
         return getDataTable(list);
     }
 
@@ -83,8 +76,8 @@ public class CompanyController extends BaseController {
     @ApiOperation("获取公司管理列详细信息")
     @PreAuthorize("@ss.hasPermi('modules.company:company:query')")
     @GetMapping("/{companyId}")
-    public AjaxResult<CompanyVo> getInfo(@PathVariable("companyId" ) Long companyId) {
-        return AjaxResult.success(iCompanyService.queryById(companyId));
+    public AjaxResult<RecruitCompanyVo> getInfo(@PathVariable("companyId" ) Long companyId) {
+        return AjaxResult.success(iRecruitCompanyService.queryById(companyId));
     }
 
     /**
@@ -94,8 +87,8 @@ public class CompanyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('modules.company:company:add')")
     @Log(title = "公司管理列", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult<Void> add(@RequestBody CompanyAddBo bo) {
-        return toAjax(iCompanyService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Void> add(@RequestBody RecruitCompanyAddBo bo) {
+        return toAjax(iRecruitCompanyService.insertByAddBo(bo) ? 1 : 0);
     }
 
     /**
@@ -105,15 +98,15 @@ public class CompanyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('modules.company:company:edit')")
     @Log(title = "公司管理列", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CompanyEditBo bo) {
-        return toAjax(iCompanyService.updateByEditBo(bo) ? 1 : 0);
+    public AjaxResult<Void> edit(@RequestBody RecruitCompanyEditBo bo) {
+        return toAjax(iRecruitCompanyService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
      * 导入公司
      */
     @ApiOperation("导入公司")
-    @PreAuthorize("@ss.hasPermi('modules.company:company:edit')")
+    @PreAuthorize("@ss.hasPermi('modules.company:company:add')")
     @Log(title = "公司管理列", businessType = BusinessType.INSERT)
     @PostMapping("/importExcel")
     public AjaxResult<Void> exc(MultipartFile file, HttpServletRequest request) throws IOException {
@@ -131,7 +124,7 @@ public class CompanyController extends BaseController {
             throw new RuntimeException("请上传正确格式的文件");
         }
 
-        Boolean excel = iCompanyService.batchImport(file);
+        Boolean excel = iRecruitCompanyService.batchImport(file);
 
         return toAjax(excel ? 1: 0);
     }

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

@@ -0,0 +1,95 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.recruit.vo.CalendarInterviewVo;
+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("/modules.recruit/interview")
+public class RecruitInterviewController extends BaseController {
+
+    private final IRecruitInterviewService iRecruitInterviewService;
+
+    /**
+     * 查询招聘面试关联列表
+     */
+    @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)
+    @PostMapping("/export")
+    public AjaxResult<RecruitInterviewVo> export(RecruitInterviewQueryBo bo) {
+        List<RecruitInterviewVo> list = iRecruitInterviewService.queryList(bo);
+        ExcelUtil<RecruitInterviewVo> util = new ExcelUtil<RecruitInterviewVo>(RecruitInterviewVo.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);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/mapper/CompanyMapper.java

@@ -1,16 +0,0 @@
-package com.zhongzheng.modules.company.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.company.domain.Company;
-
-/**
- * 公司管理列Mapper接口
- *
- * @author ruoyi
- * @date 2021-08-12
- */
-public interface CompanyMapper extends BaseMapper<Company> {
-
-
-    Long selectIndustry(String industry);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/mapper/CompanyTradeMapper.java

@@ -1,19 +0,0 @@
-package com.zhongzheng.modules.company.mapper;
-
-import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
-import com.zhongzheng.modules.company.domain.CompanyTrade;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.company.vo.CompanyTradeVo;
-
-import java.util.List;
-
-/**
- * 行业类别Mapper接口
- *
- * @author change
- * @date 2021-08-16
- */
-public interface CompanyTradeMapper extends BaseMapper<CompanyTrade> {
-
-    List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/ICompanyTradeService.java

@@ -1,58 +0,0 @@
-package com.zhongzheng.modules.company.service;
-
-import com.zhongzheng.modules.company.domain.CompanyTrade;
-import com.zhongzheng.modules.company.vo.CompanyTradeVo;
-import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
-import com.zhongzheng.modules.company.bo.CompanyTradeAddBo;
-import com.zhongzheng.modules.company.bo.CompanyTradeEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 行业类别Service接口
- *
- * @author change
- * @date 2021-08-16
- */
-public interface ICompanyTradeService extends IService<CompanyTrade> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	CompanyTradeVo queryById(Long tradeId);
-
-	/**
-	 * 查询列表
-	 */
-	List<CompanyTradeVo> queryList(CompanyTradeQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入行业类别
-	 * @param bo 行业类别新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(CompanyTradeAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改行业类别
-	 * @param bo 行业类别编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(CompanyTradeEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-
-	/**
-	 * 查询列表
-	 */
-    List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyTradeServiceImpl.java

@@ -1,108 +0,0 @@
-package com.zhongzheng.modules.company.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.company.bo.CompanyTradeAddBo;
-import com.zhongzheng.modules.company.bo.CompanyTradeQueryBo;
-import com.zhongzheng.modules.company.bo.CompanyTradeEditBo;
-import com.zhongzheng.modules.company.domain.CompanyTrade;
-import com.zhongzheng.modules.company.mapper.CompanyTradeMapper;
-import com.zhongzheng.modules.company.vo.CompanyTradeVo;
-import com.zhongzheng.modules.company.service.ICompanyTradeService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 行业类别Service业务层处理
- *
- * @author change
- * @date 2021-08-16
- */
-@Service
-public class CompanyTradeServiceImpl extends ServiceImpl<CompanyTradeMapper, CompanyTrade> implements ICompanyTradeService {
-
-    @Override
-    public CompanyTradeVo queryById(Long tradeId){
-        CompanyTrade db = this.baseMapper.selectById(tradeId);
-        return BeanUtil.toBean(db, CompanyTradeVo.class);
-    }
-
-    @Override
-    public List<CompanyTradeVo> queryList(CompanyTradeQueryBo bo) {
-        LambdaQueryWrapper<CompanyTrade> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getTradeName()), CompanyTrade::getTradeName, bo.getTradeName());
-        lqw.eq(bo.getFather() != null, CompanyTrade::getFather, bo.getFather());
-        lqw.eq(bo.getFatherId() != null, CompanyTrade::getFatherId, bo.getFatherId());
-        lqw.eq(bo.getTenantId() != null, CompanyTrade::getTenantId, bo.getTenantId());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<CompanyTradeVo> entity2Vo(Collection<CompanyTrade> collection) {
-        List<CompanyTradeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, CompanyTradeVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<CompanyTrade> page = (Page<CompanyTrade>)collection;
-            Page<CompanyTradeVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(CompanyTradeAddBo bo) {
-        CompanyTrade add = BeanUtil.toBean(bo, CompanyTrade.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(CompanyTradeEditBo bo) {
-        CompanyTrade update = BeanUtil.toBean(bo, CompanyTrade.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(CompanyTrade entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public List<CompanyTradeVo> queryCompanyTradeVo(CompanyTradeQueryBo bo) {
-        List<CompanyTradeVo> companyTradeVos = baseMapper.queryCompanyTradeVo(bo);
-        return companyTradeVos;
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyTradeSonVo.java

@@ -1,55 +0,0 @@
-package com.zhongzheng.modules.company.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 行业类别视图对象 mall_package
- *
- * @author change
- * @date 2021-08-16
- */
-@Data
-@ApiModel("行业类别视图对象")
-public class CompanyTradeSonVo {
-    private static final long serialVersionUID = 1L;
-
-    /** $pkColumn.columnComment */
-    @ApiModelProperty("$pkColumn.columnComment")
-    private Long tradeId;
-
-    /** 行业类别 */
-    @Excel(name = "行业类别")
-    @ApiModelProperty("行业类别")
-    private String tradeName;
-    /** 父类 0为顶类  1为子类 以此类推 */
-    @Excel(name = "父类 0为顶类  1为子类 以此类推")
-    @ApiModelProperty("父类 0为顶类  1为子类 以此类推")
-    private Integer father;
-    /** 父类ID */
-    @Excel(name = "父类ID")
-    @ApiModelProperty("父类ID")
-    private Long fatherId;
-    /** 商户ID */
-    @Excel(name = "商户ID")
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
-
-
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** 修改时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-}

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,14 +9,14 @@ import java.util.Date;
 
 
 /**
- * 公司管理列添加对象 company
+ * 公司管理列添加对象 recruit_company
  *
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("公司管理列添加对象")
-public class CompanyAddBo {
+public class RecruitCompanyAddBo {
 
     /** 公司名称 */
     @ApiModelProperty("公司名称")
@@ -30,12 +30,12 @@ public class CompanyAddBo {
     /** 行业类别id */
     @ApiModelProperty("行业类别id")
     private Long industryTypeId;
-    /** 公司介绍 */
-    @ApiModelProperty("公司介绍")
-    private String companyIntroduce;
     /** 行业类别名字 */
     @ApiModelProperty("行业类别名字")
     private String industryTypeName;
+    /** 公司介绍 */
+    @ApiModelProperty("公司介绍")
+    private String companyIntroduce;
     /** 公司logo */
     @ApiModelProperty("公司logo")
     private String logoUrl;
@@ -51,8 +51,7 @@ public class CompanyAddBo {
     /** 城市 */
     @ApiModelProperty("城市")
     private String city;
-
-    /** 城市 */
+    /** 区 */
     @ApiModelProperty("区")
     private String district;
     /** 详细地址 */
@@ -73,8 +72,8 @@ public class CompanyAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
-    /** 0 删除 1有效 */
-    @ApiModelProperty("0 删除 1有效")
+    /** -1 删除  1正常 */
+    @ApiModelProperty("-1 删除  1正常")
     private Integer status;
     /** 商户ID */
     @ApiModelProperty("商户ID")

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,14 +8,14 @@ import java.util.Date;
 
 
 /**
- * 公司管理列编辑对象 company
+ * 公司管理列编辑对象 recruit_company
  *
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("公司管理列编辑对象")
-public class CompanyEditBo {
+public class RecruitCompanyEditBo {
 
 
     /** $column.columnComment */
@@ -38,14 +38,14 @@ public class CompanyEditBo {
     @ApiModelProperty("行业类别id")
     private Long industryTypeId;
 
-    /** 公司介绍 */
-    @ApiModelProperty("公司介绍")
-    private String companyIntroduce;
-
     /** 行业类别名字 */
     @ApiModelProperty("行业类别名字")
     private String industryTypeName;
 
+    /** 公司介绍 */
+    @ApiModelProperty("公司介绍")
+    private String companyIntroduce;
+
     /** 公司logo */
     @ApiModelProperty("公司logo")
     private String logoUrl;
@@ -65,7 +65,8 @@ public class CompanyEditBo {
     /** 城市 */
     @ApiModelProperty("城市")
     private String city;
-    /** 城市 */
+
+    /** 区 */
     @ApiModelProperty("区")
     private String district;
 
@@ -89,8 +90,8 @@ public class CompanyEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 0 删除 1有效 */
-    @ApiModelProperty("0 删除 1有效")
+    /** -1 删除  1正常 */
+    @ApiModelProperty("-1 删除  1正常")
     private Integer status;
 
     /** 商户ID */

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,15 +12,15 @@ import java.util.HashMap;
 import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
- * 公司管理列分页查询对象 company
+ * 公司管理列分页查询对象 recruit_company
  *
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("公司管理列分页查询对象")
-public class CompanyQueryBo extends BaseEntity {
+public class RecruitCompanyQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
@@ -48,12 +48,12 @@ public class CompanyQueryBo extends BaseEntity {
 	/** 行业类别id */
 	@ApiModelProperty("行业类别id")
 	private Long industryTypeId;
-	/** 公司介绍 */
-	@ApiModelProperty("公司介绍")
-	private String companyIntroduce;
 	/** 行业类别名字 */
 	@ApiModelProperty("行业类别名字")
 	private String industryTypeName;
+	/** 公司介绍 */
+	@ApiModelProperty("公司介绍")
+	private String companyIntroduce;
 	/** 公司logo */
 	@ApiModelProperty("公司logo")
 	private String logoUrl;
@@ -69,8 +69,7 @@ public class CompanyQueryBo extends BaseEntity {
 	/** 城市 */
 	@ApiModelProperty("城市")
 	private String city;
-
-	/** 城市 */
+	/** 区 */
 	@ApiModelProperty("区")
 	private String district;
 	/** 详细地址 */
@@ -85,8 +84,8 @@ public class CompanyQueryBo extends BaseEntity {
 	/** 邮箱 */
 	@ApiModelProperty("邮箱")
 	private String postBox;
-	/** 0 删除 1有效 */
-	@ApiModelProperty("0 删除 1有效")
+	/** -1 删除  1正常 */
+	@ApiModelProperty("-1 删除  1正常")
 	private Integer status;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,14 +9,14 @@ import java.util.Date;
 
 
 /**
- * 行业类别添加对象 company_trade
+ * 行业类别添加对象 recruit_company_trade
  *
- * @author change
- * @date 2021-08-16
+ * @author ruoyi
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("行业类别添加对象")
-public class CompanyTradeAddBo {
+public class RecruitCompanyTradeAddBo {
 
     /** 行业类别 */
     @ApiModelProperty("行业类别")
@@ -30,4 +30,10 @@ public class CompanyTradeAddBo {
     /** 商户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/company/bo/CompanyTradeEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyTradeEditBo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,14 +8,14 @@ import java.util.Date;
 
 
 /**
- * 行业类别编辑对象 company_trade
+ * 行业类别编辑对象 recruit_company_trade
  *
- * @author change
- * @date 2021-08-16
+ * @author ruoyi
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("行业类别编辑对象")
-public class CompanyTradeEditBo {
+public class RecruitCompanyTradeEditBo {
 
 
     /** $column.columnComment */
@@ -37,4 +37,8 @@ public class CompanyTradeEditBo {
     /** 商户ID */
     @ApiModelProperty("商户ID")
     private Long tenantId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
 }

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

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.bo;
+package com.zhongzheng.modules.recruit.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,15 +12,15 @@ import java.util.HashMap;
 import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
- * 行业类别分页查询对象 company_trade
+ * 行业类别分页查询对象 recruit_company_trade
  *
- * @author change
- * @date 2021-08-16
+ * @author ruoyi
+ * @date 2021-08-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("行业类别分页查询对象")
-public class CompanyTradeQueryBo extends BaseEntity {
+public class RecruitCompanyTradeQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")

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

@@ -0,0 +1,51 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Data
+@ApiModel("招聘面试关联添加对象")
+public class RecruitInterviewAddBo {
+
+    /** 年 */
+    @ApiModelProperty("年")
+    private Integer year;
+    /** 月 */
+    @ApiModelProperty("月")
+    private Integer moth;
+    /** 日 */
+    @ApiModelProperty("日")
+    private Integer day;
+    /** 时间段开始 */
+    @ApiModelProperty("时间段开始")
+    private String timingStart;
+    /** 时间段结束 */
+    @ApiModelProperty("时间段结束")
+    private String timingEnd;
+    /** 面试需求岗位ID */
+    @ApiModelProperty("面试需求岗位ID")
+    private Long needsId;
+    /** 面试简历ID */
+    @ApiModelProperty("面试简历ID")
+    private Long resumeId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    private Integer status;
+}

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

@@ -0,0 +1,60 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Data
+@ApiModel("招聘面试关联编辑对象")
+public class RecruitInterviewEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long interviewId;
+
+    /** 年 */
+    @ApiModelProperty("年")
+    private Integer year;
+
+    /** 月 */
+    @ApiModelProperty("月")
+    private Integer moth;
+
+    /** 日 */
+    @ApiModelProperty("日")
+    private Integer day;
+
+    /** 时间段开始 */
+    @ApiModelProperty("时间段开始")
+    private String timingStart;
+
+    /** 时间段结束 */
+    @ApiModelProperty("时间段结束")
+    private String timingEnd;
+
+    /** 面试需求岗位ID */
+    @ApiModelProperty("面试需求岗位ID")
+    private Long needsId;
+
+    /** 面试简历ID */
+    @ApiModelProperty("面试简历ID")
+    private Long resumeId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    private Integer status;
+}

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

@@ -0,0 +1,64 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@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 Integer year;
+	/** 月 */
+	@ApiModelProperty("月")
+	private Integer moth;
+	/** 日 */
+	@ApiModelProperty("日")
+	private Integer day;
+	/** 时间段开始 */
+	@ApiModelProperty("时间段开始")
+	private String timingStart;
+	/** 时间段结束 */
+	@ApiModelProperty("时间段结束")
+	private String timingEnd;
+	/** 面试需求岗位ID */
+	@ApiModelProperty("面试需求岗位ID")
+	private Long needsId;
+	/** 面试简历ID */
+	@ApiModelProperty("面试简历ID")
+	private Long resumeId;
+	/** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/domain/Company.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitCompany.java

@@ -1,7 +1,6 @@
-package com.zhongzheng.modules.company.domain;
+package com.zhongzheng.modules.recruit.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -11,16 +10,16 @@ import java.math.BigDecimal;
 import com.zhongzheng.common.annotation.Excel;
 
 /**
- * 公司管理列对象 company
+ * 公司管理列对象 recruit_company
  * 
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("company")
-public class Company implements Serializable {
+@TableName("recruit_company")
+public class RecruitCompany implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -41,12 +40,12 @@ private static final long serialVersionUID=1L;
     /** 行业类别id */
     private Long industryTypeId;
 
-    /** 公司介绍 */
-    private String companyIntroduce;
-
     /** 行业类别名字 */
     private String industryTypeName;
 
+    /** 公司介绍 */
+    private String companyIntroduce;
+
     /** 公司logo */
     private String logoUrl;
 
@@ -62,7 +61,7 @@ private static final long serialVersionUID=1L;
     /** 城市 */
     private String city;
 
-    /** 城市 */
+    /** 区 */
     private String district;
 
     /** 详细地址 */
@@ -85,7 +84,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
-    /** 0 删除 1有效 */
+    /** -1 删除  1正常 */
     private Integer status;
 
     /** 商户ID */

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/domain/CompanyTrade.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitCompanyTrade.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.domain;
+package com.zhongzheng.modules.recruit.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -10,16 +10,16 @@ import java.math.BigDecimal;
 import com.zhongzheng.common.annotation.Excel;
 
 /**
- * 行业类别对象 company_trade
+ * 行业类别对象 recruit_company_trade
  * 
- * @author change
- * @date 2021-08-16
+ * @author ruoyi
+ * @date 2021-08-19
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("company_trade")
-public class CompanyTrade implements Serializable {
+@TableName("recruit_company_trade")
+public class RecruitCompanyTrade implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -40,12 +40,11 @@ private static final long serialVersionUID=1L;
     /** 商户ID */
     private Long tenantId;
 
-
-    /** 创建时间 */
+    /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
 
-    /** 修改时间 */
+    /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitInterview.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.recruit.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 招聘面试关联对象 recruit_interview
+ * 
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("recruit_interview")
+public class RecruitInterview implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "interview_id")
+    private Long interviewId;
+
+    /** 年 */
+    private Integer year;
+
+    /** 月 */
+    private Integer moth;
+
+    /** 日 */
+    private Integer day;
+
+    /** 时间段开始 */
+    private String timingStart;
+
+    /** 时间段结束 */
+    private String timingEnd;
+
+    /** 面试需求岗位ID */
+    private Long needsId;
+
+    /** 面试简历ID */
+    private Long resumeId;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/mapper/RecruitCompanyMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.recruit.mapper;
+
+import com.zhongzheng.modules.recruit.domain.RecruitCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 公司管理列Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+public interface RecruitCompanyMapper extends BaseMapper<RecruitCompany> {
+
+    Long selectIndustry(String toString);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/mapper/RecruitCompanyTradeMapper.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.recruit.mapper;
+
+
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+
+import java.util.List;
+
+/**
+ * 行业类别Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+public interface RecruitCompanyTradeMapper extends BaseMapper<RecruitCompanyTrade> {
+
+    List<RecruitCompanyTradeVo> queryCompanyTradeVo(RecruitCompanyTradeQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/mapper/RecruitInterviewMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.recruit.mapper;
+
+import com.zhongzheng.modules.recruit.domain.RecruitInterview;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 招聘面试关联Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+public interface RecruitInterviewMapper extends BaseMapper<RecruitInterview> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/ICompanyService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/IRecruitCompanyService.java

@@ -1,10 +1,10 @@
-package com.zhongzheng.modules.company.service;
+package com.zhongzheng.modules.recruit.service;
 
-import com.zhongzheng.modules.company.domain.Company;
-import com.zhongzheng.modules.company.vo.CompanyVo;
-import com.zhongzheng.modules.company.bo.CompanyQueryBo;
-import com.zhongzheng.modules.company.bo.CompanyAddBo;
-import com.zhongzheng.modules.company.bo.CompanyEditBo;
+import com.zhongzheng.modules.recruit.domain.RecruitCompany;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,33 +16,33 @@ import java.util.List;
  * 公司管理列Service接口
  *
  * @author ruoyi
- * @date 2021-08-12
+ * @date 2021-08-19
  */
-public interface ICompanyService extends IService<Company> {
+public interface IRecruitCompanyService extends IService<RecruitCompany> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	CompanyVo queryById(Long companyId);
+	RecruitCompanyVo queryById(Long companyId);
 
 	/**
 	 * 查询列表
 	 */
-	List<CompanyVo> queryList(CompanyQueryBo bo);
+	List<RecruitCompanyVo> queryList(RecruitCompanyQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入公司管理列
 	 * @param bo 公司管理列新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(CompanyAddBo bo);
+	Boolean insertByAddBo(RecruitCompanyAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改公司管理列
 	 * @param bo 公司管理列编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(CompanyEditBo bo);
+	Boolean updateByEditBo(RecruitCompanyEditBo bo);
 
 	/**
 	 * 校验并删除数据
@@ -52,10 +52,5 @@ public interface ICompanyService extends IService<Company> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-	/**
-	 * 导入数据
-	 * @param file 文件
-	 * @return
-	 */
-    Boolean batchImport(MultipartFile file) throws IOException;
+	Boolean batchImport(MultipartFile file) throws IOException;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/IRecruitCompanyTradeService.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.recruit.service;
+
+import com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 行业类别Service接口
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+public interface IRecruitCompanyTradeService extends IService<RecruitCompanyTrade> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	RecruitCompanyTradeVo queryById(Long tradeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<RecruitCompanyTradeVo> queryList(RecruitCompanyTradeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入行业类别
+	 * @param bo 行业类别新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(RecruitCompanyTradeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改行业类别
+	 * @param bo 行业类别编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(RecruitCompanyTradeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<RecruitCompanyTradeVo> queryCompanyTradeVo(RecruitCompanyTradeQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/IRecruitInterviewService.java

@@ -0,0 +1,61 @@
+package com.zhongzheng.modules.recruit.service;
+
+import com.zhongzheng.modules.recruit.domain.RecruitInterview;
+import com.zhongzheng.modules.recruit.vo.CalendarInterviewVo;
+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.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 招聘面试关联Service接口
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+public interface IRecruitInterviewService extends IService<RecruitInterview> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	RecruitInterviewVo queryById(Long interviewId);
+
+	/**
+	 * 查询列表
+	 */
+	List<RecruitInterviewVo> queryList(RecruitInterviewQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入招聘面试关联
+	 * @param bo 招聘面试关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(RecruitInterviewAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改招聘面试关联
+	 * @param bo 招聘面试关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(RecruitInterviewEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+	/**
+	 * 查询面试日历
+	 * @param bo
+	 * @return
+	 */
+	CalendarInterviewVo queryListCalendar(RecruitInterviewQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitCompanyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.service.impl;
+package com.zhongzheng.modules.recruit.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
@@ -8,8 +8,9 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.company.service.ICompanyTradeService;
-import com.zhongzheng.modules.company.vo.CompanyTradeVo;
+import com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
 import com.zhongzheng.modules.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,18 +18,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.company.bo.CompanyAddBo;
-import com.zhongzheng.modules.company.bo.CompanyQueryBo;
-import com.zhongzheng.modules.company.bo.CompanyEditBo;
-import com.zhongzheng.modules.company.domain.Company;
-import com.zhongzheng.modules.company.mapper.CompanyMapper;
-import com.zhongzheng.modules.company.vo.CompanyVo;
-import com.zhongzheng.modules.company.service.ICompanyService;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
+import com.zhongzheng.modules.recruit.domain.RecruitCompany;
+import com.zhongzheng.modules.recruit.mapper.RecruitCompanyMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -41,45 +41,47 @@ import java.util.stream.Collectors;
  * 公司管理列Service业务层处理
  *
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Service
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService {
+public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper, RecruitCompany> implements IRecruitCompanyService {
 
     @Autowired
     private ISysDictDataService dictDataService;
 
     @Autowired
-    private ICompanyTradeService iCompanyTradeService;
+    private IRecruitCompanyTradeService iRecruitCompanyTradeService;
+
 
     @Override
-    public CompanyVo queryById(Long companyId){
-        Company db = this.baseMapper.selectById(companyId);
-        return BeanUtil.toBean(db, CompanyVo.class);
+    public RecruitCompanyVo queryById(Long companyId){
+        RecruitCompany db = this.baseMapper.selectById(companyId);
+        return BeanUtil.toBean(db, RecruitCompanyVo.class);
     }
 
     @Override
-    public List<CompanyVo> queryList(CompanyQueryBo bo) {
-        LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), Company::getCompanyName, bo.getCompanyName());
-        lqw.eq(bo.getCompanyTypeId() != null, Company::getCompanyTypeId, bo.getCompanyTypeId());
-        lqw.eq(bo.getCompanySizeId() != null, Company::getCompanySizeId, bo.getCompanySizeId());
-        lqw.eq(bo.getIndustryTypeId() != null, Company::getIndustryTypeId, bo.getIndustryTypeId());
-        lqw.eq(StrUtil.isNotBlank(bo.getCompanyIntroduce()), Company::getCompanyIntroduce, bo.getCompanyIntroduce());
-        lqw.like(StrUtil.isNotBlank(bo.getIndustryTypeName()), Company::getIndustryTypeName, bo.getIndustryTypeName());
-        lqw.eq(StrUtil.isNotBlank(bo.getLogoUrl()), Company::getLogoUrl, bo.getLogoUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getLicenseUrl()), Company::getLicenseUrl, bo.getLicenseUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getSocietyCode()), Company::getSocietyCode, bo.getSocietyCode());
-        lqw.eq(StrUtil.isNotBlank(bo.getProvince()), Company::getProvince, bo.getProvince());
-        lqw.eq(StrUtil.isNotBlank(bo.getCity()), Company::getCity, bo.getCity());
-        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), Company::getAddress, bo.getAddress());
-        lqw.eq(StrUtil.isNotBlank(bo.getCompanyPh()), Company::getCompanyPh, bo.getCompanyPh());
-        lqw.eq(StrUtil.isNotBlank(bo.getLinkMan()), Company::getLinkMan, bo.getLinkMan());
-        lqw.eq(StrUtil.isNotBlank(bo.getPostBox()), Company::getPostBox, bo.getPostBox());
-        lqw.eq(Company::getStatus, 1);
-        lqw.eq(bo.getTenantId() != null, Company::getTenantId, bo.getTenantId());
-        List<CompanyVo> companyVos = entity2Vo(this.list(lqw));
-        for (CompanyVo companyVo : companyVos) {
+    public List<RecruitCompanyVo> queryList(RecruitCompanyQueryBo bo) {
+        LambdaQueryWrapper<RecruitCompany> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), RecruitCompany::getCompanyName, bo.getCompanyName());
+        lqw.eq(bo.getCompanyTypeId() != null, RecruitCompany::getCompanyTypeId, bo.getCompanyTypeId());
+        lqw.eq(bo.getCompanySizeId() != null, RecruitCompany::getCompanySizeId, bo.getCompanySizeId());
+        lqw.eq(bo.getIndustryTypeId() != null, RecruitCompany::getIndustryTypeId, bo.getIndustryTypeId());
+        lqw.like(StrUtil.isNotBlank(bo.getIndustryTypeName()), RecruitCompany::getIndustryTypeName, bo.getIndustryTypeName());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompanyIntroduce()), RecruitCompany::getCompanyIntroduce, bo.getCompanyIntroduce());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogoUrl()), RecruitCompany::getLogoUrl, bo.getLogoUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getLicenseUrl()), RecruitCompany::getLicenseUrl, bo.getLicenseUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getSocietyCode()), RecruitCompany::getSocietyCode, bo.getSocietyCode());
+        lqw.eq(StrUtil.isNotBlank(bo.getProvince()), RecruitCompany::getProvince, bo.getProvince());
+        lqw.eq(StrUtil.isNotBlank(bo.getCity()), RecruitCompany::getCity, bo.getCity());
+        lqw.eq(StrUtil.isNotBlank(bo.getDistrict()), RecruitCompany::getDistrict, bo.getDistrict());
+        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), RecruitCompany::getAddress, bo.getAddress());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompanyPh()), RecruitCompany::getCompanyPh, bo.getCompanyPh());
+        lqw.eq(StrUtil.isNotBlank(bo.getLinkMan()), RecruitCompany::getLinkMan, bo.getLinkMan());
+        lqw.eq(StrUtil.isNotBlank(bo.getPostBox()), RecruitCompany::getPostBox, bo.getPostBox());
+        lqw.eq(RecruitCompany::getStatus, 1);
+        lqw.eq(bo.getTenantId() != null, RecruitCompany::getTenantId, bo.getTenantId());
+        List<RecruitCompanyVo> companyVos = entity2Vo(this.list(lqw));
+        for (RecruitCompanyVo companyVo : companyVos) {
             SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
             SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
             companyVo.setCompanyType(sysDictData.getDictLabel());
@@ -94,13 +96,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     * @param collection 实体类集合
     * @return
     */
-    private List<CompanyVo> entity2Vo(Collection<Company> collection) {
-        List<CompanyVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, CompanyVo.class))
+    private List<RecruitCompanyVo> entity2Vo(Collection<RecruitCompany> collection) {
+        List<RecruitCompanyVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, RecruitCompanyVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<Company> page = (Page<Company>)collection;
-            Page<CompanyVo> pageVo = new Page<>();
+            Page<RecruitCompany> page = (Page<RecruitCompany>)collection;
+            Page<RecruitCompanyVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
@@ -109,23 +111,25 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     }
 
     @Override
-    public Boolean insertByAddBo(CompanyAddBo bo) {
-        Company add = BeanUtil.toBean(bo, Company.class);
+    public Boolean insertByAddBo(RecruitCompanyAddBo bo) {
+        RecruitCompany add = BeanUtil.toBean(bo, RecruitCompany.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setStatus(1);
-        CompanyTradeVo companyTradeVo = iCompanyTradeService.queryById(bo.getIndustryTypeId());
+        RecruitCompanyTradeVo companyTradeVo = iRecruitCompanyTradeService.queryById(bo.getIndustryTypeId());
         add.setIndustryTypeName(companyTradeVo.getTradeName());
         return this.save(add);
     }
 
     @Override
-    public Boolean updateByEditBo(CompanyEditBo bo) {
-        Company update = BeanUtil.toBean(bo, Company.class);
+    public Boolean updateByEditBo(RecruitCompanyEditBo bo) {
+        RecruitCompany update = BeanUtil.toBean(bo, RecruitCompany.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        update.setTenantId(null);
+        update.setUpdateTime(DateUtils.getNowTime());
+        RecruitCompanyTradeVo companyTradeVo = iRecruitCompanyTradeService.queryById(bo.getIndustryTypeId());
+        update.setIndustryTypeName(companyTradeVo.getTradeName());
         return this.updateById(update);
     }
 
@@ -134,7 +138,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(Company entity){
+    private void validEntityBeforeSave(RecruitCompany entity){
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -154,16 +158,15 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         ExcelReader reader = ExcelUtil.getReader(inputStream);
         List<List<Object>> readAll = reader.read();
         readAll.remove(0);
-        List<Company> companyList = new ArrayList<>();
+        List<RecruitCompany> companyList = new ArrayList<>();
         String TenantId = ServletUtils.getRequest().getHeader("TenantId");
         Long nowTime = DateUtils.getNowTime();
         for (int i = 0; i < readAll.size(); i++) {
-            Company company = new Company();
+            RecruitCompany company = new RecruitCompany();
             if(readAll.get(i).get(0).toString().equals("****公司")){
                 continue;
             }
             company.setCompanyName(readAll.get(i).get(0).toString());
-            LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
             Long sysDictData = dictDataService.selectDictLabelType("company_type",readAll.get(i).get(1).toString());
             if (sysDictData == null){
                 throw new RuntimeException("第"+i+1+"行公司类型存在错误，请仔细检查再上传。");

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitCompanyTradeServiceImpl.java

@@ -0,0 +1,108 @@
+package com.zhongzheng.modules.recruit.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeEditBo;
+import com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade;
+import com.zhongzheng.modules.recruit.mapper.RecruitCompanyTradeMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 行业类别Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-08-19
+ */
+@Service
+public class RecruitCompanyTradeServiceImpl extends ServiceImpl<RecruitCompanyTradeMapper, RecruitCompanyTrade> implements IRecruitCompanyTradeService {
+
+    @Override
+    public RecruitCompanyTradeVo queryById(Long tradeId){
+        RecruitCompanyTrade db = this.baseMapper.selectById(tradeId);
+        return BeanUtil.toBean(db, RecruitCompanyTradeVo.class);
+    }
+
+    @Override
+    public List<RecruitCompanyTradeVo> queryList(RecruitCompanyTradeQueryBo bo) {
+        LambdaQueryWrapper<RecruitCompanyTrade> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getTradeName()), RecruitCompanyTrade::getTradeName, bo.getTradeName());
+        lqw.eq(bo.getFather() != null, RecruitCompanyTrade::getFather, bo.getFather());
+        lqw.eq(bo.getFatherId() != null, RecruitCompanyTrade::getFatherId, bo.getFatherId());
+        lqw.eq(bo.getTenantId() != null, RecruitCompanyTrade::getTenantId, bo.getTenantId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<RecruitCompanyTradeVo> entity2Vo(Collection<RecruitCompanyTrade> collection) {
+        List<RecruitCompanyTradeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, RecruitCompanyTradeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<RecruitCompanyTrade> page = (Page<RecruitCompanyTrade>)collection;
+            Page<RecruitCompanyTradeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(RecruitCompanyTradeAddBo bo) {
+        RecruitCompanyTrade add = BeanUtil.toBean(bo, RecruitCompanyTrade.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(RecruitCompanyTradeEditBo bo) {
+        RecruitCompanyTrade update = BeanUtil.toBean(bo, RecruitCompanyTrade.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(RecruitCompanyTrade entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<RecruitCompanyTradeVo> queryCompanyTradeVo(RecruitCompanyTradeQueryBo bo) {
+        List<RecruitCompanyTradeVo> companyTradeVos = baseMapper.queryCompanyTradeVo(bo);
+        return companyTradeVos;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitInterviewServiceImpl.java

@@ -0,0 +1,191 @@
+package com.zhongzheng.modules.recruit.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.recruit.vo.CalendarInterviewVo;
+import com.zhongzheng.modules.recruit.vo.DayInterviewVo;
+import com.zhongzheng.modules.user.vo.CalendarStudyVo;
+import com.zhongzheng.modules.user.vo.DayStudyVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitInterviewEditBo;
+import com.zhongzheng.modules.recruit.domain.RecruitInterview;
+import com.zhongzheng.modules.recruit.mapper.RecruitInterviewMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewVo;
+import com.zhongzheng.modules.recruit.service.IRecruitInterviewService;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 招聘面试关联Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Service
+public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMapper, RecruitInterview> implements IRecruitInterviewService {
+
+    @Override
+    public RecruitInterviewVo queryById(Long interviewId){
+        RecruitInterview db = this.baseMapper.selectById(interviewId);
+        return BeanUtil.toBean(db, RecruitInterviewVo.class);
+    }
+
+    @Override
+    public List<RecruitInterviewVo> queryList(RecruitInterviewQueryBo bo) {
+        LambdaQueryWrapper<RecruitInterview> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getYear() != null, RecruitInterview::getYear, bo.getYear());
+        lqw.eq(bo.getMoth() != null, RecruitInterview::getMoth, bo.getMoth());
+        lqw.eq(bo.getDay() != null, RecruitInterview::getDay, bo.getDay());
+        lqw.eq(StrUtil.isNotBlank(bo.getTimingStart()), RecruitInterview::getTimingStart, bo.getTimingStart());
+        lqw.eq(StrUtil.isNotBlank(bo.getTimingEnd()), RecruitInterview::getTimingEnd, bo.getTimingEnd());
+        lqw.eq(bo.getNeedsId() != null, RecruitInterview::getNeedsId, bo.getNeedsId());
+        lqw.eq(bo.getResumeId() != null, RecruitInterview::getResumeId, bo.getResumeId());
+        lqw.eq(bo.getStatus() != null, RecruitInterview::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<RecruitInterviewVo> entity2Vo(Collection<RecruitInterview> collection) {
+        List<RecruitInterviewVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, RecruitInterviewVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<RecruitInterview> page = (Page<RecruitInterview>)collection;
+            Page<RecruitInterviewVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(RecruitInterviewAddBo bo) {
+        RecruitInterview add = BeanUtil.toBean(bo, RecruitInterview.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(RecruitInterviewEditBo bo) {
+        RecruitInterview update = BeanUtil.toBean(bo, RecruitInterview.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(RecruitInterview entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public CalendarInterviewVo queryListCalendar(RecruitInterviewQueryBo bo) {
+        Calendar cal = Calendar.getInstance();
+        CalendarInterviewVo calendarInterviewVo = new CalendarInterviewVo();
+        //得到日历日期
+        Long firstDayOfMonth = getFirstDayOfMonth(cal.get(Calendar.MONTH)+1);
+        Long lastDayOfMonth = getLastDayOfMonth(cal.get(Calendar.MONTH)+1);
+        List<DayInterviewVo> dayStudyVosOne = getDays(firstDayOfMonth,lastDayOfMonth);
+        calendarInterviewVo.setYear(Convert.toLong(cal.get(Calendar.YEAR)));
+        calendarInterviewVo.setMonth(Convert.toLong(cal.get(Calendar.MONTH)+1));
+        calendarInterviewVo.setDayInterviewVos(dayStudyVosOne);
+        return calendarInterviewVo;
+    }
+
+
+    private static List<DayInterviewVo> getDays(long time_start, long time_end) {
+        try {
+            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date c_start = dateFormat.parse(dateFormat.format(new Date(time_start * 1000).getTime()));
+            Date c_end = dateFormat.parse(dateFormat.format(new Date(time_end * 1000).getTime()));
+            Calendar tempStart = Calendar.getInstance();
+            tempStart.setTime(c_start);
+            Calendar tempEnd = Calendar.getInstance();
+            tempEnd.setTime(c_end);
+            tempEnd.add(Calendar.DATE, +1);
+            List<DayInterviewVo> dayStudyVos = new ArrayList<>();
+            while (tempStart.before(tempEnd)) {
+                String format = dateFormat.format(tempStart.getTime());
+                String strh = format.substring(format.length() -2,format.length());
+                int week = tempStart.get(Calendar.DAY_OF_WEEK)- 1;
+                DayInterviewVo dayStudyVo = new DayInterviewVo();
+                dayStudyVo.setStudyDay(Convert.toLong(week));
+                dayStudyVo.setDate(Convert.toLong(strh));
+                dayStudyVos.add(dayStudyVo);
+                tempStart.add(Calendar.DAY_OF_YEAR, 1);
+            }
+            return dayStudyVos;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取当前月第一天
+     * @param month
+     * @return
+     */
+    public static Long getFirstDayOfMonth(int month) {
+        Calendar calendar = Calendar.getInstance();
+        // 设置月份
+        calendar.set(Calendar.MONTH, month - 1);
+        // 获取某月最小天数
+        int firstDay = calendar.getActualMinimum(Calendar.DAY_OF_MONTH);
+        // 设置日历中月份的最小天数
+        calendar.set(Calendar.DAY_OF_MONTH, firstDay);
+
+        Date time = calendar.getTime();
+        return time.getTime() / 1000;
+    }
+
+    public static Long getLastDayOfMonth(int month) {
+        Calendar calendar = Calendar.getInstance();
+        // 设置月份
+        calendar.set(Calendar.MONTH, month - 1);
+        // 获取某月最大天数
+        int lastDay=0;
+        //2月的平年瑞年天数
+        if(month==2) {
+            lastDay = calendar.getLeastMaximum(Calendar.DAY_OF_MONTH);
+        }else {
+            lastDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        }
+        // 设置日历中月份的最大天数
+        calendar.set(Calendar.DAY_OF_MONTH, lastDay);
+        Date time = calendar.getTime();
+        return time.getTime() / 1000;
+    }
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/CalendarInterviewVo.java

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import com.zhongzheng.modules.user.vo.DayStudyVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author change
+ * @date 2021年08月18日 15:26
+ */
+@Data
+@ApiModel("【面试月份】视图对象")
+public class CalendarInterviewVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 月份 */
+    @ApiModelProperty("月份")
+    private Long month;
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Long year;
+
+    /** 月份天 */
+    @ApiModelProperty("月份天")
+    private List<DayInterviewVo> dayInterviewVos;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/DayInterviewVo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author change
+ * @date 2021年08月18日 15:27
+ */
+@Data
+@ApiModel("【面试天】视图对象")
+public class DayInterviewVo {
+
+    private static final long serialVersionUID = 1L;
+    /** 当月号数 */
+    @ApiModelProperty("当月号数")
+    private Long date;
+
+    /** 当天星期 */
+    @ApiModelProperty("0周日  1周一 2周二 3周三 4周四 5周五 6周六")
+    private Long studyDay;
+
+    /** 面试人信息 */
+    @ApiModelProperty("面试人信息")
+    private List<RecruitInterviewVo> recruitInterviewList;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitCompanyTradeSonVo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author change
+ * @date 2021年08月19日 10:06
+ */
+@Data
+@ApiModel("行业类别视图对象")
+public class RecruitCompanyTradeSonVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $pkColumn.columnComment
+     */
+    @ApiModelProperty("$pkColumn.columnComment")
+    private Long tradeId;
+
+    /**
+     * 行业类别
+     */
+    @Excel(name = "行业类别")
+    @ApiModelProperty("行业类别")
+    private String tradeName;
+
+    /**
+     * 商户ID
+     */
+    @Excel(name = "商户ID")
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyTradeVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitCompanyTradeVo.java

@@ -1,7 +1,5 @@
-package com.zhongzheng.modules.company.vo;
+package com.zhongzheng.modules.recruit.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -14,12 +12,12 @@ import java.util.List;
 /**
  * 行业类别视图对象 mall_package
  *
- * @author change
- * @date 2021-08-16
+ * @author ruoyi
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("行业类别视图对象")
-public class CompanyTradeVo {
+public class RecruitCompanyTradeVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -43,17 +41,6 @@ public class CompanyTradeVo {
 	@ApiModelProperty("商户ID")
 	private Long tenantId;
 
-	@Excel(name = "子行业类别")
-	@ApiModelProperty("子行业类别")
-	private List<CompanyTradeSonVo> companyTradeSonVo;
-
-
-	/** 创建时间 */
-	@TableField(fill = FieldFill.INSERT)
-	private Long createTime;
-
-	/** 修改时间 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updateTime;
+	private List<RecruitCompanyTradeSonVo> companyTradeSonVo;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/vo/CompanyVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitCompanyVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.company.vo;
+package com.zhongzheng.modules.recruit.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -13,11 +13,11 @@ import java.util.Date;
  * 公司管理列视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-08-16
+ * @date 2021-08-19
  */
 @Data
 @ApiModel("公司管理列视图对象")
-public class CompanyVo {
+public class RecruitCompanyVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -29,34 +29,35 @@ public class CompanyVo {
 	@ApiModelProperty("公司名称")
 	private String companyName;
 	/** 公司类型 */
-	@Excel(name = "公司类型id")
-	@ApiModelProperty("公司类型id")
+	@Excel(name = "公司类型")
+	@ApiModelProperty("公司类型")
 	private Long companyTypeId;
+	/** 公司规模 */
+	@Excel(name = "公司规模")
+	@ApiModelProperty("公司规模")
+	private Long companySizeId;
 
 	@Excel(name = "公司类型")
 	@ApiModelProperty("公司类型")
 	private String companyType;
-	/** 公司规模 */
-	@Excel(name = "公司规模id")
-	@ApiModelProperty("公司规模id")
-	private Long companySizeId;
 
 	/** 公司规模 */
 	@Excel(name = "公司规模")
 	@ApiModelProperty("公司规模")
 	private String companySize;
+
 	/** 行业类别id */
 	@Excel(name = "行业类别id")
 	@ApiModelProperty("行业类别id")
 	private Long industryTypeId;
-	/** 公司介绍 */
-	@Excel(name = "公司介绍")
-	@ApiModelProperty("公司介绍")
-	private String companyIntroduce;
 	/** 行业类别名字 */
 	@Excel(name = "行业类别名字")
 	@ApiModelProperty("行业类别名字")
 	private String industryTypeName;
+	/** 公司介绍 */
+	@Excel(name = "公司介绍")
+	@ApiModelProperty("公司介绍")
+	private String companyIntroduce;
 	/** 公司logo */
 	@Excel(name = "公司logo")
 	@ApiModelProperty("公司logo")
@@ -77,8 +78,7 @@ public class CompanyVo {
 	@Excel(name = "城市")
 	@ApiModelProperty("城市")
 	private String city;
-
-	/** 城市 */
+	/** 区 */
 	@Excel(name = "区")
 	@ApiModelProperty("区")
 	private String district;
@@ -98,9 +98,9 @@ public class CompanyVo {
 	@Excel(name = "邮箱")
 	@ApiModelProperty("邮箱")
 	private String postBox;
-	/** 0 删除 1有效 */
-	@Excel(name = "0 删除 1有效")
-	@ApiModelProperty("0 删除 1有效")
+	/** -1 删除  1正常 */
+	@Excel(name = "-1 删除  1正常")
+	@ApiModelProperty("-1 删除  1正常")
 	private Integer status;
 	/** 商户ID */
 	@Excel(name = "商户ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitInterviewVo.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 招聘面试关联视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-08-18
+ */
+@Data
+@ApiModel("招聘面试关联视图对象")
+public class RecruitInterviewVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long interviewId;
+
+	/** 年 */
+	@Excel(name = "年")
+	@ApiModelProperty("年")
+	private Integer year;
+	/** 月 */
+	@Excel(name = "月")
+	@ApiModelProperty("月")
+	private Integer moth;
+	/** 日 */
+	@Excel(name = "日")
+	@ApiModelProperty("日")
+	private Integer day;
+	/** 时间段开始 */
+	@Excel(name = "时间段开始")
+	@ApiModelProperty("时间段开始")
+	private String timingStart;
+	/** 时间段结束 */
+	@Excel(name = "时间段结束")
+	@ApiModelProperty("时间段结束")
+	private String timingEnd;
+	/** 面试需求岗位ID */
+	@Excel(name = "面试需求岗位ID")
+	@ApiModelProperty("面试需求岗位ID")
+	private Long needsId;
+	/** 面试简历ID */
+	@Excel(name = "面试简历ID")
+	@ApiModelProperty("面试简历ID")
+	private Long resumeId;
+	/** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@Excel(name = "1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	@ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	private Integer status;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitCompanyMapper.xml

@@ -2,21 +2,22 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyMapper">
+<mapper namespace="com.zhongzheng.modules.recruit.mapper.RecruitCompanyMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.Company" id="CompanyResult">
+    <resultMap type="com.zhongzheng.modules.recruit.domain.RecruitCompany" id="RecruitCompanyResult">
         <result property="companyId" column="company_id"/>
         <result property="companyName" column="company_name"/>
         <result property="companyTypeId" column="company_type_id"/>
         <result property="companySizeId" column="company_size_id"/>
         <result property="industryTypeId" column="industry_type_id"/>
-        <result property="companyIntroduce" column="company_introduce"/>
         <result property="industryTypeName" column="industry_type_name"/>
+        <result property="companyIntroduce" column="company_introduce"/>
         <result property="logoUrl" column="logo_url"/>
         <result property="licenseUrl" column="license_url"/>
         <result property="societyCode" column="society_code"/>
         <result property="province" column="province"/>
         <result property="city" column="city"/>
+        <result property="district" column="district"/>
         <result property="address" column="address"/>
         <result property="companyPh" column="company_ph"/>
         <result property="linkMan" column="link_man"/>
@@ -27,9 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
-
     <select id="selectIndustry" resultType="Long" parameterType="map">
-        select trade_id FROM company_trade where trade_name=#{industry} LIMIT 1
+        select trade_id FROM recruit_company_trade where trade_name=#{industry} LIMIT 1
     </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/company/CompanyTradeMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitCompanyTradeMapper.xml

@@ -2,18 +2,19 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyTradeMapper">
+<mapper namespace="com.zhongzheng.modules.recruit.mapper.RecruitCompanyTradeMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.CompanyTrade" id="CompanyTradeResult">
+    <resultMap type="com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade" id="RecruitCompanyTradeResult">
         <result property="tradeId" column="trade_id"/>
         <result property="tradeName" column="trade_name"/>
         <result property="father" column="father"/>
         <result property="fatherId" column="father_id"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
-
-    <resultMap type="com.zhongzheng.modules.company.vo.CompanyTradeVo" id="CompanyTradeResultVo">
+    <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo" id="CompanyTradeResultVo">
         <result property="tradeId" column="trade_id"/>
         <result property="tradeName" column="trade_name"/>
         <result property="father" column="father"/>
@@ -22,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection property="companyTradeSonVo" javaType="java.util.List" resultMap="CompanyTradeResultSonVo"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.company.vo.CompanyTradeSonVo" id="CompanyTradeResultSonVo">
+    <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeSonVo" id="CompanyTradeResultSonVo">
         <result property="tradeId" column="son_id"/>
         <result property="tradeName" column="son_name"/>
         <result property="tenantId" column="son_tenant_id"/>
     </resultMap>
 
-    <select id="queryCompanyTradeVo" parameterType="com.zhongzheng.modules.company.bo.CompanyTradeQueryBo" resultMap="CompanyTradeResultVo">
+    <select id="queryCompanyTradeVo" parameterType="com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo" resultMap="CompanyTradeResultVo">
         SELECT
             c.trade_id,
             c.trade_name,
@@ -36,9 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             m.trade_name AS son_name,
             m.tenant_id AS son_tenant_id
         FROM
-                ( SELECT * FROM company_trade WHERE father = 0 ) c
-                    LEFT JOIN ( SELECT * FROM company_trade WHERE father = 1 ) m ON c.trade_id = m.father_id
+                ( SELECT * FROM recruit_company_trade WHERE father = 0 ) c
+                    LEFT JOIN ( SELECT * FROM recruit_company_trade WHERE father = 1 ) m ON c.trade_id = m.father_id
     </select>
 
-
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitInterviewMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.RecruitInterviewMapper">
+
+    <resultMap type="com.zhongzheng.modules.recruit.domain.RecruitInterview" id="RecruitInterviewResult">
+        <result property="interviewId" column="interview_id"/>
+        <result property="year" column="year"/>
+        <result property="moth" column="moth"/>
+        <result property="day" column="day"/>
+        <result property="timingStart" column="timing_start"/>
+        <result property="timingEnd" column="timing_end"/>
+        <result property="needsId" column="needs_id"/>
+        <result property="resumeId" column="resume_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>