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/EmpContractInfoMapper.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
index a035d5f..4c1e12e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
@@ -39,4 +39,25 @@
     "        </foreach>\n" +
     "</script>")
 void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+    /**
+     *
+     * 暂存记录提交
+     *
+     * date luoyibo
+     * @author: 2021-01-31 11:28:23
+     * @param list 待删除Id
+     * @param operatorId 操作员Id
+     * @return void
+     */
+    @Update("<script> " +
+            " UPDATE t_emp_contractinfo SET delFlag = 0,\n" +
+            " modifyTime = NOW(),\n" +
+            " modifier = #{operatorId}, \n" +
+            " version = version+1 \n" +
+            " WHERE contractId 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