Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 a3a0d8a83e538efc6cf27865e5a33bf26e958ff7

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

@@ -30,8 +30,9 @@
            CASE WHEN at2.level = 2 THEN at1.type_name ELSE at2.type_name END AS firstAssetTypeName,
            CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END         AS secondAssetTypeName,
            oaa.operate_time                     AS operateTime,
            aaa.approval_status                  AS approvalStatus
            oaa.return_status                     AS returnStatus
            aaa.approval_status                  AS approvalStatus,
            oaa.return_status                     AS returnStatus,
            oaa.expect_return_date               AS expectReturnDate
        FROM oa_approval_application_asset oaa
                 INNER JOIN oa_approval_applications aaa ON aaa.id = oaa.approval_application_id
                 LEFT JOIN asset_type at2 ON at2.id = oaa.asset_type_id
@@ -53,5 +54,44 @@
        </where>
        ORDER BY oaa.operate_time DESC, oaa.id DESC
    </select>
    <select id="selectReturnByAssetIds" resultType="com.ruoyi.system.bo.OaApprovalApplicationAssetReturnBO">
        SELECT
        oaa.application_code,
        CASE
        WHEN oaa.approval_status = 0 THEN
        1
        WHEN oaa.approval_status = 1 THEN
        2
        END AS return_status,
        oaaai.asset_main_id
        FROM
        oa_approval_application_asset_item oaaai
        LEFT JOIN oa_approval_application_asset oaaa ON oaaai.approval_application_id = oaaa.approval_application_id
        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">
                AND oaaai.asset_main_id IN
                <foreach collection="assetIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
        </where>
        ORDER BY oaa.create_time DESC
    </select>
    <select id="getBorrowDetailByApplicationCode"
            resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO"
            parameterType="java.lang.Long">
        SELECT
            oaa.*,
            oaaa.operate_time
        FROM
            oa_approval_applications oaa
                LEFT JOIN oa_approval_application_asset oaaa ON oaa.id = oaaa.approval_application_id
        WHERE
            oaa.applicant_user_id = #{userId}
          AND oaa.approval_status = 1
          AND oaaa.type = 1
    </select>

</mapper>