From 514e59c1e7e699f06adf57495e8112077b580125 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Thu, 30 Jul 2026 19:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E7=9F=B3?=
 =?UTF-8?q?=E6=B2=B3=E5=AD=90=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/cms/domain/JobExcelImportRecord.java   |  6 ++++++
 .../mapper/app/JobExcelImportRecordMapper.xml        | 12 ++++++------
 .../src/main/resources/mapper/app/JobMapper.xml      |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

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"
         <include refid="selectShzJobExcelImportRecordVo"/>
         <where> del_flag='0'
             <if test="fileName != null and fileName != ''">
-                and file_name like concat('%',#{fileName},'%')
+                and file_name like '%' || #{fileName} || '%'
             </if>
             <if test="storageResult != null and storageResult != ''">
-                and storage_result like concat('%',#{storageResult},'%')
+                and storage_result like '%' || #{storageResult} || '%'
             </if>
-            <if test="params.beginTime != null and params.beginTime != ''">
-                and create_time &gt;= #{params.beginTime}
+            <if test="beginTime != null and beginTime != ''">
+                and create_time &gt;= #{beginTime}
             </if>
-            <if test="params.endTime != null and params.endTime != ''">
-                and create_time &lt;= #{params.endTime}
+            <if test="endTime != null and endTime != ''">
+                and create_time &lt;= #{endTime}
             </if>
         </where>
         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 @@
             <if test="applyNum != null "> and apply_num = #{applyNum}</if>
             <if test="code != null "> and company_id in(select company_id from company where code=#{code})</if>
             <if test="jobStatus != null "> and job_status = #{jobStatus}</if>
-            <if test="createBy != null and createBy!=null"> and create_by = #{createBy}</if>
+            <if test="createBy != null and createBy!='' "> and (create_by = #{createBy} or update_by = #{createBy})</if>
             <if test="compensation!=null ">
                 <if test="compensation==0 ">
                     and min_salary &lt; 1750