From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
index acc60c2..168835f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcVacationManagementService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcVacationManagement;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -17,6 +18,7 @@
/**
* 鏍规嵁id鏌ヨ
+ *
* @param id
* @return
*/
@@ -24,6 +26,7 @@
/**
* 鏂板鍋囨湡绠＄悊
+ *
* @param mdcVacationManagement
* @return
*/
@@ -31,6 +34,7 @@
/**
* 缂栬緫鍋囨湡绠＄悊
+ *
* @param mdcVacationManagement
* @return
*/
@@ -38,6 +42,7 @@
/**
* 鏍规嵁id鍒犻櫎
+ *
* @param id
* @return
*/
@@ -45,6 +50,7 @@
/**
* 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
@@ -52,17 +58,27 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param userId
* @param page
* @param req
* @param mdcVacationManagement
* @return
*/
- IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req,MdcVacationManagement mdcVacationManagement);
+ IPage<MdcVacationManagement> pageList(String userId, Page page, HttpServletRequest req, MdcVacationManagement mdcVacationManagement);
/**
* 鐢熸垚鍙屼紤鏃ヤ换鍔�
*/
void generateWeekDays();
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcVacationManagement
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcVacationManagement mdcVacationManagement);
+
}
--
Gitblit v1.9.3