oa初步完成

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java

@@ -3,6 +3,10 @@ package com.ruoyi.oa.mapper;
 import com.ruoyi.oa.domain.SysOaAttendance;
 import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 人员考勤Mapper接口
@@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface SysOaAttendanceMapper extends BaseMapperPlus<SysOaAttendanceMapper, SysOaAttendance, SysOaAttendanceVo> {
 
+    List<SysOaAttendanceVo> selectVoListAndTime(@Param("userId") Long userId, @Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay);
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java

@@ -22,4 +22,5 @@ public interface SysOaProjectMapper extends BaseMapperPlus<SysOaProjectMapper, S
 
     Page<SysOaOutWarehouseListVo> selectPageOutList(@Param("page") Page<SysOaOutWarehouseListVo> page,@Param(Constants.WRAPPER) Wrapper<SysOaProject> queryWrapper);
 
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java

@@ -12,4 +12,11 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface SysOaWarehouseMapper extends BaseMapperPlus<SysOaWarehouseMapper, SysOaWarehouse, SysOaWarehouseVo> {
 
+    /**
+     *
+     * 查询已经被逻辑删除的数据
+     * @param warehouseId
+     * @return
+     */
+    SysOaWarehouseVo selectVoByIdAndXml(Long warehouseId);
 }