更新生成报文出错

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/GdbhReportServiceImpl.java

@@ -210,7 +210,7 @@ public class GdbhReportServiceImpl implements GdbhReportService {
 
         Map sandiao = (Map) jgMap.get("sandiao");
         String v_mx_bsmmc_0 = (String) sandiao.get("mx_bsmmc");
-        NpoiHelper.content(document, v_mx_bsmmc_0 + "; 分析结果如下:", pos++);
+        NpoiHelper.content(document, v_mx_bsmmc_0 + "; 分析结果如下:", pos++,  ParagraphAlignment.CENTER);
 
         List<Map<String, Object>> v_mx_data_0 = (List<Map<String, Object>>) sandiao.get("mx_data");
         List sanDiaoTitles = new ArrayList<NpoiHelper.TableTitle>();
@@ -227,7 +227,6 @@ public class GdbhReportServiceImpl implements GdbhReportService {
         sanDiaoTitles.add(tableTitle1);
         NpoiHelper.setComTable(document, sanDiaoTitles, v_mx_data_0, "", pos);
 
-        //TODO 先测试
         List<WktsVo.WktInfo> sandiaoWtsList = new ArrayList<>();
         WktsVo.WktInfo wktInfoData0 = new WktsVo.WktInfo();
         wktInfoData0.setWkt(ewkt);
@@ -257,19 +256,18 @@ public class GdbhReportServiceImpl implements GdbhReportService {
             int useHeight = useWidth * originalHeight / originalWidth;
             XWPFRun run = document.createParagraph().createRun();
             run.addPicture(is, XWPFDocument.PICTURE_TYPE_PNG, null, Units.toEMU(useWidth), Units.toEMU(useHeight));
+            pos++;
         }
 
-
         List<Map> yzjg = (List<Map>) jgMap.get("yzjg");
         for (Map yz_data : yzjg) {
 //            XWPFParagraph pageBreakParagraph1 = document.createParagraph();
 //            XWPFRun pageBreakRun1 = pageBreakParagraph1.createRun();
 //            pageBreakRun1.addBreak(BreakType.PAGE);
-            pos++;
 
             String mx_bsmmc = (String) yz_data.get("mx_bsmmc");
             String mx_bsm = (String) yz_data.get("mx_bsm");
-            NpoiHelper.catalog(document, mx_bsmmc + "; 分析结果如下:", pos++);
+            NpoiHelper.content(document, mx_bsmmc + "; 分析结果如下:", pos++,  ParagraphAlignment.CENTER);
             List<Map> mx_data_list = (List<Map>) yz_data.get("mx_data");
             for (Map d0_yz_data : mx_data_list) {
                 Integer d0_sumcount = (Integer) d0_yz_data.get("sumcount");
@@ -291,7 +289,7 @@ public class GdbhReportServiceImpl implements GdbhReportService {
                 tabYzTitles.add(tableTitle);
                 List<Map<String, Object>> dataTablelist = new ArrayList<>();
                 dataTablelist.add(d0_yz_data);
-                NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "", pos++);
+                NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "", pos);
 
                 RequestResult res_0 = applyService.QueryGdbhJgYz(rwbsm, mx_bsm, d0_bsm);
                 if (res_0.isError()) {