法规月报填写
1. 主页面去掉主要内容行 2. 新车型实施日期,在产车实施日期,改为 发布日期,实施日期 3. 数据字典对齐(中文)
This commit is contained in:
+1
@@ -10,6 +10,7 @@ public enum DictCodeReportEnum {
|
||||
APPLYCAR("适用车型","car_type"),
|
||||
APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
|
||||
STATE("状态","state"),
|
||||
STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"),
|
||||
USEMETHOD("用法","yong4_fa3");
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -891,9 +891,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
|
||||
//标题
|
||||
WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14,
|
||||
false, false, "Blue Sky Noto Regular",null,null,null);
|
||||
//主要内容
|
||||
WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
|
||||
false, true, "Blue Sky Noto Regular",null,null,null);
|
||||
//主要内容(新需求中去掉此行)
|
||||
// WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
|
||||
// false, true, "Blue Sky Noto Regular",null,null,null);
|
||||
//生成页脚
|
||||
WordUtil.exportHeardAndFootMain(document,moth);
|
||||
int oneCount = 1;
|
||||
|
||||
+13
-13
@@ -594,7 +594,7 @@ public class WordUtil {
|
||||
//适用车型中文名
|
||||
String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.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());
|
||||
|
||||
XWPFTable table = document.createTable(10, 2);
|
||||
@@ -629,9 +629,9 @@ public class WordUtil {
|
||||
//第6行
|
||||
// setCell(table,4, "实施车型",implementCar);
|
||||
//第7行
|
||||
setCell(table,4, "新车型实施日期",newCarImplementTime);
|
||||
setCell(table,4, "发布日期",newCarImplementTime);
|
||||
//第8行
|
||||
setCell(table,5, "在产车实施日期",productionCarImplementTime);
|
||||
setCell(table,5, "实施日期",productionCarImplementTime);
|
||||
//第9行
|
||||
setCell(table,6, "主要内容",contentCn);
|
||||
//第10行
|
||||
@@ -654,9 +654,9 @@ public class WordUtil {
|
||||
//第6行
|
||||
// setCell(table,4,"Implementation Model",implementCar);
|
||||
//第7行
|
||||
setCell(table,4,"New Type Execution Date",newCarImplementTime);
|
||||
setCell(table,4,"Release Date",newCarImplementTime);
|
||||
//第8行
|
||||
setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime);
|
||||
setCell(table,5,"Execution Date",productionCarImplementTime);
|
||||
//第9行
|
||||
setCell(table,6,"Main Content",contentEn);
|
||||
//第10行
|
||||
@@ -1264,22 +1264,22 @@ public class WordUtil {
|
||||
String blank = "";
|
||||
switch (value) {
|
||||
case "M":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "N":
|
||||
blank = "\r\n";
|
||||
break;
|
||||
case "企业":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "整车":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "系统/零部件":
|
||||
blank = "\r\n";
|
||||
break;
|
||||
case "新车型":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "在产车型`":
|
||||
blank = "";
|
||||
@@ -1300,10 +1300,10 @@ public class WordUtil {
|
||||
blank = "";
|
||||
break;
|
||||
case "草稿":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "公示稿":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "发布稿":
|
||||
blank = "";
|
||||
@@ -1318,10 +1318,10 @@ public class WordUtil {
|
||||
blank = "";
|
||||
break;
|
||||
case "强制":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "推荐":
|
||||
blank = " ";
|
||||
blank = " ";
|
||||
break;
|
||||
case "安装需符合":
|
||||
blank = "";
|
||||
|
||||
Reference in New Issue
Block a user