From bedc1792239e77a46936bf9b175e324d57113bfe Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 06:13:50 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index 9300cbe..b436b0c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -1,6 +1,6 @@
package cc.mrbird.febs.server.hr.service;
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
/**
* name:EmpBaseinfo
@@ -104,6 +105,40 @@
/**
*
+ *
+ * @param s
+ * @param btime
+ * @param index 0 今天 1本周 2本月 3今年
+ * @return
+ */
+ Map<String, Object> countBaseInfoList(String s, String btime, String index);
+
+ IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpBaseInfo> baseInfoHeList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpDimissionAttend> empBaseInfoCqList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpLeaveInfo> empBaseInfoQjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpPhysicalExam> empBaseInfoTjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpLaborTrouble> empBaseInfoLzList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpJobChange> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpOccupational> empBaseInfoGsList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpAccidentCases> empBaseInfoYwList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpInsurance> empBaseInfoSbList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpUnemployment> empBaseInfoSyjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ IPage<EmpBadRecord> empBaseInfoBlList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+ /**
+ *
* 关闭员工档案
*
* date 2021-02-18 12:54
@@ -123,4 +158,10 @@
* @return boolean
*/
boolean changeEmpJob(EmpJobChange empJobChange);
+
+ /**
+ * 导入员工
+ * @param listObject
+ */
+ void importEmpBaseInfo(List<List<Object>> listObject);
}
--
Gitblit v1.8.0