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/dao/ext/WorkorderRecordExtMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java b/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
index 1916a9a..6697c0b 100644
--- a/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
+++ b/server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java
@@ -2,9 +2,9 @@
import doumeemes.dao.business.model.WorkorderRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import doumeemes.dao.ext.vo.WOutboundRecordExtListVO;
-import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
-import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
+import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
+import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
+import doumeemes.dao.ext.vo.*;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
import io.lettuce.core.dynamic.annotation.Param;
@@ -18,6 +18,7 @@
* @date 2022/04/20 10:56
*/
List<WorkorderRecordExtListVO> selectListNew(QueryWorkorderRecordExtDTO dto);
+ List<SalaryStatisticsListVO> salaryStatistic(QuerySalaryStatisticDTO dto);
List<WStockExtListForWorkorderVO> choiceWorkorderRecordUseStockList(QueryWorkorderRecordExtDTO dto);
@@ -35,4 +36,5 @@
List<WorkorderRecordExtListVO> checkIsWork(@Param("ids")String ids);
+ List<UserSalaryListVO> userSalaryPage(QueryUserSalaryListDTO model);
}
--
Gitblit v1.9.3