From a5f09f45442f8f6399b5c8d747f71f008eaa9283 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 18 Sep 2019 11:36:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=EF=BC=8C=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=8A=A0=E7=BD=91=E9=93=B6=E5=AF=B9?= =?UTF-8?q?=E6=96=B9=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowInstanceTrack/FlowInstanceTrack.jsp | 3 ++- WebContent/WEB-INF/etc/jbo/jbo_sys.xml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index ecfe93157..e361f2ae6 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -31,7 +31,8 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> <% String soft = CurPage.getParameter("soft"); - ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack"); + //ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack"); + ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3"); String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; diff --git a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml index b4993fff5..3242bbb8d 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml @@ -3132,6 +3132,25 @@ + + + + + + + + + + + + + + + + + + + From 55a34df30f7e512e75ae2c1b8df7fb16044fc347 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 18 Sep 2019 18:43:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=87=AA=E4=BD=9C?= =?UTF-8?q?=E5=8F=8A=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4=EF=BC=8C=20?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=89=A3=E6=AC=BE=E5=8D=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E9=87=8D=E6=96=B0=E7=AD=BE=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp | 2 +- .../tenwa/comm/customerfilterlist/DebitCardAction.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index 3e1ce88b8..abc51cfdc 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -184,7 +184,7 @@ iV_all("0"); setItemValue(0,0,"ACC_NUMBER",allTrim(getItemValue(0,0,"ACC_NUMBER"))); var flowName="<%=flowName%>"; - if("业务变更流程"==flowName||"合同制作流程"==flowName){ + if("业务变更流程"==flowName||"合同制作流程"==flowName || "合同变更流程"==flowName){ // 判断是否变更， 如果变更了， 将变更内容插入中间表 var account = getItemValue(0,0,"account"); // 账户名称 var acc_number = getItemValue(0,0,"acc_number"); // 银行账号 diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index bcec06c80..08c1f6fc7 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -294,7 +294,7 @@ public class DebitCardAction { Sqlca =Transaction.createTransaction(CacheLoaderFactory.getDataSource()); // 查询页面上的数据是否与正式表匹配 - selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND BANK_NAME='"+bank_name+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"'"; + selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND BANK_NAME='"+bank_name+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"' and SIGN_STATUS='Y'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, selectSql, null); // 如果不匹配， 说明是变更的， 判断数据在中间表是否已存在; @@ -308,6 +308,8 @@ public class DebitCardAction { for (Map his : HisList) { if("Y".equals(his.get("SIGN_STATUS"))){ sign_status = "Y"; + updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='Y' WHERE PROJECT_ID='"+projectid+"' "; + Sqlca.executeSQL(updateSql); break; } } @@ -316,9 +318,14 @@ public class DebitCardAction { if(dataList2 ==null || dataList2.size()==0){ insertSql="INSERT INTO CUSTOMER_ACCOUNT_MIDDLE(ID,ACC_NUMBER,BANK_NAME,ACCOUNT,PROJECT_ID,CONTRACT_ID,MOBILE,SIGN_STATUS,INSERTTIME,flowunid) VALUES(REPLACE(UUID(),'-',''),'"+acc_number+"','"+bank_name+"','"+account+"','"+projectid+"','"+contractid+"','"+mobile+"','"+sign_status+"','"+date+"','"+FlowUnid+"')"; Sqlca.executeSQL(insertSql); + updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='N' WHERE PROJECT_ID='"+projectid+"' "; + Sqlca.executeSQL(updateSql); }else{ updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"',SIGN_STATUS='"+sign_status+"' WHERE PROJECT_ID='"+projectid+"' "; Sqlca.executeSQL(updateSql); + updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='N' WHERE PROJECT_ID='"+projectid+"' "; + Sqlca.executeSQL(updateSql); + } // 如果匹配， 说明没有变更， 将中间表相关数据删除 }else{ From b90b5f8d1fb33b926d84d7f9ab0b4dfac3730fc8 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 18 Sep 2019 19:46:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=81=E7=BB=8F=E9=94=80=E5=95=86=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorApproval/LDistributorAccountInfo.jsp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp index 0a154ba96..d8c3b1135 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp @@ -14,7 +14,7 @@ // if(sTempletNo == null) sTempletNo = "LDistributorAccountInfo"; BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("proj_id").getString():""; - + BizObject flow2=JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setDefaultValue("FLOWUNID", flowunid); @@ -39,6 +39,16 @@ function save(){ setItemValue(0,0,"sPara","<%=sflowunid%>"); var partner = getItemValue(0,getRow(0),"IS_MAIN"); + // 银行号去" "； + var ACC_NUMBER = getItemValue(0,getRow(0),"ACC_NUMBER"); + var ACC_NUMBER2=""; + for (i = 0; i < ACC_NUMBER.length; i++) { + var s=ACC_NUMBER.charAt(i); + if(s!=" "){ + ACC_NUMBER2+=s; + } + } + setItemValue(0,0,"ACC_NUMBER",ACC_NUMBER2); if(partner=="Y"){ var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.AccountInfoManage","CheckPartnerInfo","flowunid=<%=flowunid%>,id=<%=id%>"); if(result=="1"){