开票、抄表接口

mitao

1 天以前 f38209014ee21c1a4e376a841cae3a3f86b9e18f

开票、抄表接口

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java

@@ -133,7 +133,7 @@
    private OaApprovalApplicationAsset buildOaApprovalApplicationAsset(OaApprovalApplicationAssetReceiveDTO dto, Integer applicationId) {
        OaApprovalApplicationAsset asset = BeanUtil.copyProperties(dto, OaApprovalApplicationAsset.class);
        asset.setApprovalApplicationId(applicationId);
        asset.setType(AssetOperateTypeEnum.RECEIVE.getCode());
        asset.setType(dto.getType());
        return asset;
    }

@@ -227,6 +227,7 @@
        vo.setTitle(detail.getTitle());
        vo.setAssetTypeId(detail.getAssetTypeId());
        vo.setOperateTime(detail.getOperateTime());
        vo.setExpectReturnDate(detail.getExpectReturnDate());
        vo.setItems(assetMainVOS);
        return vo;
    }
@@ -277,8 +278,12 @@
        // 4. 保存归还明细
        OaApprovalApplicationAsset detail = BeanUtil.copyProperties(dto, OaApprovalApplicationAsset.class);
        detail.setApprovalApplicationId(applications.getId());
        detail.setBorrowApplicationId(dto.getApprovalApplicationId());
        detail.setType(AssetOperateTypeEnum.RETURN.getCode());

        OaApprovalApplicationAsset asset = lambdaQuery().eq(OaApprovalApplicationAsset::getApprovalApplicationId, dto.getApprovalApplicationId()).one();
        if (Objects.nonNull(asset)) {
            detail.setAssetTypeId(asset.getAssetTypeId());
        }
        this.save(detail);

        // 5. 保存关联的资产项

 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml

@@ -72,9 +72,9 @@
        LEFT JOIN oa_approval_applications oaa ON oaaai.approval_application_id = oaa.id
        <where>
            oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId}
            <if test="assetIds != null and assetIds.size() > 0">
            <if test="assetMainIds != null and assetMainIds.size() > 0">
                AND oaaai.asset_main_id IN
                <foreach collection="assetIds" item="id" open="(" separator="," close=")">
                <foreach collection="assetMainIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>