From 4fda6295e04e56e865a83088ef4482115fa7f128 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 1 Aug 2022 12:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=98=85=E8=A7=88=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E4=B8=8B=E8=BD=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/actionsoft/apps/coe/pal/CoEPALController.java | 5 +++--
 .../apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java | 7 +++----
 .../page/pal.pl.repository.designer.view.portal.html      | 2 +-
 .../extend/js/designer.extend.link.view.portal.js         | 8 +++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
index b5feedda..1670aed9 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
@@ -1171,8 +1171,9 @@ public class CoEPALController {
 	@Mapping("com.actionsoft.apps.coe.pal_outputreport_output_downloadZipfile")
 	public String COEPALOUTPUTREPORTOutputProcessDownloadZipFILE(UserContext me, RequestParams params) throws Exception {
 		UpfileWeb web = new UpfileWeb(me);
-		String uuid = params.get("splitId");
-		return web.readZipFileDownLoad(uuid);
+		String splitId = params.get("splitId");
+		String toolbarname=params.get("toolbarname");
+		return web.readZipFileDownLoad(splitId,toolbarname);
 	}
 
 
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
index 874a25fa..05640ba1 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
@@ -415,7 +415,7 @@ public class UpfileWeb extends ActionWeb {
 	 * @return
 	 * @author zhaolei
 	 */
-	public String readZipFileDownLoad(String downloadZipFile) throws Exception {
+	public String readZipFileDownLoad(String splitId,String toolbarname) throws Exception {
 		UserContext me = super.getContext();
 		ResponseObject ro = ResponseObject.newOkResponse();
 		UpFileDao upfileDao = new UpFileDao();
@@ -423,16 +423,15 @@ public class UpfileWeb extends ActionWeb {
 		try {
 
 			long times = System.currentTimeMillis();
-			final String zipName = "批量下载"+ times + ".zip";
+			final String zipName = "批量下载"+ toolbarname + ".zip";
 			String targetDir = AWSServerConf.getProperty("dc.path") + File.separator + "com.actionsoft.apps.coe.pal" + File.separator + "tmp/grouppackage/zip" + times + "/";
 			File targetFileDir = new File(targetDir);
 			if (!targetFileDir.exists()) {
 				targetFileDir.mkdirs();
 			}
 
-			String uuids="287f7d3c-7034-4e88-a92c-8564ed041970,c42b7c14-b614-492c-a37d-e045ce86705a,0bef45da-a6d8-43c2-96e3-6476f62bb143";
 			// 查找对应应用下模版
-			String[] uuidSpilt=uuids.split(",");
+			String[] uuidSpilt=splitId.split(",");
 			if(uuidSpilt.length>0){
 				for(String oneuuid:uuidSpilt){
 					UpfileModel upfileModel = upfileDao.get(oneuuid);
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
index ef9f665e..26c620ad 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
@@ -891,7 +891,7 @@
     <canvas id="support_canvas" style="display: none;"></canvas>
 
     <div>
-        <span class="newadd_title"><#toolbarName></span>
+        <span class="newadd_title" id="toolbarname"><#toolbarName></span>
     </div>
     <div class="newadd_card">
         <div class="title"><span></span></div>
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
index 8cd58044..d7873683 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
@@ -1651,13 +1651,14 @@ function  downloadProcessFile(taskId) {
  * 相关文件/制度文件下载
  * @param uuid
  */
-function  downloadZipFile(splitId) {
+function  downloadZipFile(splitId,toolbarname) {
 	$.ajax({
 		type : "POST",
 		url : "./jd?sid=" + sid
 			+ "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_downloadZipfile",
 		data : {
-            splitId : splitId
+            splitId : splitId,
+			toolbarname:toolbarname
 		},
 		success : function(msg) {
 			if (msg.result == "ok") {
@@ -1722,9 +1723,10 @@ function initUpfileData(obj) {
 
         t += '</table>';
 
+		var toolbarname=$("#toolbarname").text();
 		if(splitId.length>0){
 			splitId=splitId.substring(0,splitId.length-1);
-			t +='<button id="ProcessManual" type="button"  onclick="downloadZipFile(\''+splitId+'\')" class="awsui-btn awsui-btn-blue">';
+			t +='<button id="ProcessManual" type="button"  onclick="downloadZipFile(\''+splitId+'\',\''+toolbarname+'\')" class="awsui-btn awsui-btn-blue">';
 			t +='打包下载';
 			t +='</button>';
 		}