From c1c3d335b944fedc4f910f0dc7b447f92ee8a33c Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Mon, 30 Jun 2025 15:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/form/QueryInstancesFromPlugin.java | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java
index 6ecbdd4..b8d6461 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java
@@ -73,29 +73,20 @@ public class QueryInstancesFromPlugin extends AbstractFormPlugin implements Cell
             if(fieldKey.equals("zcgj_billno")){
                 Object number = getModel().getValue("zcgj_billno", row);
                 contract = BusinessDataServiceHelper.loadSingle(type.toString(), "id,billno,zcgj_renewal,zcgj_isrenewal", new QFilter[]{new QFilter("billno", QCP.equals, number.toString())});
+                BillShowParameter formShowParameter = new BillShowParameter();
+                formShowParameter.setFormId(type.toString());
+                formShowParameter.setPkId(contract.getLong("id"));
+                formShowParameter.getOpenStyle().setShowType(ShowType.Modal);
+                getView().showForm(formShowParameter);
             } else if (fieldKey.equals("zcgj_renewalnum")) {
                 Object number = getModel().getValue("zcgj_renewalnum", row);
                 contract = BusinessDataServiceHelper.loadSingle(type.toString(), "id,billno,zcgj_renewal,zcgj_isrenewal", new QFilter[]{new QFilter("billno", QCP.equals, number.toString())});
+                BillShowParameter formShowParameter = new BillShowParameter();
+                formShowParameter.setFormId(type.toString());
+                formShowParameter.setPkId(contract.getLong("id"));
+                formShowParameter.getOpenStyle().setShowType(ShowType.Modal);
+                getView().showForm(formShowParameter);
             }
-            BillShowParameter formShowParameter = new BillShowParameter();
-            formShowParameter.setFormId(type.toString());
-            formShowParameter.setPkId(contract.getLong("id"));
-            formShowParameter.getOpenStyle().setShowType(ShowType.Modal);
-            getView().showForm(formShowParameter);
-
-
-//            if (number != null) {
-//                if (contract != null) {
-////                    Qtype = "ec_in_contract";
-////                } else {
-////                    contract = BusinessDataServiceHelper.loadSingle("ec_out_contract", "id,billno,zcgj_renewal,zcgj_isrenewal", new QFilter[]{new QFilter("billno", QCP.equals, number.toString())});
-////                    type = "ec_out_contract";
-////                }
-//                }
-//                if (fieldKey.equals("zcgj_billno") || fieldKey.equals("zcgj_renewalnum")) {
-//
-//                }
-//            }
         }
     }