From eeef2881041a1a27cc75acc917290c52128068e9 Mon Sep 17 00:00:00 2001 From: zzk Date: Sat, 7 May 2022 10:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8F=90=E5=89=8D=E7=BB=93?= =?UTF-8?q?=E6=B8=85=E7=A7=9F=E9=87=91=E5=AE=9E=E6=94=B6=E8=A1=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commbusiness/LBInitContractStatusBusiness.java | 7 +++---- .../project/commbusiness/AdvanceSettleChangRent.java | 12 +++--------- 2 files changed, 6 insertions(+), 13 deletions(-) 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 1b66db3c5..43efff087 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java @@ -23,12 +23,11 @@ public class LBInitContractStatusBusiness extends BaseBussiness { BizObjectManager bom=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME); String part = Sqlca.getString(" select case when min(TERMINATE_TYPE)=1 or min(TERMINATE_TYPE) is null then 'Y' else 'N' end from lb_equipment_car_temp lect where FLOWUNID = '"+FlowUnid+"' group by FLOWUNID"); Sqlca.join(bom); - if(contractStatus.equals("100")) { - settle(Sqlca); - } if("提前结清".equals(flowname)&&"Y".equals(settletype)&&"Y".equals(part)) { contractStatus = "31"; - } + }else if("提前结清".equals(flowname)) { + settle(Sqlca); + } bom.createQuery("update O set CONTRACT_STATUS=:contractstatus where id=:contractid").setParameter("contractstatus", contractStatus).setParameter("contractid", contractId).executeUpdate(); String sMessage="true"; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/AdvanceSettleChangRent.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/AdvanceSettleChangRent.java index e0f938b37..13587b793 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/AdvanceSettleChangRent.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/AdvanceSettleChangRent.java @@ -1,15 +1,7 @@ package com.tenwa.lease.flow.project.commbusiness; - -import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; - import java.util.HashMap; import java.util.Map; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.BizObjectQuery; -import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; @@ -35,7 +27,9 @@ public class AdvanceSettleChangRent extends BaseBussiness{ Map otherProperty = new HashMap(); otherProperty.put("FLOWUNID", ""); LeaseFlowBaseService service=new LeaseFlowBaseServiceImp(); - service.copyRentIncomeInfo(tx, fromCondtion, null , otherProperty, ServiceOperatorEnum.TempToFormal,null); + SqlObject sqlObject = new SqlObject("update lc_rent_income_temp set IS_FLOWING = '1' where FLOWUNID = '"+FlowUnid+"'"); + tx.executeSQL(sqlObject); + service.copyRentIncomeInfo(tx, fromCondtion, null , otherProperty, ServiceOperatorEnum.TempToFormal,null); }else{ String SQL="{call proc_terminate_bill_income('"+this.getAttribute("ContractId").toString()+"','"+this.getAttribute("ObjectNo").toString()+"','"+this.getAttribute("CurUserID").toString()+"','"+CurUser.getOrgID()+"')} "; SqlObject asql = new SqlObject(SQL);