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

Merge remote-tracking branch 'origin/fix_20230830'

Browse Source
This commit is contained in:
高嵩
2023-09-03 19:17:22 +08:00
parent 81f60dbbc2 c69d68e4ec
commit d49e452bb9
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+8 -4
View File
@@ -634,8 +634,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx";
String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx";
// String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; // String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx";
String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth(); // String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0);
String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth(); // String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth();
String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth().replace("-","");
String titleEN = "NIO Monthly Regulation Report";
File wordFile = new File(memoriesChapterCN); File wordFile = new File(memoriesChapterCN);
File wordFileEn = new File(memoriesChapterEN); File wordFileEn = new File(memoriesChapterEN);
@@ -961,7 +963,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
false, false, null,null,null,flag); false, false, null,null,null,flag);
//添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队 //添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队
String text1 = "编辑: 整车工程 - 法规与认证&环保与材料科团队"; String text1 = "编辑: 整车工程 – 试验与法规认证";
// String text1 = "编辑: 整车工程 - 法规与认证&环保与材料科团队";
WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11, WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag); false, false, "Blue Sky Noto Regular",null,null,flag);
@@ -1045,7 +1048,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
false, false, null,null,null,flag); false, false, null,null,null,flag);
//添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队 //添加说明 编辑: 整车工程 - 法规与认证&环保与材料科团队
String text1 = "Edit By: Regulation & Homologation, Environmental & Materials Team"; String text1 = "Edit By: Vehicle Engineering – Testing & Homologation";
// String text1 = "Edit By: Regulation & Homologation, Environmental & Materials Team";
WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11, WordUtil.exportWord(document, text1, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag); false, false, "Blue Sky Noto Regular",null,null,flag);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+14 -5
View File
@@ -571,16 +571,25 @@ public class WordUtil {
//拼接技术领域补充内容 //拼接技术领域补充内容
if (cut.equals("cn")) { if (cut.equals("cn")) {
if (StringUtils.isNotBlank(technologyTerritoryCn)) { if (StringUtils.isNotBlank(technologyTerritoryCn)) {
sb.append(" 补充："+technologyTerritoryCn); sb.append(technologyTerritoryCn + ",");
} }
} else { } else {
if (StringUtils.isNotBlank(technologyTerritoryEn)) { if (StringUtils.isNotBlank(technologyTerritoryEn)) {
sb.append(" replenish："+technologyTerritoryEn); sb.append(technologyTerritoryEn + ",");
} }
} }
// if (cut.equals("cn")) {
// if (StringUtils.isNotBlank(technologyTerritoryCn)) {
// sb.append(" 补充："+technologyTerritoryCn);
// }
// } else {
// if (StringUtils.isNotBlank(technologyTerritoryEn)) {
// sb.append(" replenish："+technologyTerritoryEn);
// }
// }
if (org.apache.commons.lang3.StringUtils.isNotBlank(sb)) { if (org.apache.commons.lang3.StringUtils.isNotBlank(sb)) {
technologyTerritoryName = sb.substring(0, sb.length()); technologyTerritoryName = sb.substring(0, sb.length()-1);
} }
} }
//适用车型中文名 //适用车型中文名
@@ -1241,7 +1250,7 @@ public class WordUtil {
setBlank(text, run, sb, itemText); setBlank(text, run, sb, itemText);
} }
if ("Usage".equals(fieldName)) { if ("Usage".equals(fieldName)) {
String itemText = "Mandatory,Voluntary,if fitted"; String itemText = "Mandatory,Recommend,if fitted";
setBlank(text, run, sb, itemText); setBlank(text, run, sb, itemText);
} }
} }
@@ -1365,7 +1374,7 @@ public class WordUtil {
case "Draft": case "Draft":
blank = " "; blank = " ";
break; break;
case "Public Notice": case "Recommend":
blank = " "; blank = " ";
break; break;
case "Release": case "Release":