From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
index d5d2132..c07c66e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
@@ -66,4 +66,17 @@
      * @author: luoyibo
      */
     void logicDelEmpPhysicalExam(String ids);
+
+    /**
+     * 从暂存状态转成正式状态
+     * <p>
+     * date 2021-02-04 21:11
+     *
+     * @param ids 待转换记录Id
+     * @return boolean
+     * @author: luoyibo
+     */
+    boolean momentToNormal(String ids);
+
+	void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0