diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/MakingContractCarCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/MakingContractCarCheck.java index d93d169b2..702d5fbc2 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/MakingContractCarCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/MakingContractCarCheck.java @@ -9,6 +9,7 @@ import java.util.Map; import jbo.app.tenwa.customer.CUSTOMER_INFO; import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; import com.amarsoft.are.jbo.BizObject; @@ -28,28 +29,35 @@ public class MakingContractCarCheck extends DefaultBussinessCheck { Message.append("未填写:"); String flowunid=this.getAttribute("ObjectNo").toString(); BizObjectManager lultMange = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME, Sqlca); + BizObjectManager lcitMange = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME, Sqlca); + BizObject lcit = lcitMange.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); BizObject lul = lultMange.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); BizObjectManager ciMange = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME, Sqlca); BizObject ci = ciMange.createQuery("customerid=:customerid").setParameter("customerid", lul.getAttribute("CUSTOMER_ID").getString()).getSingleResult(false); BizObjectManager ldclMange = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, Sqlca); BizObject ldcl = ldclMange.createQuery("flow_unid=:flowunid and file_flag='yes'").setParameter("FLOWUNID", flowunid).getSingleResult(false); - if(ldcl!=null){ - if("03".equals(ci.getAttribute("CUSTOMERTYPE").getString())){ - if("4".equals(ldcl.getAttribute("PROCESS").getString())){ - putMsg("已完成电子签约!"); - setPass(true); + if(!"1".equals(lcit.getAttribute("IS_NETCAR").getString())){ + if(ldcl!=null){ + if("03".equals(ci.getAttribute("CUSTOMERTYPE").getString())){ + if("4".equals(ldcl.getAttribute("PROCESS").getString())){ + putMsg("已完成电子签约!"); + setPass(true); + }else{ + putMsg("请先完成电子签约!"); + setPass(false); + } }else{ - putMsg("请先完成电子签约!"); - setPass(false); + putMsg("已完成!"); + setPass(true); } + }else{ - putMsg("已完成!"); - setPass(true); + putMsg("请先制作合同!"); + setPass(false); } - }else{ - putMsg("请先制作合同!"); - setPass(false); + putMsg("网约车无需发起电子签约!"); + setPass(true); } return null; }