diff --git a/src_sql/view/vi_rent_collect.sql b/src_sql/view/vi_rent_collect.sql index 372d5326f..efeac69a3 100644 --- a/src_sql/view/vi_rent_collect.sql +++ b/src_sql/view/vi_rent_collect.sql @@ -51,7 +51,7 @@ WHERE ((`lci`.`CONTRACT_STATUS` = '31') WHERE ((`lorl`.`PAYMENT_NUMBER` = `lrp`.`PAYMENT_NUMBER`) AND ((lorl.plan_id=lrp.id AND (`lorl`.`FLOW_NAME` IN('微信银联收款','微信支付收款','网银收款'))) - OR lorl.flow_name IN ('合同中途终止') + OR lorl.flow_name IN ('合同中途终止','提前结清申请') ) ))))) ); \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java index 43efff087..43155cd68 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java @@ -36,12 +36,17 @@ public class LBInitContractStatusBusiness extends BaseBussiness { public void settle(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); - String contractid = this.getAttribute("ContractId").toString(); //当前用户对象 + String contractid = this.getAttribute("ContractId").toString();//当前用户对象 String CurUser = this.getAttribute("CurUserID").toString(); //当前用户对象 - String flowunid = this.getAttribute("ObjectNo").toString(); // 获取流程编号 - String SQL="call settle_contract_info('"+contractid+"','"+flowunid+"','"+CurUser+"')"; - SqlObject asql = new SqlObject(SQL); - Sqlca.executeSQL(asql); + String flowunid = this.getAttribute("ObjectNo").toString(); //获取流程编号 + String insertSql = "insert into lb_contract_settlement select :contractId,:flowunid,curdate(),now(),:userId,max(lrp.PLAN_LIST)" + +" from from lb_contract_info lci left join lc_rent_plan lrp on lci.id = lrp.CONTRACT_ID " + +" where lci.id=:contractId"; + SqlObject sqlObject = new SqlObject(insertSql) + .setParameter("contractId", contractid) + .setParameter("flowunid", flowunid) + .setParameter("userId", CurUser); + Sqlca.executeSQL(sqlObject); } }