From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 14 八月 2023 15:19:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java index 6992d45..c1f4d46 100644 --- a/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java +++ b/server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java @@ -6,7 +6,9 @@ import doumeemes.dao.business.model.Workorder; import doumeemes.dao.business.model.WorkorderRecord; import doumeemes.dao.ext.bean.EndCheckApBean; +import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO; import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO; +import doumeemes.dao.ext.vo.SalaryStatisticsListVO; import doumeemes.dao.ext.vo.WorkorderRecordExtListVO; import javax.servlet.http.HttpServletResponse; @@ -45,4 +47,5 @@ void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response); + PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap); } -- Gitblit v1.9.3