面试导出日历更改

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

@@ -64,7 +64,7 @@ public class RecruitInterviewController extends BaseController {
     @Log(title = "招聘面试关联", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<RecruitInterviewVo> export(RecruitInterviewQueryBo bo) {
-        List<RecruitInterviewExcel> list = iRecruitInterviewService.queryList(bo);
+        List<RecruitInterviewExcel> list = iRecruitInterviewService.queryExcelsList(bo);
         ExcelUtil<RecruitInterviewExcel> util = new ExcelUtil<RecruitInterviewExcel>(RecruitInterviewExcel.class);
         return util.exportExcel(list, "招聘面试安排");
     }

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

@@ -28,7 +28,12 @@ public interface IRecruitInterviewService extends IService<RecruitInterview> {
 	/**
 	 * 查询列表
 	 */
-	List<RecruitInterviewExcel> queryList(RecruitInterviewQueryBo bo);
+	List<RecruitInterviewVo> queryList(RecruitInterviewQueryBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<RecruitInterviewExcel> queryExcelsList(RecruitInterviewQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入招聘面试关联

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

@@ -52,8 +52,26 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         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.getMonth() != null, RecruitInterview::getMonth, bo.getMonth());
+        lqw.eq(bo.getDay() != null, RecruitInterview::getDay, bo.getDay());
+        lqw.eq(bo.getTimingStart() != null, RecruitInterview::getTimingStart, bo.getTimingStart());
+        lqw.eq(bo.getTimingEnd() != null, RecruitInterview::getTimingEnd, bo.getTimingEnd());
+        lqw.eq(bo.getNeedsId() != null, RecruitInterview::getNeedsId, bo.getNeedsId());
+        lqw.eq(StrUtil.isNotBlank(bo.getResumeJson()), RecruitInterview::getResumeJson, bo.getResumeJson());
+        lqw.eq(bo.getStatus() != null, RecruitInterview::getStatus, bo.getStatus());
+        lqw.eq(bo.getTenantId() != null, RecruitInterview::getTenantId, bo.getTenantId());
+        lqw.eq(bo.getUserId() != null, RecruitInterview::getUserId, bo.getUserId());
+        lqw.eq(bo.getResumeStatus() != null, RecruitInterview::getResumeStatus, bo.getResumeStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
     @Override
-    public List<RecruitInterviewExcel> queryList(RecruitInterviewQueryBo bo) {
+    public List<RecruitInterviewExcel> queryExcelsList(RecruitInterviewQueryBo bo) {
         List<RecruitInterviewExcel> recruitInterviewExcels = baseMapper.selectQueryExcel(bo);
         for (int i = 0; i < recruitInterviewExcels.size(); i++) {
             recruitInterviewExcels.get(i).setSerial(i+1);