更新

ruoyi-admin/src/main/resources/application.yml

@@ -114,13 +114,13 @@ mybatis-plus:
       logic-not-delete-value: 0
 
 file:
-  upload-dir: /data/file
+  upload-dir: /opt/service/file/data/file
 
 # 政策文件上传配置
 policy:
   upload:
     # 文件上传目录
-    path: /data/file
+    path: /opt/service/file/data/file
     # 访问域名（nginx配置的域名）
     domain: https://xjshzly.longbiosphere.com:30081
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFairController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.websocket.server.PathParam;
 import java.util.List;
 
 /**
@@ -135,4 +136,18 @@ public class AppFairController extends BaseController
     {
         return jobFairSignUpService.companySignUp(signUpVO);
     }
+
+    /**
+     * 招聘会浏览数记录
+     */
+    @BussinessLog(title = "招聘会浏览记录")
+    @ApiOperation("招聘会浏览记录")
+    @GetMapping("/view/add")
+    public AjaxResult viewAdd(@PathParam("fairId") Long fairId)
+    {
+        if (fairId == null) {
+             return AjaxResult.error("招聘会ID不能为空");
+        }
+        return toAjax(jobFairService.updateViewNumById(fairId));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.dromara.easyes.core.biz.EsPageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -217,7 +218,7 @@ public class AppJobController extends BaseController
         List<String> sensitiveWords = sensitiveWordChecker.checkSensitiveWords(job.getDescription());
         if (!sensitiveWords.isEmpty()) {
             String errorMsg = "描述中包含敏感词：" + String.join("、", sensitiveWords);
-            return AjaxResult.error(errorMsg);
+            return AjaxResult.error(errorMsg, sensitiveWords);
         }
         jobService.publishJob(job);
         return success();
@@ -243,4 +244,13 @@ public class AppJobController extends BaseController
         }
         return success(jobService.selectApplyJobUserList(jobId));
     }
+
+    @GetMapping("/review/status")
+    @ApiOperation("审核岗位")
+    public AjaxResult reviewStatus(@ApiParam("岗位id") @RequestParam("jobId") Long jobId, @ApiParam("审核状态") @RequestParam("reviewStatus") String reviewStatus) {
+        if (jobId == null || StringUtils.isEmpty(reviewStatus)) {
+            return AjaxResult.error("请传递岗位ID及审核状态");
+        }
+        return success(jobService.updateReviewStatus(jobId, reviewStatus));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java

@@ -3,6 +3,7 @@ package com.ruoyi.cms.controller.cms;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.cms.domain.*;
 import com.ruoyi.cms.domain.query.ESJobSearch;
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.cms.domain.vo.CandidateVO;
 import com.ruoyi.cms.domain.vo.CompanyVo;
 import com.ruoyi.cms.service.*;
@@ -24,6 +25,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -67,7 +69,7 @@ public class CmsJobController extends BaseController
     @ApiOperation("查询岗位列表")
 //    @PreAuthorize("@ss.hasPermi('cms:job:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Job job,HttpServletRequest request)
+    public TableDataInfo list(JobSearch job, HttpServletRequest request)
     {
         if (RoleUtils.isCompanyAdmin()) {
             Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard());
@@ -101,7 +103,7 @@ public class CmsJobController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('bussiness:job:export')")
     @Log(title = "岗位", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Job job)
+    public void export(HttpServletResponse response, JobSearch job)
     {
         List<Job> list = jobService.selectJobList(job);
         ExcelUtil<Job> util = new ExcelUtil<Job>(Job.class);
@@ -120,7 +122,7 @@ public class CmsJobController extends BaseController
         List<String> sensitiveWords = sensitiveWordChecker.checkSensitiveWords(job.getDescription());
         if (!sensitiveWords.isEmpty()) {
             String errorMsg = "描述中包含敏感词：" + String.join("、", sensitiveWords);
-            return AjaxResult.error(errorMsg);
+            return AjaxResult.error(errorMsg, sensitiveWords);
         }
         // 无敏感词，执行插入
         return toAjax(jobService.insertJob(job));
@@ -139,7 +141,7 @@ public class CmsJobController extends BaseController
         List<String> sensitiveWords = sensitiveWordChecker.checkSensitiveWords(job.getDescription());
         if (!sensitiveWords.isEmpty()) {
             String errorMsg = "描述中包含敏感词：" + String.join("、", sensitiveWords);
-            return AjaxResult.error(errorMsg);
+            return AjaxResult.error(errorMsg, sensitiveWords);
         }
         return toAjax(jobService.updateJob(job));
     }
@@ -358,4 +360,13 @@ public class CmsJobController extends BaseController
         }
         return AjaxResult.success("此岗位已存在!");
     }
+
+    @GetMapping("/review/status")
+    @ApiOperation("审核岗位")
+    public AjaxResult reviewStatus(@ApiParam("岗位id") @RequestParam("jobId") Long jobId, @ApiParam("审核状态") @RequestParam("reviewStatus") String reviewStatus) {
+        if (jobId == null) {
+            return AjaxResult.error("请传递岗位ID");
+        }
+        return success(jobService.updateReviewStatus(jobId, reviewStatus));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.cms.controller.cms;
 
 
+import com.ruoyi.cms.domain.query.CompanySearch;
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.cms.util.RoleUtils;
+import com.ruoyi.cms.util.sensitiveWord.SensitiveWordChecker;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.cms.service.ICompanyService;
 import com.ruoyi.common.annotation.Log;
@@ -33,13 +36,16 @@ public class CompanyController extends BaseController
     @Autowired
     private ICompanyService companyService;
 
+    @Autowired
+    SensitiveWordChecker sensitiveWordChecker;
+
     /**
      * 查询公司列表
      */
     @ApiOperation("查询公司列表")
 //    @PreAuthorize("@ss.hasPermi('cms:company:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Company company)
+    public TableDataInfo list(CompanySearch company)
     {
         if (RoleUtils.isCompanyAdmin()) {
             System.out.println("企业社会信用代码============================="+RoleUtils.getCurrentUseridCard());
@@ -57,7 +63,7 @@ public class CompanyController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('app:company:export')")
     @Log(title = "公司", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Company company)
+    public void export(HttpServletResponse response, CompanySearch company)
     {
         List<Company> list = companyService.selectCompanyList(company);
         ExcelUtil<Company> util = new ExcelUtil<Company>(Company.class);
@@ -84,6 +90,13 @@ public class CompanyController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody Company company)
     {
+        // 校验描述中的敏感词
+        List<String> sensitiveWords = sensitiveWordChecker.checkSensitiveWords(company.getDescription());
+        if (!sensitiveWords.isEmpty()) {
+            String errorMsg = "描述中包含敏感词：" + String.join("、", sensitiveWords);
+            return AjaxResult.error(errorMsg, sensitiveWords);
+        }
+        // 无敏感词，执行插入
         return toAjax(companyService.insertCompany(company));
     }
 
@@ -96,6 +109,13 @@ public class CompanyController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody Company company)
     {
+        // 校验描述中的敏感词
+        List<String> sensitiveWords = sensitiveWordChecker.checkSensitiveWords(company.getDescription());
+        if (!sensitiveWords.isEmpty()) {
+            String errorMsg = "描述中包含敏感词：" + String.join("、", sensitiveWords);
+            return AjaxResult.error(errorMsg, sensitiveWords);
+        }
+        // 无敏感词，执行插入
         return toAjax(companyService.updateCompany(company));
     }
 
@@ -133,7 +153,7 @@ public class CompanyController extends BaseController
     @ApiOperation("查询公司列表")
 //    @PreAuthorize("@ss.hasPermi('cms:company:list')")
     @GetMapping("/listPage")
-    public TableDataInfo listPage(Company company)
+    public TableDataInfo listPage(CompanySearch company)
     {
         startPage();
         List<Company> list = companyService.selectCompanyList(company);

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java

@@ -199,4 +199,7 @@ public class Job extends BaseEntity
     @TableField(exist = false)
     @ApiModelProperty("申请人列表")
     private List<AppUser> applyUsers;
+
+    @ApiModelProperty("审核状态")
+    private String reviewStatus;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java

@@ -80,4 +80,7 @@ public class JobFair extends BaseEntity
     @TableField(exist = false)
     @ApiModelProperty("是否收藏")
     private Integer isCollection;
+
+    @ApiModelProperty("浏览数")
+    private Long viewNum;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/CompanySearch.java

@@ -0,0 +1,18 @@
+package com.ruoyi.cms.domain.query;
+
+import com.ruoyi.common.core.domain.entity.Company;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: chenyanchang
+ * @Date: 2026/6/2 下午3:39
+ */
+@Data
+public class CompanySearch extends Company {
+    //查询开始时间
+    private String startDate;
+    //查询结束时间
+    private String endDate;
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/JobSearch.java

@@ -0,0 +1,16 @@
+package com.ruoyi.cms.domain.query;
+
+import com.ruoyi.cms.domain.Job;
+import lombok.Data;
+
+/**
+ * @Author: chenyanchang
+ * @Date: 2026/6/2 下午3:36
+ */
+@Data
+public class JobSearch extends Job {
+    //查询开始时间
+    private String startDate;
+    //查询结束时间
+    private String endDate;
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java

@@ -2,6 +2,8 @@ package com.ruoyi.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
+
+import com.ruoyi.cms.domain.query.CompanySearch;
 import com.ruoyi.common.core.domain.entity.Company;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,7 +20,7 @@ public interface CompanyMapper extends BaseMapper<Company>
      * @param company 公司
      * @return 公司集合
      */
-    public List<Company> selectCompanyList(Company company);
+    public List<Company> selectCompanyList(CompanySearch company);
 
     void batchInsert(List<Company> companyBatch);
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobFairMapper.java

@@ -39,4 +39,11 @@ public interface JobFairMapper extends BaseMapper<JobFair>
      * @return 招聘会信息集合
      */
     List<JobFair> getCurrentMonthFairs(JobFair jobFair);
+
+    /**
+     * 招聘会浏览数增加
+     * @param fairId
+     * @return
+     */
+    int updateViewNumById(@Param("fairId") Long fairId);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.cms.domain.Job;
 import com.ruoyi.cms.domain.RowWork;
 import com.ruoyi.cms.domain.VectorJob;
 import com.ruoyi.cms.domain.query.ESJobSearch;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 岗位Mapper接口
@@ -24,7 +26,7 @@ public interface JobMapper extends BaseMapper<Job>
      * @param job 岗位
      * @return 岗位集合
      */
-    public List<Job> selectJobList(Job job);
+    public List<Job> selectJobList(JobSearch job);
 
     void isHot();
 
@@ -60,4 +62,6 @@ public interface JobMapper extends BaseMapper<Job>
     Job getJobInfo(Long jobId);
 
     Integer getTotals(Job job);
+
+    Long updateReviewStatus(@Param("jobId") Long jobId, @Param("reviewStatus") String reviewStatus);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.cms.service;
 
 import java.util.List;
+
+import com.ruoyi.cms.domain.query.CompanySearch;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.cms.domain.CompanyCard;
 import com.ruoyi.cms.domain.query.LabelQuery;
@@ -27,7 +29,7 @@ public interface ICompanyService
      * @param company 公司
      * @return 公司集合
      */
-    public List<Company> selectCompanyList(Company company);
+    public List<Company> selectCompanyList(CompanySearch company);
 
     /**
      * 新增公司

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobFairService.java

@@ -2,6 +2,7 @@ package com.ruoyi.cms.service;
 
 import java.util.List;
 import com.ruoyi.cms.domain.JobFair;
+import com.ruoyi.common.core.domain.AjaxResult;
 
 /**
  * 招聘会信息Service接口
@@ -69,4 +70,11 @@ public interface IJobFairService
      * @return 招聘会信息集合
      */
     List<JobFair> getCurrentMonthFairs(JobFair jobFair);
+
+    /**
+     * 记录招聘会浏览数
+     * @param fairId
+     * @return
+     */
+    int updateViewNumById(Long fairId);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.cms.domain.ESJobDocument;
 import com.ruoyi.cms.domain.Job;
 import com.ruoyi.cms.domain.query.ESJobSearch;
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.cms.domain.vo.CandidateVO;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import org.dromara.easyes.core.biz.EsPageInfo;
@@ -33,7 +34,7 @@ public interface IJobService
      * @param job 岗位
      * @return 岗位集合
      */
-    public List<Job> selectJobList(Job job);
+    public List<Job> selectJobList(JobSearch job);
 
 
     /**
@@ -103,7 +104,7 @@ public interface IJobService
 
     public Job selectHttpJobByJobId(Long jobId, HttpServletRequest request);
 
-    public List<Job> selectHttpJobList(Job job,HttpServletRequest request);
+    public List<Job> selectHttpJobList(JobSearch job, HttpServletRequest request);
 
     /**
      * 获取微信抓取的重复数据条数
@@ -111,4 +112,6 @@ public interface IJobService
      * @return
      */
     public Integer getTotals(Job job);
+
+    Long updateReviewStatus(Long jobId, String reviewStatus);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java

@@ -1,20 +1,21 @@
 package com.ruoyi.cms.service.impl;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.core.domain.entity.Company;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cms.domain.CompanyCollection;
 import com.ruoyi.cms.domain.Job;
+import com.ruoyi.cms.domain.query.JobSearch;
+import com.ruoyi.cms.mapper.CompanyCollectionMapper;
 import com.ruoyi.cms.mapper.JobMapper;
+import com.ruoyi.cms.service.ICompanyCollectionService;
+import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.common.utils.SiteSecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.ruoyi.cms.mapper.CompanyCollectionMapper;
+
-import com.ruoyi.cms.domain.CompanyCollection;
+import java.util.Arrays;
-import com.ruoyi.cms.service.ICompanyCollectionService;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户公司收藏Service业务层处理
@@ -124,7 +125,7 @@ public class CompanyCollectionServiceImpl extends ServiceImpl<CompanyCollectionM
 
     @Override
     public List<Job> jobCompany(Long companyId) {
-        Job job = new Job();
+        JobSearch job = new JobSearch();
         job.setCompanyId(companyId);
         job.setIsPublish(1);
         List<Job> jobs = jobMapper.selectJobList(job);

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java

@@ -8,6 +8,8 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cms.domain.*;
+import com.ruoyi.cms.domain.query.CompanySearch;
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.cms.domain.query.LabelQuery;
 import com.ruoyi.cms.mapper.*;
 import com.ruoyi.common.constant.Constants;
@@ -88,7 +90,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             company.setCompanyContactList(contacts);
         }
         //查询岗位
-        Job parJob=new Job();
+        JobSearch parJob=new JobSearch();
         parJob.setCompanyId(company.getCompanyId());
         List<Job> jobs=jobMapper.selectJobList(parJob);
         List joblist=jobs.stream().map(job -> {
@@ -107,7 +109,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      * @return 公司
      */
     @Override
-    public List<Company> selectCompanyList(Company company)
+    public List<Company> selectCompanyList(CompanySearch company)
     {
         return companyMapper.selectCompanyList(company);
     }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java

@@ -212,4 +212,9 @@ public class JobFairServiceImpl extends ServiceImpl<JobFairMapper,JobFair> imple
         }
         return fairCompanies;
     }
+
+    @Override
+    public int updateViewNumById(Long fairId) {
+        return jobFairMapper.updateViewNumById(fairId);
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.cms.domain.*;
+import com.ruoyi.cms.domain.query.CompanySearch;
+import com.ruoyi.cms.domain.query.JobSearch;
 import com.ruoyi.cms.util.notice.NoticeUtils;
 import com.ruoyi.common.core.domain.entity.File;
 import com.ruoyi.cms.domain.query.ESJobSearch;
@@ -269,14 +271,14 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
      * @return 岗位
      */
     @Override
-    public List<Job> selectJobList(Job job)
+    public List<Job> selectJobList(JobSearch job)
     {
         List<Job> jobs = jobMapper.selectJobList(job);
         return jobs;
     }
 
     @Override
-    public List<Job> selectHttpJobList(Job job,HttpServletRequest request)
+    public List<Job> selectHttpJobList(JobSearch job, HttpServletRequest request)
     {
         List<Job> jobs = jobMapper.selectJobList(job);
         if (CollectionUtils.isNotEmpty(jobs)) {
@@ -860,7 +862,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
             }
 
             // 获取所有公司数据
-            List<Company> allCompany = companyMapper.selectCompanyList(new Company());
+            List<Company> allCompany = companyMapper.selectCompanyList(new CompanySearch());
             logger.info("从数据库中获取到 {} 条公司数据", allCompany.size());
 
             // 批量插入职位数据
@@ -1144,4 +1146,9 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
     public Integer getTotals(Job job) {
         return jobMapper.getTotals(job);
     }
+
+    @Override
+    public Long updateReviewStatus(Long jobId, String reviewStatus) {
+        return jobMapper.updateReviewStatus(jobId, reviewStatus);
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java

@@ -88,7 +88,7 @@ public class StringUtil {
     /**
      * 互联网
      */
-    public static final String PATH_PROXY_50="https://www.xjksly.cn/file/";
+    public static final String PATH_PROXY_50="http://39.98.44.136:6024/data/file/";
     /**
      * 经办端
      */

ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </update>
 
-    <select id="selectCompanyList" parameterType="Company" resultMap="CompanyResult">
+    <select id="selectCompanyList" parameterType="CompanySearch" resultMap="CompanyResult">
         <include refid="selectCompanyVo"/>
         <where>  del_flag = '0'
             <if test="name != null  and name != ''"> and name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')</if>
@@ -76,6 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> and code = #{code}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
+            <if test="startDate != null and startDate != ''">
+                and create_time >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                and create_time &lt;= #{endDate}
+            </if>
         </where>
     </select>
     <select id="label" resultMap="CompanyResult">

ruoyi-bussiness/src/main/resources/mapper/app/JobFairMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="description"    column="description"    />
         <result property="address"    column="address"    />
+        <result property="viewNum"    column="view_num"    />
     </resultMap>
 
     <sql id="selectJobFairVo">
-        select job_fair_id, name, job_fair_type, location, latitude, longitude, start_time, end_time, del_flag, create_by, create_time, update_by, update_time, remark,address,description from job_fair
+        select job_fair_id, name, job_fair_type, location, latitude, longitude, start_time, end_time, del_flag, create_by, create_time, update_by, update_time, remark,address,description, view_num from job_fair
     </sql>
 
     <select id="selectJobFairList" parameterType="JobFair" resultMap="JobFairResult">
@@ -35,8 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="location != null  and location != ''"> and location = #{location}</if>
             <if test="latitude != null "> and latitude = #{latitude}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="startTime != null "> and start_time >= #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="endTime != null "> and end_time &lt;= #{endTime}</if>
         </where>
     </select>
     <select id="appList" resultType="com.ruoyi.cms.domain.JobFair" parameterType="com.ruoyi.cms.domain.JobFair">
@@ -91,4 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY start_time DESC
     </select>
+
+    <update id="updateViewNumById">
+        update job_fair set view_num = view_num + 1 where job_fair_id = #{fairId}
+    </update>
 </mapper>

ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml

@@ -35,6 +35,7 @@
         <result property="cover"    column="cover"    />
         <result property="jobType"    column="job_type"    />
         <result property="jobAddress"    column="job_address"    />
+        <result property="reviewStatus"    column="review_status"    />
 
     </resultMap>
 
@@ -79,6 +80,7 @@
         <result property="companyNature"    column="company_nature"    />
         <result property="code"    column="code"    />
         <result property="jobAddress"    column="job_address"    />
+        <result property="reviewStatus"    column="review_status"    />
 
         <association property="companyVo" resultMap="CompanyResult"/>
     </resultMap>
@@ -97,7 +99,7 @@
     </resultMap>
 
     <sql id="selectJobVo">
-        select job_id, job_title, min_salary, max_salary, education, experience, company_name, job_location, posting_date, vacancies, del_flag, create_by, create_time, update_by, update_time, remark, latitude, longitude, "view", company_id , is_hot ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address from job
+        select job_id, job_title, min_salary, max_salary, education, experience, company_name, job_location, posting_date, vacancies, del_flag, create_by, create_time, update_by, update_time, remark, latitude, longitude, "view", company_id , is_hot ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address, review_status from job
     </sql>
     <insert id="insertBatchRowWork">
         INSERT INTO row_work (
@@ -177,7 +179,7 @@
         );
     </update>
 
-    <select id="selectJobList" parameterType="Job" resultMap="JobResult">
+    <select id="selectJobList" parameterType="JobSearch" resultMap="JobResult">
         <include refid="selectJobVo"/>
         <where>  del_flag = '0'
             <if test="jobTitle != null  and jobTitle != ''"> and job_title = #{jobTitle}</if>
@@ -216,6 +218,12 @@
                     and min_salary &gt; 5000
                 </if>
             </if>
+            <if test="startDate != null and startDate != ''">
+                and posting_date >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                and posting_date &lt;= #{endDate}
+            </if>
         </where>
         order by is_explain desc
     </select>
@@ -349,4 +357,7 @@
         </where>
     </select>
 
+    <update id="updateReviewStatus">
+        update job set review_status = #{reviewStatus} where job_id = #{jobId}
+    </update>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java

@@ -129,4 +129,6 @@ public class Company extends BaseEntity
      */
     @TableField(exist = false)
     private List<JobDTO> jobList;
+
+
 }