From 85634b7f43eac1920281cd927325e0be985f1aa8 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 02 四月 2021 01:04:10 +0800
Subject: [PATCH] fix(bug修复): 在职员工授权与人员入司工龄计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
index f027f1d..3b24546 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
@@ -1,7 +1,12 @@
package cc.mrbird.febs.server.hr.mapper;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
+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;
@@ -13,19 +18,65 @@
* description:员工不良记录信息实体Mapper
*
* @author luoyibo
- * @date 2021-01-24 20:35:55
+ * @date 2021-01-31 11:26:42
* @since JDK1.8
*/
public interface EmpBadRecordMapper extends BaseMapper<EmpBadRecord> {
- @Update("<script> " +
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:42
+ */
+ @Update("<script> " +
" UPDATE t_emp_badrecord SET delFlag = 1,\n" +
" modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE badId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId}\n" +
- " </foreach>\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
"</script>")
- void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
-}
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ /**
+ * 暂存记录提交
+ * <p>
+ * date luoyibo
+ *
+ * @param list 暂存记录Id列表
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:42
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_badrecord SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ IPage<EmpBadRecord> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+ @Update("<script> " +
+ " UPDATE t_emp_badrecord 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