From 0d35e405722d8657dfdde47d4e90d886ab1ff17a Mon Sep 17 00:00:00 2001
From: gityjf <2211675158@qq.com>
Date: Thu, 18 Feb 2021 18:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E8=81=94=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/allinpay/servlet/AllinpayServlet.java    |  8 +++++---
 .../lease/app/allinpay/servlet/SignDto.java      | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
index 0a1e2521b..304c60e68 100644
--- a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
+++ b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
@@ -213,6 +213,7 @@ public class AllinpayServlet extends BaseServlet {
                 certId = signObj.getCertId();
                 collectType = signObj.getCollectType();
                 signSource = signObj.getSubjectId();
+                projectId = signObj.getProjectId();
             }
             if (StringUtils.isEmpty(collectType) || "YLcollect".equals(collectType)) {
                 request.setAttribute("state", "500");
@@ -286,10 +287,10 @@ public class AllinpayServlet extends BaseServlet {
         try {
             Sqlca = Transaction.createTransaction(JBOFactory.createJBOTransaction());
             String queryId = projectId;
-            String sql = "SELECT ca.account customername,ca.mobile phonenumber,ca.acc_number accNumber,ca.certid certId,ca.collect_type collectType,lpi.subjectid FROM customer_account ca join lb_project_info lpi on lpi.id = ca.project_id WHERE ca.project_id=:queryId ";
+            String sql = "SELECT ca.account customername,ca.mobile phonenumber,ca.acc_number accNumber,ca.certid certId,ca.collect_type collectType,lpi.subjectid,ca.project_id FROM customer_account ca join lb_project_info lpi on lpi.id = ca.project_id WHERE ca.project_id=:queryId ";
             if (StringUtils.isNotBlank(flowunid)) {
                 queryId = flowunid;
-                sql = "SELECT ca.account customername,ca.mobile phonenumber,ca.acc_number accNumber,ca.certid certId,ca.collect_type collectType,lpi.subjectid FROM  customer_account_temp ca join lb_project_info lpi on lpi.id = ca.project_id WHERE ca.flowunid=:queryId ";
+                sql = "SELECT ca.account customername,ca.mobile phonenumber,ca.acc_number accNumber,ca.certid certId,ca.collect_type collectType,lpi.subjectid,ca.project_id FROM  customer_account_temp ca join lb_project_info lpi on lpi.id = ca.project_id WHERE ca.flowunid=:queryId ";
             }
             ASResultSet res = Sqlca.getASResultSet(new SqlObject(sql).setParameter("queryId", queryId));
             if (res.next()) {
@@ -299,7 +300,8 @@ public class AllinpayServlet extends BaseServlet {
                 String certId = res.getString("certId");
                 String collectType = res.getString("collectType");
                 String subjectid = res.getString("subjectid");
-                signDto = new SignDto(userName, phoneNumber, certId, accNumber, collectType, queryId,subjectid);
+                String db_projectId = res.getString("project_id");
+                signDto = new SignDto(userName, phoneNumber, certId, accNumber, collectType, db_projectId,subjectid);
             }
             Sqlca.commit();
         } catch (Exception e) {
diff --git a/src/com/tenwa/lease/app/allinpay/servlet/SignDto.java b/src/com/tenwa/lease/app/allinpay/servlet/SignDto.java
index bb39681bc..607eaea38 100644
--- a/src/com/tenwa/lease/app/allinpay/servlet/SignDto.java
+++ b/src/com/tenwa/lease/app/allinpay/servlet/SignDto.java
@@ -11,21 +11,21 @@ public class SignDto {
     private String certId;
     private String collectType;
     private String accNumber;
-    //数据查询id (临时表取值flowunid 正式表取值projectId)
-    private String queryId;
+    //项目标识
+    private String projectId;
     //主体标识
     private String subjectId;
 
     public SignDto() {
     }
 
-    public SignDto(String userName, String phoneNumber, String certId, String accNumber, String collectType ,String queryId,String subjectId) {
+    public SignDto(String userName, String phoneNumber, String certId, String accNumber, String collectType ,String projectId,String subjectId) {
         this.userName = userName;
         this.phoneNumber = phoneNumber;
         this.certId = certId;
         this.accNumber = accNumber;
         this.collectType = collectType;
-        this.queryId = queryId;
+        this.projectId = projectId;
         this.subjectId = subjectId;
     }
 
@@ -49,12 +49,12 @@ public class SignDto {
         return collectType;
     }
 
-    public String getQueryId() {
-        return queryId;
+    public String getProjectId() {
+        return projectId;
     }
 
-    public void setQueryId(String queryId) {
-        this.queryId = queryId;
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
     }
 
     public String getSubjectId() {