zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
戈经莹
2026-07-30 21:03:38 +08:00
parent 546d8b9285 514e59c1e7
commit 408724a14a
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecord.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.cms.domain; package com.ruoyi.cms.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
@@ -48,4 +49,9 @@ public class JobExcelImportRecord extends BaseEntity {
@Excel(name = "失败原因") @Excel(name = "失败原因")
@ApiModelProperty("失败原因") @ApiModelProperty("失败原因")
private String failedReason; private String failedReason;
@TableField(exist = false)
private String beginTime;
@TableField(exist = false)
private String endTime;
} }

12
ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordMapper.xml
View File

@@ -39,16 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectShzJobExcelImportRecordVo"/> <include refid="selectShzJobExcelImportRecordVo"/>
<where> del_flag='0' <where> del_flag='0'
<if test="fileName != null and fileName != ''"> <if test="fileName != null and fileName != ''">
and file_name like concat('%',#{fileName},'%') and file_name like '%' || #{fileName} || '%'
</if> </if>
<if test="storageResult != null and storageResult != ''"> <if test="storageResult != null and storageResult != ''">
and storage_result like concat('%',#{storageResult},'%') and storage_result like '%' || #{storageResult} || '%'
</if> </if>
<if test="params.beginTime != null and params.beginTime != ''"> <if test="beginTime != null and beginTime != ''">
and create_time &gt;= #{params.beginTime} and create_time &gt;= #{beginTime}
</if> </if>
<if test="params.endTime != null and params.endTime != ''"> <if test="endTime != null and endTime != ''">
and create_time &lt;= #{params.endTime} and create_time &lt;= #{endTime}
</if> </if>
</where> </where>
order by create_time desc order by create_time desc

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

@@ -228,7 +228,7 @@
<if test="applyNum != null "> and apply_num = #{applyNum}</if> <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="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="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!=null ">
<if test="compensation==0 "> <if test="compensation==0 ">
and min_salary &lt; 1750 and min_salary &lt; 1750