feat: 综合业务模块功能补充与实体拓展

hsy

2026-08-28 a8e4132c3e2e9c3b3fcb0360901b35571b6464ea

 src/main/resources/mapper/device/DeviceLedgerMapper.xml

@@ -8,6 +8,16 @@
    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
        SELECT
        dl.id,
        dl.unique_code,
        dl.factory_number,
        dl.manufacturer,
        dl.original_asset_value,
        dl.purchase_date,
        dl.activation_date,
        dl.technical_parameters,
        dl.main_purpose,
        dl.responsible_person,
        dl.filing_date,
        dl.device_name,
        dl.device_model,
        dl.supplier_name,
@@ -26,12 +36,20 @@
        dl.un_tax_including_price_total,
        dl.create_time,
        dl.update_time ,
        su.user_name AS createUser,
        su.nick_name AS createUser,
        dl.update_user,
        dl.tenant_id
        dl.tenant_id,
        dl.is_depr,
        dl.annual_depreciation_amount,
        dl.type
        FROM device_ledger dl
        left join sys_user su on dl.create_user = su.user_id
        <where>
            <!-- 设备编号 -->
            <if test="deviceLedger.uniqueCode != null and deviceLedger.uniqueCode != ''">
                AND unique_code LIKE CONCAT('%', #{deviceLedger.uniqueCode}, '%')
            </if>
            
            <!-- 设备名称 -->
            <if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
                AND device_name LIKE CONCAT('%', #{deviceLedger.deviceName}, '%')
@@ -84,5 +102,18 @@
        from device_ledger
        where id = #{id}
    </select>
    <select id="getDeviceTypeDistributionByYear"
            resultType="com.ruoyi.account.bean.dto.DeviceTypeDetail"
            parameterType="java.lang.Integer">
        SELECT
            `type`,
            SUM(`number`) AS `count`,
            SUM(tax_including_price_unit) AS amount
        FROM device_ledger
        WHERE YEAR(create_time) = #{year}
          AND type IS NOT NULL
        GROUP BY type
    </select>


</mapper>