From 1f8196dae2aeabdefce2ff82ee4cd86706b5c48b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期一, 22 二月 2021 15:24:57 +0800
Subject: [PATCH] 修改导出bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
index dd8ad42..b8915a5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.mapper;
+import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.entity.*;
@@ -110,7 +111,7 @@
"</script>")
int changeEmpJob(@Param("list") List<String> list, @Param("mapParams") Map<String,Object> mapParams);
@SqlParser(filter=true)
- Map<String, Object> countBaseInfoList(@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime);
+ Map<String, Object> countBaseInfoList(@Param("index") String index, @Param("btime") String btime, @Param("etime") String etime,@Param("manOld") String manOld,@Param("womanOld") String womanOld);
Integer countXjygBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
@SqlParser(filter=true)
@@ -189,4 +190,14 @@
IPage<EmpBadRecord> empBaseInfoBlList(@Param("page") Page<EmpBadRecord> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
@SqlParser(filter=true)
IPage<EmpBaseInfo> sfzbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+ @SqlParser(filter=true)
+ IPage<EmpJobChange> empBaseInfoTgList(@Param("page")Page<EmpJobChange> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+ @SqlParser(filter=true)
+ List<SysConfig> sysConfig();
+ @SqlParser(filter=true)
+ IPage<EmpBaseInfo> clbaseInfoList(@Param("page")Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("manOld") String manOld,@Param("womanOld") String womanOld);
+ @SqlParser(filter=true)
+ Map<String, Object> countZcygBaseInfoList(@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime);
+ @SqlParser(filter=true)
+ Map<String, Object> countXqhtBaseInfoList(@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime);
}
\ No newline at end of file
--
Gitblit v1.8.0