|
@@ -44,7 +44,11 @@
|
|
|
|
|
|
<!--根据测算表id获取所有机器设备导入的数据-->
|
|
|
<select id="getAllByAssetsCalculateId" resultType="com.dayou.entity.AssetsCalculateEqptData">
|
|
|
- SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date, storage_location, quantity, unit_of_measurement, original_value, net_value, equipment_type, equipment_type_detail, remark, create_time, update_time, delete_status
|
|
|
+ SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date,
|
|
|
+ storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark,
|
|
|
+ create_time, update_time, delete_status, taxed_unit_price, (tax_rate / 100) AS taxRate, economic_service_life,
|
|
|
+ (direct_observation_depreciation_rate / 100) AS directObservationDepreciationRate, valuation_method, inquiry_basis, inquiry_location, price,
|
|
|
+ (freight_and_miscellaneous_fee_rate / 100) AS freightAndMiscellaneousFeeRate, (base_rate / 100) AS baseRate, (installation_rate / 100) AS installationRate
|
|
|
FROM assets_calculate_eqpt_data
|
|
|
WHERE delete_status = 0
|
|
|
AND assets_calculate_id = #{calculateId}
|
|
@@ -55,7 +59,11 @@
|
|
|
|
|
|
<!--分页查询导入的机器设备测算数据-->
|
|
|
<select id="getDataPage" resultType="com.dayou.entity.AssetsCalculateEqptData">
|
|
|
- SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date, storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark
|
|
|
+ SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date,
|
|
|
+ storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark,
|
|
|
+ create_time, update_time, delete_status, taxed_unit_price, tax_rate, economic_service_life,
|
|
|
+ direct_observation_depreciation_rate, valuation_method, inquiry_basis, inquiry_location, price,
|
|
|
+ freight_and_miscellaneous_fee_rate, base_rate, installation_rate
|
|
|
FROM assets_calculate_eqpt_data
|
|
|
WHERE delete_status = 0
|
|
|
AND assets_calculate_id = #{dto.calculateId}
|