diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java index 93e7525..002d768 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java @@ -228,7 +228,7 @@ public class EpcServiceImpl implements EpcService { // 设置标题和简介 data.put("title", tbData.getName() != null ? tbData.getName() : "EPC总承包项目投标技术文件"); - data.put("Introduction", "项目经理、设计负责人、采购负责人、施工负责人、商务负责人等主要负责人"); + data.put("Introduction", "项目主要负责人"); int personNum = 1; // 处理项目核心人员信息 diff --git a/search-tool/src/main/java/com/bonus/tool/template/TestEPCDOC.java b/search-tool/src/main/java/com/bonus/tool/template/TestEPCDOC.java index 5edcbb8..15b319c 100644 --- a/search-tool/src/main/java/com/bonus/tool/template/TestEPCDOC.java +++ b/search-tool/src/main/java/com/bonus/tool/template/TestEPCDOC.java @@ -27,7 +27,7 @@ public class TestEPCDOC { String fileName = null; try { data.put("title","中老500千伏联网项目(老挝段)EPC总承包项目投标技术文件"); - data.put("Introduction","项目经理、设计负责人、采购负责人、施工负责人、商务负责人等主要负责人"); + data.put("Introduction","项目主要负责人"); for (int i = 0; i < 4; i++) { Map map = new HashMap<>(); map.put("i",i + 1); @@ -77,13 +77,13 @@ public class TestEPCDOC { map3.put("height", "207.85"); map3.put("index",(100 * (i + 1)) + (j + 1)); if(j == 0){ - map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片3.png")); + map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); }else if(j == 1){ - map3.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片4.png")); + map3.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); }else if(j == 2){ map3.put("width", "481.15"); map3.put("height", "634.5"); - map3.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map3.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); } if(i == 0 && j == 0){ map3.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); @@ -101,7 +101,7 @@ public class TestEPCDOC { map4.put("index",(10000 * (j + 1)) + (k + 1)); map4.put("width", "481.15"); map4.put("height", "634.5"); - map4.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map4.put("base64Url",FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList2.add(map4); } map3.put("imgList",imgList2); @@ -114,7 +114,7 @@ public class TestEPCDOC { } data.put("list",list); data.put("list2",list2); - WordUtils.exportMillCertificateWord2(null,null, data, "test", "EPC_DOC.ftl","C:\\Users\\10488\\Desktop\\test (2)\\"); + WordUtils.exportMillCertificateWord2(null,null, data, "test", "EPC_DOC.ftl","C:\\Users\\10488\\Desktop\\检索工具\\"); } catch (Exception e) { log.error("EPC下载", e); } diff --git a/search-tool/src/main/java/com/bonus/tool/template/TestGWDOC.java b/search-tool/src/main/java/com/bonus/tool/template/TestGWDOC.java index 88e5923..c8cd555 100644 --- a/search-tool/src/main/java/com/bonus/tool/template/TestGWDOC.java +++ b/search-tool/src/main/java/com/bonus/tool/template/TestGWDOC.java @@ -54,7 +54,7 @@ public class TestGWDOC { map2.put("index", (100 * (i + 1)) + (j + 1)); map2.put("width", "375.35"); map2.put("height", "207.85"); - map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList.add(map2); } map.put("imgList", imgList); @@ -86,7 +86,7 @@ public class TestGWDOC { map2.put("index", (1000 * (i + 1)) + (j + 1)); map2.put("width", "481.15"); map2.put("height", "634.5"); - map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); zzList.add(map2); } for (int j = 0; j < 4; j++) { @@ -109,7 +109,7 @@ public class TestGWDOC { map3.put("index", (10000 * (j + 1)) + (k + 1)); map3.put("width", "481.15"); map3.put("height", "634.5"); - map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList.add(map3); } map2.put("imgList", imgList); @@ -124,7 +124,7 @@ public class TestGWDOC { map3.put("index", (100000 * (j + 1)) + (k + 1)); map3.put("width", "481.15"); map3.put("height", "634.5"); - map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList.add(map3); } map2.put("imgList", imgList); @@ -196,7 +196,7 @@ public class TestGWDOC { map2.put("index", (1000000 * (i + 1)) + (j + 1)); map2.put("width", "481.15"); map2.put("height", "634.5"); - map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map2.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); personImgList.add(map2); } map.put("userSettingList", userSettingList); @@ -274,7 +274,7 @@ public class TestGWDOC { map3.put("index", (1000000 * (j + 1)) + (k + 1)); map3.put("width", "481.15"); map3.put("height", "634.5"); - map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList.add(map3); } map2.put("imgList", imgList); @@ -290,7 +290,7 @@ public class TestGWDOC { map3.put("index", (1000000 * (j + 1)) + (k + 1)); map3.put("width", "481.15"); map3.put("height", "634.5"); - map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\图片5.png")); + map3.put("base64Url", FreeMarkerUtil.getImageBase("C:\\Users\\10488\\Desktop\\1.png")); imgList.add(map3); } map2.put("imgList", imgList); diff --git a/search-tool/src/main/resources/download/EPC_DOC.ftl b/search-tool/src/main/resources/download/EPC_DOC.ftl index 9b5b5bb..ca23fb0 100644 --- a/search-tool/src/main/resources/download/EPC_DOC.ftl +++ b/search-tool/src/main/resources/download/EPC_DOC.ftl @@ -4257,7 +4257,8 @@ - +<#-- --> + diff --git a/search-tool/src/main/resources/download/NW_DOC.ftl b/search-tool/src/main/resources/download/NW_DOC.ftl index 9b5b5bb..ca23fb0 100644 --- a/search-tool/src/main/resources/download/NW_DOC.ftl +++ b/search-tool/src/main/resources/download/NW_DOC.ftl @@ -4257,7 +4257,8 @@ - +<#-- --> +