From be8f6f934191cfa787564d59fdd69810fad05cc5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期六, 27 二月 2021 03:35:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 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 a7b6c81..1f651a9 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
@@ -13,29 +13,51 @@
* 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> {
/**
- *
* 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
*
- * date 2021-01-28 10:32
- * @author: luoyibo
- * @param list 待删除Id
+ * @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" +
+ @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" +
+ " #{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);
+}
\ No newline at end of file
--
Gitblit v1.8.0