fix query plant and equipment

main
MrWaradana 4 weeks ago
parent 7df44deb4d
commit 3ed4203f96

@ -129,7 +129,7 @@ where
and a.wonum not like 'T%' and a.wonum not like 'T%'
{f"AND a.wojp8 != 'S1'" if worktype == 'CM' else ""} {f"AND a.wojp8 != 'S1'" if worktype == 'CM' else ""}
group by DATE_PART('year', a.reportdate) group by DATE_PART('year', a.reportdate)
having ROUND(SUM(EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600), 2) <= 730.001; having ROUND(SUM(EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600), 2) <= 730;
""" """
# Eksekusi query dan fetch hasil # Eksekusi query dan fetch hasil
cursor.execute(query) cursor.execute(query)

@ -239,7 +239,8 @@ def main():
chart_capex_component_a = %s, chart_capex_component_a = %s,
chart_capex_biaya_investasi_tambahan = %s, chart_capex_biaya_investasi_tambahan = %s,
chart_capex_acquisition_cost = %s, chart_capex_acquisition_cost = %s,
chart_capex_annualized = %s chart_capex_annualized = %s,
cost_disposal_cost = %s,
WHERE seq = %s \ WHERE seq = %s \
""" """
@ -500,6 +501,8 @@ def main():
calc4_free_cash_flow_on_equity_array.append(calc4_free_cash_flow_on_equity) calc4_free_cash_flow_on_equity_array.append(calc4_free_cash_flow_on_equity)
calc4_discounted_fcf_on_equity = hitung_pv(wacc_on_equity, seq, calc4_free_cash_flow_on_equity) calc4_discounted_fcf_on_equity = hitung_pv(wacc_on_equity, seq, calc4_free_cash_flow_on_equity)
cost_disposal_cost = -npf.pmt(discount_rate, seq, cost_a_acquisition)
row_params = ( row_params = (
net_capacity_factor, net_capacity_factor,
eaf, eaf,
@ -567,7 +570,8 @@ def main():
chart_capex_biaya_investasi_tambahan, chart_capex_biaya_investasi_tambahan,
chart_capex_acquisition_cost, chart_capex_acquisition_cost,
chart_capex_annualized, chart_capex_annualized,
seq # <-- penting: ini untuk WHERE cost_disposal_cost,
seq # <-- penting: ini untuk WHERE
) )
params.append(tuple(normalize_db_value(v) for v in row_params)) params.append(tuple(normalize_db_value(v) for v in row_params))

Loading…
Cancel
Save