From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java | 100 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 30 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 15a02a4..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,42 +1,82 @@
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;
import java.util.List;
/**
-*
-* name:EmpBadrecord
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工不良记录信息实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:42
-* @since JDK1.8
-*/
+ * name:EmpBadrecord
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工不良记录信息实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:42
+ * @since JDK1.8
+ */
public interface EmpBadRecordMapper extends BaseMapper<EmpBadRecord> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:42
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@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" +
- "</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: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" +
+ "</script>")
+ 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