From ea1a4b7994b0d9710c47cbb54b7824a9f4bd72c9 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 27 三月 2026 17:02:33 +0800
Subject: [PATCH] fix(EmpContractInfo): 修正导入合同信息的循环缩进并添加结束日期差值计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
index e2f100c..eacb661 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
@@ -1,11 +1,18 @@
package cc.mrbird.febs.server.hr.mapper;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
+import java.util.Map;
/**
* name:EmpWorkexperience
@@ -28,7 +35,7 @@
* @author: 2021-01-28 12:33:31
*/
@Update("<script> " +
- " UPDATE t_emp_workExperience SET delFlag = 1,\n" +
+ " UPDATE t_emp_workexperience SET delFlag = 1,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
@@ -40,7 +47,7 @@
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
@Update("<script> " +
- " UPDATE t_emp_workExperience SET delFlag = 0,\n" +
+ " UPDATE t_emp_workexperience SET delFlag = 0,\n" +
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
@@ -50,4 +57,19 @@
" </foreach>\n" +
"</script>")
int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ IPage<EmpWorkExperience> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+ @Update("<script> " +
+ " UPDATE t_emp_workexperience SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE empId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
}
\ No newline at end of file
--
Gitblit v1.8.0