From 179ace046094b9d84a8596ea78c9702390d5a56b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 15:34:44 +0800
Subject: [PATCH] fix(bug修复): excel导出日期处理

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java |   93 +++++++++++++++++++++++++++++++---------------
 1 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
index d5cfb9e..9ac083d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
@@ -1,42 +1,75 @@
 package cc.mrbird.febs.server.hr.mapper;
 
 import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
 /**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:13
-* @since JDK1.8
-*/
+ * name:EmpLeaveinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工请假记录实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:13
+ * @since JDK1.8
+ */
 public interface EmpLeaveInfoMapper extends BaseMapper<EmpLeaveInfo> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:13
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
-    " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
-    " modifyTime = NOW(),\n" +
-    " modifier = #{operatorId}, \n" +
-    " version = version+1 \n" +
-    " WHERE leaveId 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);
+    /**
+     * 根据Id批量逻辑删除记录
+     * <p>
+     * date luoyibo
+     *
+     * @param list       待删除Id
+     * @param operatorId 操作员Id
+     * @return void
+     * @author: 2021-01-31 11:26:13
+     */
+    @Update("<script> " +
+            " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
+            " modifyTime = NOW(),\n" +
+            " modifier = #{operatorId}, \n" +
+            " version = version+1 \n" +
+            " WHERE leaveId 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);
+
+    @Update("<script> " +
+            " UPDATE t_emp_leaveinfo SET delFlag = 0,\n" +
+            " modifyTime = NOW(),\n" +
+            " modifier = #{operatorId}, \n" +
+            " version = version+1 \n" +
+            " WHERE leaveId 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<EmpLeaveInfo> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+    @Update("<script> " +
+            " UPDATE t_emp_leaveinfo 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