From 912c76b29fa80eb485cc713d8f5303b58c2b815e Mon Sep 17 00:00:00 2001
From: Mr-wang <m17852465079@163.com>
Date: Wed, 26 Jul 2023 23:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/output/or/report2/Report2Gener.java   |  7 ++++---
 .../js/coe.pal.pl.upfile.js                   | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java
index 646758a5..fc006083 100644
--- a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java
+++ b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java
@@ -209,7 +209,8 @@ public class Report2Gener {
 		for (RowMap rowMap:
 				nodeRowMaps) {
 			String plid = rowMap.getString("PLID");
-			if (!lists.contains(plid)){
+			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plid);
+			if (!lists.contains(plid)&&!palRepositoryModel.isStop()){
 				lists.add(plid);
 			}
 		}
@@ -349,9 +350,9 @@ public class Report2Gener {
 			}
 			_tr.put("it_system_table", itsystemTable);
 			//这个是存储kpi数据
-
+			SDK.getLogAPI().consoleInfo("lists.get(q)>>>>>>>>>>>>>>>>"+lists.get(q));
 			List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(lists.get(q), "", "Process_performance_metrics");
-
+			SDK.getLogAPI().consoleInfo("relationList2>>>>>>>>>>>>"+relationList2);
 			int u = 1;
 			if (relationList2.size() > 0) {
 				for (DesignerShapeRelationModel relation : relationList2) {
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
index fd20180e..501a2a97 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
@@ -83,6 +83,7 @@ $(function() {
             if (data.files.length == 0) {
                 return false;
             }
+
             // 因为该组件支持批量上传但是只支持对单个文件的上传过程/结束事件处理，在此处单个文件上传时进行此次多个上传文件记录（不支持批量上传的结果返回，借助外部变量记录单个文件上传结果）
             var allFiles = data.originalFiles;
             var fileArr = [];
@@ -507,6 +508,25 @@ function addFile(callback) { //开始上传，params参考引用
 
         }
     });
+
+    var params_data = {
+        "pl_uuid": pl_uuid,
+        "shape_uuid": shape_uuid
+    }
+    jQuery.ajax({
+        type: "POST",
+        url: "./jd?sid=" + encodeURIComponent(sid) + "&cmd=com.awspaas.apps.coe.pal.output.zd.UpFileExcelAndPptController.upfile",
+        data: params_data,
+        success: function(msg) {
+            var dataJson = msg.data;
+            if (msg.result == "ok") {
+
+            } else {
+            }
+
+        }
+    });
+
 }
 
 //获取选中图形的文件数组