From 8fb8d65defd7f541f709f7be4fb0da2857fc815c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=9F=E6=9E=97=E5=B8=86?= <zlf264035@163.com>
Date: Sat, 8 Oct 2022 21:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coe/pal/output/pr/report1/Report1Gener.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
index 203d5739..dbc7364f 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
+++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
@@ -212,15 +212,24 @@ public class Report1Gener {
 						continue;
 					}
 					Object attributes = entry.get("attributes");
+					String name = entry.get("name").toString();
 					String resultJson = attributes.toString();
+
 					JSONArray object= JSONArray.parseArray(resultJson);
 					for(int i=0; i<object.size(); i++) {
 						String key = object.getJSONObject(i).getString("key");
+						System.out.println("key============"+key);
 						//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
-						if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
+						/*if (key.equals("Name_process_performance_indicator")){//指标名称
 							String value = object.getJSONObject(i).getString("value");
-							processObj.put("pl_Name_process_performance_indicator", value);
-						}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
+							System.out.println("object====================="+object.toString());
+							System.out.println("value==============="+value);
+							processObj.put("pl_Name_process_performance_indicator", value);*/
+						 //绩效名称获取基础属性名称数据
+						 if(UtilString.isNotEmpty(name)){
+							 processObj.put("pl_Name_process_performance_indicator", name);
+						  }
+						 if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
 							String value = object.getJSONObject(i).getString("value");
 							processObj.put("pl_set_the_purpose", value);
 						}else if (key.equals("Index_definition")){//指标定义     Index_definition