WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

67892bug修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-06 17:43:32 +08:00
parent b3d481ff3a
commit 5adc74d1de
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+5 -5
View File
@@ -1181,13 +1181,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) { public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) {
OutputStream os = null; OutputStream os = null;
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
String fileOriName = "虚拟清单导入模板.xls"; String fileOriName = "市场法规清单导入模板.xls";
String sheetName = ""; String sheetName = "";
if(StringUtils.equals(dummyInventoryInfoEO.getCut(),CutEnum.CN.getValue())){ if(StringUtils.equals(dummyInventoryInfoEO.getCut(),CutEnum.CN.getValue())){
sheetName = "虚拟清单导入模板"; sheetName = "市场法规清单导入模板";
}else { }else {
sheetName = "Virtual Inventory Import Template"; sheetName = "Market Regulation List Import Template";
} }
String filePath = uploadpath + File.separator + fileOriName; String filePath = uploadpath + File.separator + fileOriName;
@@ -2430,9 +2430,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
exportFile(dataList,fileInfos); exportFile(dataList,fileInfos);
String excelName = ""; String excelName = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
excelName = baseList.get(0).getName() + " 虚拟清单.xlsx"; excelName = baseList.get(0).getName() + ".xlsx";
}else{ }else{
excelName = baseList.get(0).getName() + " Virtual list.xlsx"; excelName = baseList.get(0).getName() + ".xlsx";
} }
//excel //excel
String excelNameRep = excelName.replace('/', '、'); String excelNameRep = excelName.replace('/', '、');
jero-web/src/views/processCenter/ProcessMapping.vue
+1
View File
@@ -19,6 +19,7 @@
actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地 actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
// actUrl: 'http://10.255.35.25:8082/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://10.255.128.148:8888/modeler.html?modelId=' //测试
// actUrl: 'http://39.98.140.126:8085/bat-wkflow/modeler.html?modelId=' //39环境测试
} }
}, },
created() { created() {