From 5f5f07db32be63e6112ddff7722c1ada10472da5 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 14 八月 2023 18:43:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/service/business/SalaryParamService.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/SalaryParamService.java b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
index 1e89246..6269780 100644
--- a/server/src/main/java/doumeemes/service/business/SalaryParamService.java
+++ b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
@@ -3,6 +3,10 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.business.vo.SalaryParamVO;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -14,7 +18,7 @@
/**
* 鍒涘缓
- *
+ *
* @param salaryParam 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -48,6 +52,14 @@
*/
void updateById(SalaryParam salaryParam);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param salaryParam 瀹炰綋瀵硅薄
+ */
+ void update(SalaryParam salaryParam);
+
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -78,14 +90,14 @@
* @return List<SalaryParam>
*/
List<SalaryParam> findList(SalaryParam salaryParam);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<SalaryParam>
*/
- PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap);
+ PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap);
/**
* 鏉′欢缁熻
@@ -94,4 +106,10 @@
* @return long
*/
long count(SalaryParam salaryParam);
+
+ /**
+ *
+ * @param file
+ */
+ void importPlans(MultipartFile file);
}
--
Gitblit v1.9.3