diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecord.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecord.java
index b3dfcaa..314b6cb 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecord.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecord.java
@@ -1,5 +1,6 @@
package com.ruoyi.cms.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -48,4 +49,9 @@ public class JobExcelImportRecord extends BaseEntity {
@Excel(name = "失败原因")
@ApiModelProperty("失败原因")
private String failedReason;
+
+ @TableField(exist = false)
+ private String beginTime;
+ @TableField(exist = false)
+ private String endTime;
}
\ No newline at end of file
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordMapper.xml
index 524f6c3..a91f1e2 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordMapper.xml
@@ -39,16 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag='0'
- and file_name like concat('%',#{fileName},'%')
+ and file_name like '%' || #{fileName} || '%'
- and storage_result like concat('%',#{storageResult},'%')
+ and storage_result like '%' || #{storageResult} || '%'
-
- and create_time >= #{params.beginTime}
+
+ and create_time >= #{beginTime}
-
- and create_time <= #{params.endTime}
+
+ and create_time <= #{endTime}
order by create_time desc
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
index e09de96..6ab615c 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
@@ -228,7 +228,7 @@
and apply_num = #{applyNum}
and company_id in(select company_id from company where code=#{code})
and job_status = #{jobStatus}
- and create_by = #{createBy}
+ and (create_by = #{createBy} or update_by = #{createBy})
and min_salary < 1750