From bedc1792239e77a46936bf9b175e324d57113bfe Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 06:13:50 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
index e9b8723..cca51c2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
@@ -1,5 +1,7 @@
package cc.mrbird.febs.server.hr.mapper;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.entity.*;
import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -8,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -64,6 +67,48 @@
" </foreach>\n" +
"</script>")
int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+ /**
+ *
+ * 关闭员工档案
+ *
+ * date 2021-02-18 12:54
+ * @author: luoyibo
+ * @param ids 待关闭档案员工 Id
+ * @param dimissionType 离职类型
+ * @param dimissionDate 离职日期
+ * @param remark 备注
+ * @return boolean
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_baseinfo SET empStatus = 1,\n" +
+ " dimissionDate = #{dimissionDate},\n" +
+ " dimissionType = #{dimissionType},\n" +
+ " remark = #{remark},\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>")
+ int closeEmpArchives(@Param("list") List<String> list, @Param("dimissionType") String dimissionType, @Param("dimissionDate") Date dimissionDate, @Param("remark") String remark, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_baseinfo SET \n" +
+ " deptId = #{mapParams.deptId},\n" +
+ " deptName = #{mapParams.deptName},\n" +
+ " jobId = #{mapParams.jobId},\n" +
+ " jobName = #{mapParams.jobName},\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{mapParams.operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE empId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int changeEmpJob(@Param("list") List<String> list, @Param("mapParams") Map<String,Object> mapParams);
@SqlParser(filter=true)
Map<String, Object> countBaseInfoList(@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime);
@@ -144,4 +189,6 @@
IPage<EmpBadRecord> empBaseInfoBlList(@Param("page") Page<EmpBadRecord> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
@SqlParser(filter=true)
IPage<EmpBaseInfo> sfzbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+ @SqlParser(filter=true)
+ IPage<EmpJobChange> empBaseInfoTgList(@Param("page")Page<EmpJobChange> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
}
\ No newline at end of file
--
Gitblit v1.8.0