Merge remote-tracking branch 'origin/master'

mitao

2 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

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

@@ -2,11 +2,14 @@

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;
@@ -52,19 +55,27 @@

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

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

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

    PageInfo<StorageListVO> pageList(ApprovalDetailQuery query);

    /**
     * 根据审批单ID删除入库申请
     * @param id
     */
    void removeByApplicationId(Integer id);
}