Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 a3a0d8a83e538efc6cf27865e5a33bf26e958ff7

 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java

@@ -2,11 +2,15 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.OaApprovalApplicationAsset;
import com.ruoyi.system.dto.asset.OaApprovalApplicationAssetReceiveDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationAssetReturnDTO;
import com.ruoyi.system.model.OaApprovalApplicationAsset;
import com.ruoyi.system.query.OaApprovalApplicationAssetPageQuery;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
import com.ruoyi.system.vo.asset.AssetMainVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;

import java.util.List;

/**
 * <p>
@@ -41,4 +45,44 @@
     * @return
     */
    IPage<OaApprovalApplicationAssetPageVO> getBorrowPageList(OaApprovalApplicationAssetPageQuery pageQuery);

    /**
     * 获取借用单详情
     * @param id
     * @return
     */
    OaApprovalApplicationAssetDetailVO getBorrowDetail(Integer id);

    /**
     * 查询当前登录人未归还的借用单列表
     * @return
     */
    List<OaApprovalApplicationAssetDetailVO> getBorrowDetailByApplicationCode();

    /**
     * 根据审批单ID获取借用单详情列表
     * @param id
     * @return
     */
    List<AssetMainVO> getBorrowDetailList(Integer applicationId);

    /**
     * 归还申请
     * @param dto
     */
    void submitReturn(OaApprovalApplicationAssetReturnDTO dto);

    /**
     * 归还列表
     * @param pageQuery
     * @return
     */
    IPage<OaApprovalApplicationAssetPageVO> getReturnPageList(OaApprovalApplicationAssetPageQuery pageQuery);

    /**
     * 获取归还提醒列表
     * @param pageQuery
     * @return
     */
    IPage<OaApprovalApplicationAssetPageVO> getReturnNotifyPageList(OaApprovalApplicationAssetPageQuery pageQuery);
}