From 5adc74d1de2f60f5d0999ad5c18de5c35a3255dc Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 6 Apr 2023 17:43:32 +0800
Subject: [PATCH] =?UTF-8?q?67892bug=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryInfoEOServiceImpl.java  | 10 +++++-----
 jero-web/src/views/processCenter/ProcessMapping.vue    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 929870332..bcbc5a8fd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -1181,13 +1181,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) {
 		OutputStream os = null;
 		HSSFWorkbook workbook = new HSSFWorkbook();
-		String fileOriName = "虚拟清单导入模板.xls";
+		String fileOriName = "市场法规清单导入模板.xls";
 
 		String sheetName = "";
 		if(StringUtils.equals(dummyInventoryInfoEO.getCut(),CutEnum.CN.getValue())){
-			sheetName = "虚拟清单导入模板";
+			sheetName = "市场法规清单导入模板";
 		}else {
-			sheetName = "Virtual Inventory Import Template";
+			sheetName = "Market Regulation List Import Template";
 		}
 
 		String filePath = uploadpath + File.separator + fileOriName;
@@ -2430,9 +2430,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				exportFile(dataList,fileInfos);
 				String excelName = "";
 				if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
-					excelName = baseList.get(0).getName() + " 虚拟清单.xlsx";
+					excelName = baseList.get(0).getName() + ".xlsx";
 				}else{
-					excelName = baseList.get(0).getName() + " Virtual list.xlsx";
+					excelName = baseList.get(0).getName() + ".xlsx";
 				}
 				//excel
 				String excelNameRep = excelName.replace('/', '、');
diff --git a/jero-web/src/views/processCenter/ProcessMapping.vue b/jero-web/src/views/processCenter/ProcessMapping.vue
index 3a879812b..d06cad9b3 100644
--- a/jero-web/src/views/processCenter/ProcessMapping.vue
+++ b/jero-web/src/views/processCenter/ProcessMapping.vue
@@ -19,6 +19,7 @@
                 actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
                 // actUrl: 'http://10.255.35.25:8082/modeler.html?modelId='  //正式
                 // actUrl: 'http://10.255.128.148:8888/modeler.html?modelId='  //测试
+                // actUrl: 'http://39.98.140.126:8085/bat-wkflow/modeler.html?modelId='  //39环境测试
             }
         },
         created() {