Merge remote-tracking branch 'origin/master'

mitao

2 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

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

@@ -2,12 +2,18 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageVehicleDTO;
import com.ruoyi.system.model.OaApprovalApplicationStorage;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
import com.ruoyi.system.vo.StorageListVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePropertyDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageVehicleDetailVO;

/**
 * <p>
@@ -46,4 +52,24 @@
     * @return 分页数据
     */
    IPage<OaApprovalApplicationStoragePageVO> getPageList(OaApprovalApplicationStoragePageQuery pageQuery);

    /**
     * 获取通用资产入库申请详情
     * @param storageId 入库申请存储表ID
     */
    OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer storageId);

    /**
     * 获取房产资产入库申请详情
     * @param storageId 入库申请存储表ID
     */
    OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer storageId);

    /**
     * 获取车辆资产入库申请详情
     * @param storageId 入库申请存储表ID
     */
    OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer storageId);

    PageInfo<StorageListVO> pageList(ApprovalDetailQuery query);
}