diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml
index c61cd27..f44ce9a 100644
--- a/zeroerr_oa-admin/src/main/resources/application.yml
+++ b/zeroerr_oa-admin/src/main/resources/application.yml
@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  #profile: D:/zeroerr/uploadPath
-  profile: /home/zeroerr_oa/uploadPath
+  profile: D:/zeroerr/uploadPath
+  #profile: /home/zeroerr_oa/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -76,8 +76,8 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
-    #password:
+    #password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java
index 9f6243b..bb71e5a 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java
@@ -8,6 +8,7 @@ import cn.zeroerr.common.core.domain.entity.SysUser;
 import cn.zeroerr.common.core.page.TableDataInfo;
 import cn.zeroerr.common.enums.BusinessType;
 import cn.zeroerr.common.utils.poi.ExcelUtil;
+import cn.zeroerr.domain.dto.EntryManagerDTO;
 import cn.zeroerr.domain.entity.EntryManage;
 import cn.zeroerr.domain.entity.ResumeFollowRecord;
 import cn.zeroerr.domain.vo.UserVO;
@@ -76,7 +77,7 @@ public class EntryManageController extends BaseController {
     @PreAuthorize("@ss.hasAnyPermi('recruit:entry:list')")
     @GetMapping("/list")
     @ApiOperation(value = "入职管理的记录列表")
-    public TableDataInfo listEntryManage(EntryManage req) {
+    public TableDataInfo listEntryManage(EntryManagerDTO req) {
 //        boolean isHr = false;
 //        List<SysRole> sysRoles = iSysRoleService.rolesByUserId(getUserId());
 //        if (!CollectionUtils.isEmpty(sysRoles)) {
@@ -108,7 +109,7 @@ public class EntryManageController extends BaseController {
     @PreAuthorize("@ss.hasAnyPermi('recruit:entry:export')")
     @ApiOperation(value = "下载入职管理记录")
     @Log(title = "下载入职管理记录", businessType = BusinessType.EXPORT)
-    public void export(HttpServletResponse response, EntryManage req) {
+    public void export(HttpServletResponse response, EntryManagerDTO req) {
 //        boolean isHr = false;
 //        List<SysRole> sysRoles = iSysRoleService.rolesByUserId(getUserId());
 //        if (!CollectionUtils.isEmpty(sysRoles)) {
@@ -126,7 +127,7 @@ public class EntryManageController extends BaseController {
         //将序号重新排列
         for (int i = 0; i < entryManageList.size(); i++) {
             EntryManage entry = entryManageList.get(i);
-            entry.setEntryId(Long.valueOf(i));
+            entry.setEntryId((long) i);
         }
         ExcelUtil<EntryManage> util = new ExcelUtil<EntryManage>(EntryManage.class);
         util.exportExcel(response,entryManageList, "入职管理数据");
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/EntryManagerDTO.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/EntryManagerDTO.java
new file mode 100644
index 0000000..3fca755
--- /dev/null
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/EntryManagerDTO.java
@@ -0,0 +1,51 @@
+package cn.zeroerr.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@ApiModel
+public class EntryManagerDTO {
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "id")
+    private Long entryId;
+
+    @ApiModelProperty(value = "hrId")
+    private Long hrId;
+
+    @ApiModelProperty(value = "hr的名字")
+    private String hrName;
+
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "是否确认入职")
+    private String isEntry;
+
+    @ApiModelProperty(value = "预计入职日期-起始")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startJoinDate;
+
+    @ApiModelProperty(value = "预计入职日期-截止")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endJoinDate;
+
+    @ApiModelProperty(value = "实际入职日期-起始")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startActualJoinDate;
+
+    @ApiModelProperty(value = "实际入职日期-截止")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endActualJoinDate;
+
+}
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java
index 6b993e3..5aad1fc 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java
@@ -105,6 +105,14 @@ public class EntryManage implements Serializable {
     @Excel(name = "实际入职日期", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate actualJoinDate;
 
+
+    /**
+     * 是否确定入职
+     */
+    @TableField(value = "is_entry")
+    @Excel(name = "是否确定入职",dictType = "recruit_interview_pass")
+    private String isEntry;
+
     /**
      * 入职失败的原因
      */
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/EntryManageMapper.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/EntryManageMapper.java
index f26356d..dabba3f 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/EntryManageMapper.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/EntryManageMapper.java
@@ -1,5 +1,6 @@
 package cn.zeroerr.mapper;
 
+import cn.zeroerr.domain.dto.EntryManagerDTO;
 import cn.zeroerr.domain.entity.EntryManage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,7 @@ import java.util.List;
 @Repository
 public interface EntryManageMapper extends BaseMapper<EntryManage> {
 
-    List<EntryManage> listBySelect(@Param("req") EntryManage req);
+    List<EntryManage> listBySelect(@Param("req") EntryManagerDTO req);
 }
 
 
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/EntryManageService.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/EntryManageService.java
index 5ae7039..c5e8a44 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/EntryManageService.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/EntryManageService.java
@@ -1,5 +1,6 @@
 package cn.zeroerr.service;
 
+import cn.zeroerr.domain.dto.EntryManagerDTO;
 import cn.zeroerr.domain.entity.EntryManage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,5 +14,5 @@ import java.util.List;
 public interface EntryManageService extends IService<EntryManage> {
 
 
-    List<EntryManage> listBySelect(EntryManage req);
+    List<EntryManage> listBySelect(EntryManagerDTO req);
 }
diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/EntryManageServiceImpl.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/EntryManageServiceImpl.java
index 62d8ed2..bb410d4 100644
--- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/EntryManageServiceImpl.java
+++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/EntryManageServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.zeroerr.service.impl;
 
+import cn.zeroerr.domain.dto.EntryManagerDTO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.zeroerr.domain.entity.EntryManage;
 import cn.zeroerr.service.EntryManageService;
@@ -18,7 +19,7 @@ public class EntryManageServiceImpl extends ServiceImpl<EntryManageMapper, Entry
     implements EntryManageService{
 
     @Override
-    public List<EntryManage> listBySelect(EntryManage req) {
+    public List<EntryManage> listBySelect(EntryManagerDTO req) {
         return this.baseMapper.listBySelect(req);
     }
 }
diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/EntryManageMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/EntryManageMapper.xml
index a0c45e5..747a930 100644
--- a/zeroerr_oa-recruit/src/main/resources/mapper/EntryManageMapper.xml
+++ b/zeroerr_oa-recruit/src/main/resources/mapper/EntryManageMapper.xml
@@ -17,6 +17,7 @@
             <result property="joinDate" column="join_date" jdbcType="DATE"/>
             <result property="actualJoinDate" column="actual_join_date" jdbcType="DATE"/>
             <result property="entryFailReason" column="entry_fail_reason" />
+            <result property="isEntry" column="is_entry" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -24,21 +25,25 @@
         post_id,post_name,
         user_name,hr_id,hr_name,
         final_pass_date,join_date,actual_join_date,
-        entry_fail_reason
+        entry_fail_reason,is_entry
     </sql>
 
     <select id="listBySelect" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/>
         from entry_manage
         where dept_id is not null
-        <if test="req.finalPassDate!=null"> and final_pass_date <![CDATA[=]]> #{req.finalPassDate}</if>
-        <if test="req.joinDate!=null"> and join_date <![CDATA[=]]> #{req.joinDate}</if>
-        <if test="req.actualJoinDate!=null"> and actual_join_date <![CDATA[=]]> #{req.actualJoinDate}</if>
+        <if test="req.startJoinDate!=null"> and join_date <![CDATA[>=]]> #{req.startJoinDate}</if>
+        <if test="req.endJoinDate!=null"> and join_date <![CDATA[<=]]> #{req.endJoinDate}</if>
+        <if test="req.startActualJoinDate!=null"> and actual_join_date <![CDATA[>=]]> #{req.startActualJoinDate}</if>
+        <if test="req.endActualJoinDate!=null"> and actual_join_date <![CDATA[<=]]> #{req.endActualJoinDate}</if>
+
         <if test="req.hrName!=null and req.hrName != ''">and hr_name like concat('%', #{req.hrName}, '%')</if>
         <if test="req.postName!=null and req.postName != ''">and post_name like concat('%', #{req.postName}, '%')</if>
+        <if test="req.userName!=null and req.userName != ''">and user_name like concat('%', #{req.userName}, '%')</if>
         <if test="req.deptId!=null">and dept_id = #{req.deptId}</if>
         <if test="req.entryId!=null">and entry_id = #{req.entryId}</if>
         <if test="req.hrId!=null">and hr_id = #{req.hrId}</if>
+        <if test="req.isEntry!=null">and is_entry = #{req.isEntry}</if>
         order  by final_pass_date desc
     </select>
 </mapper>