From 2f3c8ee0639392ef26742060019dd93fb5630a87 Mon Sep 17 00:00:00 2001
From: yujh <yujh_java@163.com>
Date: Mon, 2 Sep 2024 11:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=B8=B8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8A=E7=BA=BF=E5=89=8D=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/output/pr/report1/Report1Gener.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 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 cd45e7ff..d302fab0 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
@@ -664,7 +664,8 @@ public class Report1Gener {
 			// TODO: handle exception
 		}*/
 		//上下游流程
-		List<PALRepositoryPropertyModel> repositoryPropertyList = PALRepositoryPropertyCache.getPropertyByPlId(repositoryModel.getId());
+		//上线临时抽离
+		/*List<PALRepositoryPropertyModel> repositoryPropertyList = PALRepositoryPropertyCache.getPropertyByPlId(repositoryModel.getId());
 		if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
 			for (PALRepositoryPropertyModel palRepositoryPropertyModel : repositoryPropertyList) {
 				JSONObject _process_tr = new JSONObject();
@@ -679,7 +680,7 @@ public class Report1Gener {
 					procedureTable.add(_process_tr);
 				}
 			}
-		}
+		}*/
 
 
         //相关/支持文件
@@ -848,7 +849,7 @@ public class Report1Gener {
 		dataMap.put("procedureTableCount", procedureTable.size());
 
 		//增加模版内容替换逻辑
-		getReportTempleteInfo(dataMap,userContext);
+		//getReportTempleteInfo(dataMap,userContext);
 		boolean contains = isNumberAscArray.contains("false");
 		if(contains) {
 			fileTable.sort(Comparator.comparing(obj -> ((JSONObject) obj).getString("file_name")));
@@ -1092,8 +1093,11 @@ public class Report1Gener {
 		String deptId = me.getDepartmentModel().getId();
 		//先查询模版文件中有无配置模版
 		BO bo = SDK.getBOAPI().query("BO_EU_OUTPUT_TEMPLATE", true).addQuery("APPLYDEPTID=", deptId).detail();
-		if(null!= bo){
-			dataMap.put("COMPANYNAME",bo.getString("COMPANYNAME"));
+		if(null!= bo){//有信息则走模版配置
+			//公司名称 &&&&& 换行
+			String companyName = bo.getString("COMPANYNAME");
+			companyName = companyName.replace("&&&&&", WRAPSTRING);
+			dataMap.put("COMPANYNAME",companyName);
 			dataMap.put("CNAMEFONTSIZE",bo.getString("CNAMEFONTSIZE"));
 			dataMap.put("FILETITLE",bo.getString("FILETITLE"));
 			dataMap.put("FILETITLEFONTSIZE",bo.getString("FILETITLEFONTSIZE"));
@@ -1102,13 +1106,15 @@ public class Report1Gener {
 			dataMap.put("HEADERLOGO",bo.getString("HEADERLOGO"));
 			dataMap.put("FOOTERFONT",bo.getString("FOOTERFONT"));
 			dataMap.put("FOOTERFONTSIZE",bo.getString("FOOTERFONTSIZE"));
+		}else{//无模版，则走默认配置
+
 		}
 	}
 
 
 	/**
 	 * 去重
-	 * @param json
+	 * @param jsonArray
 	 * @return
 	 */
 	public JSONArray jsonDeduplication(JSONArray jsonArray){