diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 0f2595d22..048c0ee08 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -454,7 +454,7 @@ public class WordUtil { String applyScope = lawsMonthlyReportWriteEO.getApplyScope();//适用范围 String state = lawsMonthlyReportWriteEO.getState();//状态 String useMethod = lawsMonthlyReportWriteEO.getUseMethod();//用法 - String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型 +// String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型 String newCarImplementTime = lawsMonthlyReportWriteEO.getNewCarImplementTime();//新车型实施日期 String productionCarImplementTime = lawsMonthlyReportWriteEO.getProductionCarImplementTime();//在产车实施日期 String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 @@ -504,7 +504,7 @@ public class WordUtil { String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue()); String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue()); - XWPFTable table = document.createTable(11, 2); + XWPFTable table = document.createTable(10, 2); //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); //固定列宽(英文和数字的时候自动换行) @@ -534,19 +534,19 @@ public class WordUtil { //第5行 setCellThree(table,3, "用法",useMethodName,sysDictItems,DictCodeReportEnum.USEMETHOD.getValue()); //第6行 - setCell(table,4, "实施车型",implementCar); +// setCell(table,4, "实施车型",implementCar); //第7行 - setCell(table,5, "新车型实施日期",newCarImplementTime); + setCell(table,4, "新车型实施日期",newCarImplementTime); //第8行 - setCell(table,6, "在产车实施日期",productionCarImplementTime); + setCell(table,5, "在产车实施日期",productionCarImplementTime); //第9行 - setCell(table,7, "主要内容",contentCn); + setCell(table,6, "主要内容",contentCn); //第10行 - setCell(table,8, "NIO工作进展",workProgressCn); + setCell(table,7, "NIO工作进展",workProgressCn); //第11行 - setCell(table,9, "法规联系人",lawsContact); + setCell(table,8, "法规联系人",lawsContact); //第12行 - setCell(table,10, "链接",link); + setCell(table,9, "链接",link); }else{ //第1行 setCell(table,0, "Related Areas",technologyTerritoryName); @@ -559,19 +559,19 @@ public class WordUtil { //第5行 setCellThree(table,3,"Usage",useMethodName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第6行 - setCell(table,4,"Implementation Model",implementCar); +// setCell(table,4,"Implementation Model",implementCar); //第7行 - setCell(table,5,"New Type Execution Date",newCarImplementTime); + setCell(table,4,"New Type Execution Date",newCarImplementTime); //第8行 - setCell(table,6,"New Vehicle Execution Date",productionCarImplementTime); + setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime); //第9行 - setCell(table,7,"Main Content",contentEn); + setCell(table,6,"Main Content",contentEn); //第10行 - setCell(table,8,"NIO Work Progress",workProgressEn); + setCell(table,7,"NIO Work Progress",workProgressEn); //第11行 - setCell(table,9,"Regulatory Contact",lawsContact); + setCell(table,8,"Regulatory Contact",lawsContact); //第12行 - setCell(table, 10,"Link",link); + setCell(table, 9,"Link",link); } // ctTblLayoutType.setType(STTblLayoutType.FIXED);