From 5f0755e78fbbae7fa448b7d398c0988810bccb39 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Tue, 2 Jul 2019 19:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=B9=8F=E8=BF=9C=E6=8E=A5=E5=8F=A3=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../query_report/pengyuanEbank.jsp            | 10 +++++++-
 .../query_report/pengyuandata.jsp             | 23 +++++++++++++++++--
 src_core/com/tenwa/util/SerialNumberUtil.java |  2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbank.jsp b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbank.jsp
index 3a8fec322..8068edc93 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbank.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbank.jsp
@@ -46,10 +46,15 @@
 			String result = bdc.getDataApplyId(CurPage, "ebank_af", Sqlca);
 			if("false".equals(result)) {
 				%>
+				<script type="text/javascript" src="<%=sWebRootPath %>/Frame/page/js/as_debug_message.js"></script>
 				<script type="text/javascript">
-				AsDebug.alert("提示","未找到数据");
+					AsDebug.alert("提示","该用户没有对应的详情信息！");
+					$(function(){
+						AsControl.OpenView("/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbankList.jsp", "FlowUnid=<%=flowunid%>","_self","");
+					})
 				</script>
 				<% 
+				return ;
 			}else{
 				String[] res = result.split("@");
 				applyId = res[1];
@@ -144,6 +149,9 @@
 		<script type="text/javascript" src="<%=sWebRootPath %>/Frame/page/js/as_debug_message.js"></script>
 		<script type="text/javascript">
 			AsDebug.alert("提示","获取数据失败");
+			$(function(){
+				AsControl.OpenView("/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuanEbankList.jsp", "FlowUnid=<%=flowunid%>","_self","");
+			})
 		</script>
 		<%
 	} finally {
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandata.jsp b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandata.jsp
index 434330f09..71acd91e2 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandata.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandata.jsp
@@ -21,10 +21,29 @@
 	boolean flag = true;
 	
 	if("GET".equals(getType)) {
-		JBOTransaction tx = JBOFactory.createJBOTransaction();
+		/* JBOTransaction tx = JBOFactory.createJBOTransaction();
 		applyId = SerialNumberUtil.getPengyuanNumber(tx);
 		tx.commit();
-		type = "SAVE";
+		type = "SAVE"; */
+		String result = bdc.getDataApplyId(CurPage, "pengyuan_af", Sqlca);
+		if("false".equals(result)) {
+			%>
+			<script type="text/javascript" src="<%=sWebRootPath %>/Frame/page/js/as_debug_message.js"></script>
+			<script type="text/javascript">
+				AsDebug.alert("提示","该用户没有对应的详情信息！");
+				$(function(){
+					AsControl.OpenView("/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandataList.jsp", "FlowUnid=<%=flowunid%>","_self","");
+				})
+			</script>
+			<%
+			return ;
+		} else {
+			String[] res = result.split("@");
+			applyId = res[1];
+			count = res[2];
+			type = "GET";
+		}
+
 	} else {
 		String result = bdc.getDataApplyId(CurPage, "pengyuan_af", Sqlca);
 		if("false".equals(result)) {
diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java
index bf021d8ed..468ebedce 100644
--- a/src_core/com/tenwa/util/SerialNumberUtil.java
+++ b/src_core/com/tenwa/util/SerialNumberUtil.java
@@ -56,7 +56,7 @@ public class SerialNumberUtil {
 	}
 	//鹏元apply_id
 	public static synchronized String  getPengyuanNumber(JBOTransaction tx) throws Exception{
-		return SerialNumberUtil.getSerialNumber("{year}{month}{day}{maxOrderNumber}",9,null, "", null, tx);
+		return SerialNumberUtil.getSerialNumber("{year}{month}{day}{maxOrderNumber}",9,null, "鹏元apply_id", null, tx);
 	}
 	/**
 	 * 通联代扣流水号