Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-14 5f5f07db32be63e6112ddff7722c1ada10472da5

 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);
}