From cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 19:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
index 9504f77..f4b7690 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.mapper;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.server.hr.entity.EmpAccessory;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -10,6 +11,7 @@
import org.apache.ibatis.annotations.Select;
+import java.util.List;
import java.util.Map;
/**
@@ -21,8 +23,13 @@
public interface EmpAccessoryMapper extends BaseMapper<EmpAccessory> {
- @Select("${sql} ${ew.customSqlSegment}")
- IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("sql") String sql);
+
+ IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
String getQuerySql();
+
+ List<DicItem> getDictType(@Param("type") String physicalexamtype);
+
+ List<Map<String,Object>> getEmpAccessoryNumber(@Param("empId") Long empId);
+
}
--
Gitblit v1.8.0