zhoulisky преди 5 месеца
родител
ревизия
85a704e4da
променени са 1 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 5 5
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/AssetMapper.xml

+ 5 - 5
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/AssetMapper.xml

@@ -179,11 +179,11 @@
             (SELECT ROUND(IFNULL(sum(unit_price*quantity),0),2)
             from
             (
-                SELECT id,xm_id, unit_price, use_quantity as quantity ,year_and_month from kd_xm_goods where tenant_id = #{tenantId}
-                union
-                SELECT id,xm_id, unit_price, quantity ,year_and_month from kd_xm_lease where tenant_id = #{tenantId}
-                union
-                select id,xm_id, amount as unit_price, 1 as quantity ,year_and_month from kd_xm_direct_cost where tenant_id = #{tenantId}
+                SELECT xm_id, unit_price, use_quantity as quantity ,year_and_month from kd_xm_goods where tenant_id = #{tenantId}
+                union all
+                SELECT xm_id, unit_price, quantity ,year_and_month from kd_xm_lease where tenant_id = #{tenantId}
+                union all
+                select xm_id, amount as unit_price, 1 as quantity ,year_and_month from kd_xm_direct_cost where tenant_id = #{tenantId}
             )cost where cost.year_and_month = m.month) as zjtrfy,
             (ROUND((SELECT IFNULL(sum(yanfa_tan_xiao),0) FROM yiqishebeiassetcostview WHERE  tenant_id = #{tenantId} and year_and_month = m.month ) + (SELECT IFNULL(sum(yanfa_fen_tan),0) FROM fangwujianzhuwuAssetCostView WHERE  tenant_id = #{tenantId} and year_and_month = m.month ) + (SELECT IFNULL(sum(ytxe*syzb),0) FROM kd_xm_cqdtfy WHERE  tenant_id = #{tenantId} and year_and_month = m.month),2)) as zjfyycqdtfy,
             (SELECT ROUND(IFNULL(sum(amount),0),2) FROM kd_xm_design_cost WHERE tenant_id = #{tenantId} and cost_type='设计费用' and year_and_month = m.month) as sjfy,