diff --git a/calc/com/tenwa/reckon/util/TbBeanTools.java b/calc/com/tenwa/reckon/util/TbBeanTools.java index 48e9e01ab..1081f79e8 100644 --- a/calc/com/tenwa/reckon/util/TbBeanTools.java +++ b/calc/com/tenwa/reckon/util/TbBeanTools.java @@ -4,14 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.amarsoft.are.jbo.JBOTransaction; - import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.lang.DataElement; import com.amarsoft.are.log.Log; import com.amarsoft.awe.util.SqlObject; import com.tenwa.reckon.bean.KnowingConfigBean; @@ -91,13 +89,7 @@ public class TbBeanTools { TabCalBean tcb = new TabCalBean(); tcb = getTabInfo(calType); tcb.setPlanCValue(plannumber); - String Condition_tb =tcb.getCondition_tb(); - String PlanCName = tcb.getPlanCName(); BizObject condition = JBOFactory.getBizObjectManager( tcb.getCondition_tb(), tx ).createQuery( "select * from O where flowunid = :flowunid and "+tcb.getPlanCName()+"='"+plannumber+"'" ).setParameter( "flowunid", flowunid ).getSingleResult( false ); - DataElement yearRate = condition.getAttribute("YEAR_RATE"); - if(yearRate!=null) { - String str = condition.getAttribute("YEAR_RATE").toString(); - } tcb.setCondition(condition); //设置已知规则 BizObjectManager m2 = JBOFactory.getBizObjectManager( tcb.getRuleTb(), tx ); @@ -189,6 +181,9 @@ public class TbBeanTools { }else if ("onHire_process".equals(calType)) {// 起租时 tcb.setPlanCName("PAYMENT_NUMBER"); tcb.setUserId("vi_contract_cust"); + }else if("contract_process".equals(calType)){// 合同审批 + tcb.setPlanCName("PROJECT_PLAN_NUMBER"); + tcb.setUserId("vi_contract_cust"); }else {// 默认为合同 tcb.setPlanCName("PAYMENT_NUMBER"); tcb.setUserId("vi_contract_cust");