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)) {
%>
+
<%
+ return ;
}else{
String[] res = result.split("@");
applyId = res[1];
@@ -144,6 +149,9 @@
<%
} 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)) {
+ %>
+
+
+ <%
+ 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);
}
/**
* 通联代扣流水号