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

法规月报填写

Browse Source 
1. 主页面去掉主要内容行
2. 新车型实施日期，在产车实施日期，改为　发布日期，实施日期
3. 数据字典对齐(中文)
This commit is contained in:
zhn
2022-10-27 10:07:13 +08:00
parent bf2b51820d
commit 04e6792f0b
3 changed files with 17 additions and 16 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/enums/DictCodeReportEnum.java
+1
View File
@@ -10,6 +10,7 @@ public enum DictCodeReportEnum {
APPLYCAR("适用车型","car_type"), APPLYCAR("适用车型","car_type"),
APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"), APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
STATE("状态","state"), STATE("状态","state"),
STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"),
USEMETHOD("用法","yong4_fa3"); USEMETHOD("用法","yong4_fa3");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+3 -3
View File
@@ -891,9 +891,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
//标题 //标题
WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14, WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14,
false, false, "Blue Sky Noto Regular",null,null,null); false, false, "Blue Sky Noto Regular",null,null,null);
//主要内容 //主要内容(新需求中去掉此行)
WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12, // WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
false, true, "Blue Sky Noto Regular",null,null,null); // false, true, "Blue Sky Noto Regular",null,null,null);
//生成页脚 //生成页脚
WordUtil.exportHeardAndFootMain(document,moth); WordUtil.exportHeardAndFootMain(document,moth);
int oneCount = 1; int oneCount = 1;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+13 -13
View File
@@ -594,7 +594,7 @@ public class WordUtil {
//适用车型中文名 //适用车型中文名
String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.getValue()); String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.getValue());
String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue()); String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue());
String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue()); String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE_REPORT.getValue());
String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue()); String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue());
XWPFTable table = document.createTable(10, 2); XWPFTable table = document.createTable(10, 2);
@@ -629,9 +629,9 @@ public class WordUtil {
//第6行 //第6行
// setCell(table,4, "实施车型",implementCar); // setCell(table,4, "实施车型",implementCar);
//第7行 //第7行
setCell(table,4, "新车型实施日期",newCarImplementTime); setCell(table,4, "发布日期",newCarImplementTime);
//第8行 //第8行
setCell(table,5, "在产车实施日期",productionCarImplementTime); setCell(table,5, "实施日期",productionCarImplementTime);
//第9行 //第9行
setCell(table,6, "主要内容",contentCn); setCell(table,6, "主要内容",contentCn);
//第10行 //第10行
@@ -654,9 +654,9 @@ public class WordUtil {
//第6行 //第6行
// setCell(table,4,"Implementation Model",implementCar); // setCell(table,4,"Implementation Model",implementCar);
//第7行 //第7行
setCell(table,4,"New Type Execution Date",newCarImplementTime); setCell(table,4,"Release Date",newCarImplementTime);
//第8行 //第8行
setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime); setCell(table,5,"Execution Date",productionCarImplementTime);
//第9行 //第9行
setCell(table,6,"Main Content",contentEn); setCell(table,6,"Main Content",contentEn);
//第10行 //第10行
@@ -1264,22 +1264,22 @@ public class WordUtil {
String blank = ""; String blank = "";
switch (value) { switch (value) {
case "M": case "M":
blank = " "; blank = " ";
break; break;
case "N": case "N":
blank = "\r\n"; blank = "\r\n";
break; break;
case "企业": case "企业":
blank = " "; blank = " ";
break; break;
case "整车": case "整车":
blank = " "; blank = " ";
break; break;
case "系统/零部件": case "系统/零部件":
blank = "\r\n"; blank = "\r\n";
break; break;
case "新车型": case "新车型":
blank = " "; blank = " ";
break; break;
case "在产车型`": case "在产车型`":
blank = ""; blank = "";
@@ -1300,10 +1300,10 @@ public class WordUtil {
blank = ""; blank = "";
break; break;
case "草稿": case "草稿":
blank = " "; blank = " ";
break; break;
case "公示稿": case "公示稿":
blank = " "; blank = " ";
break; break;
case "发布稿": case "发布稿":
blank = ""; blank = "";
@@ -1318,10 +1318,10 @@ public class WordUtil {
blank = ""; blank = "";
break; break;
case "强制": case "强制":
blank = " "; blank = " ";
break; break;
case "推荐": case "推荐":
blank = " "; blank = " ";
break; break;
case "安装需符合": case "安装需符合":
blank = ""; blank = "";