Procházet zdrojové kódy

试车检查内容样式错乱问题修复,pdf预览显示变量问题修复

zhoudazhuang před 9 měsíci
rodič
revize
2e508e1ead

+ 5 - 5
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -598,7 +598,6 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
      */
     @Override
     public int exportFile(Map<String, Object> map, HttpServletResponse response) throws Exception {
-        excelUtils.GetWordLicense();
         Object projectObj = map.get("projectId");
         Object machineNoObj = map.get("machineNo");
         Object exportObj = map.get("exportType");
@@ -643,6 +642,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                 // 在这里操作field对象
                 builder.moveToField(field, true);
                 builder.write(projectManageDo.getProjectName());
+                field.setResult("");
             }
         }
         List<JSONObject> resultType = zhcxCommissionCheckDetailDao.getResultDictList();
@@ -744,7 +744,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
-                                detailWordVO.getChapterno().replaceAll("\\s", ""), null);
+                                detailWordVO.getChapterno(), null);
                         builder.insertCell();
                         builder.getCellFormat().setWidth(200);
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
@@ -752,10 +752,10 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         String chtestcontent = "";
                         String entestcontent = "";
                         if (StringUtils.isNotBlank(detailWordVO.getChtestcontent())){
-                            chtestcontent = detailWordVO.getChtestcontent().replaceAll("\\s", "");
+                            chtestcontent = detailWordVO.getChtestcontent();
                         }
                         if (StringUtils.isNotBlank(detailWordVO.getEntestcontent())){
-                            entestcontent = detailWordVO.getEntestcontent().replaceAll("\\s", "");
+                            entestcontent = detailWordVO.getEntestcontent();
                         }
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
                                 chtestcontent+entestcontent, null);
@@ -775,7 +775,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                         String testnotes = "";
                         if (StringUtils.isNotBlank(detailWordVO.getTestnotes())){
-                            testnotes = detailWordVO.getTestnotes().replaceAll("\\s", "");
+                            testnotes = detailWordVO.getTestnotes();
                         }
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
                                 testnotes, null);

binární
business-server/src/main/resources/template/检查内容明细模版.doc