|
|
@@ -79,7 +79,7 @@ public class FormulaDaoImpl implements IFormulaDao {
|
|
|
@Override
|
|
|
public Function<Long, MeterPeriodInfo> getInterimMeterPeriodFc() {
|
|
|
return certificateId->{
|
|
|
- String sql="select a.period_number number,a.sort from s_contract_meter_period a join s_interim_pay_certificate b on a.id=b.contract_period_id where a.is_deleted=0 and b.id=="+certificateId;
|
|
|
+ String sql="select a.period_number number,a.sort from s_contract_meter_period a join s_interim_pay_certificate b on a.id=b.contract_period_id where a.is_deleted=0 and b.id="+certificateId;
|
|
|
return this.jdbcTemplate.queryForObject(sql,new BeanPropertyRowMapper<>(MeterPeriodInfo.class));
|
|
|
};
|
|
|
}
|
|
|
@@ -87,7 +87,7 @@ public class FormulaDaoImpl implements IFormulaDao {
|
|
|
@Override
|
|
|
public Function<Long, List<Payment>> getPaymentListFc() {
|
|
|
return contractId->{
|
|
|
- String paySql="select a.form_number number,a.form_name name ,a.middle_meter_id,a.current_meter_total completed ,a.current_price price,current_meter_money money,meter_number meterNumber ,contract_meter_id meterId,b.id formId,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0 and a.approve_status=2 and a.contract_id="+contractId;
|
|
|
+ String paySql="select a.id,a.form_number number,a.form_name name ,a.middle_meter_id,a.current_meter_total completed ,a.current_price price,current_meter_money money,meter_number meterNumber ,contract_meter_id meterId,b.id formId,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0 and a.approve_status=2 and a.contract_id="+contractId;
|
|
|
return this.jdbcTemplate.query(paySql,new BeanPropertyRowMapper<>(Payment.class));
|
|
|
};
|
|
|
}
|
|
|
@@ -95,7 +95,7 @@ public class FormulaDaoImpl implements IFormulaDao {
|
|
|
@Override
|
|
|
public Function<Long, List<InventoryForm>> getInventoryFormFc() {
|
|
|
return contractId->{
|
|
|
- String sql="select form_name,chapter_number,bid_price,contract_total,form_number,contract_money,change_money from s_contract_inventory_form where is_deleted=0 and contract_id="+contractId;
|
|
|
+ String sql="select id,form_name,parent_id,chapter_number chapter,bid_price,contract_total,form_number,contract_money,change_money from s_contract_inventory_form where is_deleted=0 and contract_id="+contractId;
|
|
|
return getEntityList(sql,InventoryForm.class);
|
|
|
};
|
|
|
}
|
yangyj