DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
hdka
2025-03-18 11:52:24 +08:00
parent c0fe9c8885
commit dffce9e679
15 changed files with 125 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaSalaryMapper.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.oa.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.oa.domain.OaSalary;
@@ -22,11 +21,12 @@ public interface OaSalaryMapper extends BaseMapperPlus<OaSalaryMapper, OaSalary,
Page<OaSalaryVo> selectStaffVoPage(Page<Object> build,@Param(Constants.WRAPPER) Wrapper<OaSalary> lqw,@Param("payTime") Date payTime);
OaSalary selectVoByUserId(Long userId);
OaSalary selectVoByUserId(@Param("userId") Long userId,@Param("yearMonth") Date yearMonth);
OaSalaryVo selectVoAndItemVoById(@Param("salaryId")Long salaryId,@Param("payTime")Date payTime);
void delByPayTime(Date date);
void delItemByPayYearMonth(Date yearMonth);
}

4
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.oa.domain.vo.SysHolidayVo;
import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import java.util.Date;
import java.util.List;
/**
@@ -17,4 +18,7 @@ import java.util.List;
public interface SysOaHolidayMapper extends BaseMapperPlus<SysOaHolidayMapper, SysOaHoliday, SysOaHolidayVo> {
List<SysHolidayVo> queryVoList(SysOaHolidayBo bo);
Long queryWorkDayNumByMonth(Date payTime);
}