添加行政区划

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

@@ -1,12 +1,14 @@
 package com.onemap.analyse.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.onemap.analyse.domain.*;
+import com.onemap.analyse.domain.FactorUseDTO;
+import com.onemap.analyse.domain.FzxzEntityDTO;
+import com.onemap.analyse.domain.FzxzReport;
+import com.onemap.analyse.domain.SelectionResDTO;
 import com.onemap.analyse.domain.res.GeomRes;
 import com.onemap.analyse.domain.vo.FactorSpatialVo;
-import com.onemap.analyse.mapper.FzxzMapper;
 import com.onemap.analyse.mapper.FactorUseMapper;
+import com.onemap.analyse.mapper.FzxzMapper;
 import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.mapper.base.ShpFileMapper;
 import com.onemap.analyse.mapper.vector.GhdkaMapper;
@@ -265,9 +267,13 @@ public class ReportServiceImpl implements IReportService {
                 List<String> columns = new ArrayList<>();
                 columns.add("kzxxgyddm");
                 columns.add("kzxxgydmc");
+                columns.add("xjxzqmc");
+                columns.add("dkbm");
                 Map<String, Object> rawTable = ghdkaMapper.getInfoByColumn(rawTableName, rawItemId.toString(), columns);
                 String dkName = "";
                 String dkCode = "";
+                String xzqmc = "";
+                String dkbm = "";
                 if (rawTable != null) {
                     if (rawTable.containsKey("kzxxgydmc")) {
                         dkName = rawTable.get("kzxxgydmc").toString();// 地块类型
@@ -275,11 +281,17 @@ public class ReportServiceImpl implements IReportService {
                     if (rawTable.containsKey("kzxxgyddm")) {
                         dkCode = rawTable.get("kzxxgyddm").toString();// 地块编码
                     }
+                    if (rawTable.containsKey("xjxzqmc")) {
+                        xzqmc = rawTable.get("xjxzqmc").toString();// 行政区名称
+                    }
+                    if (rawTable.containsKey("dkbm")) {
+                        dkbm = rawTable.get("dkbm").toString();// 地块编码
+                    }
                 }
 
 
                 document.setParagraph(NpoiHelper.newParagraph(document, index + "、方案" + NumberUtil.int2chineseNum(index), optionIsBold), pos++);
-                XWPFTable table = document.createTable(7, 4);
+                XWPFTable table = document.createTable(8, 4);//8行4列
                 table.setWidth(9000);// 总宽度
                 for (int k = 0; k < 4; k++) {
                     XWPFTableCell cell = table.getRow(0).getCell(k);
@@ -293,23 +305,27 @@ public class ReportServiceImpl implements IReportService {
                 NpoiHelper.mergeHorizontal(table, 0, 0, 3);
                 table.getRow(0).getCell(0).setParagraph(NpoiHelper.setCellText(table, "符合用地情况", optionIsBold));
                 // Table 表格第二行
-                table.getRow(1).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地类编码", optionIsBold));
-                table.getRow(1).getCell(1).setParagraph(NpoiHelper.setCellText(table, dkCode, null));
-                table.getRow(1).getCell(2).setParagraph(NpoiHelper.setCellText(table, "地类名称", optionIsBold));
-                table.getRow(1).getCell(3).setParagraph(NpoiHelper.setCellText(table, dkName, null));
+                table.getRow(1).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地块编码", optionIsBold));
+                table.getRow(1).getCell(1).setParagraph(NpoiHelper.setCellText(table, dkbm, null));
+                table.getRow(1).getCell(2).setParagraph(NpoiHelper.setCellText(table, "县级行政区", optionIsBold));
+                table.getRow(1).getCell(3).setParagraph(NpoiHelper.setCellText(table, xzqmc, null));
                 // Table 表格第三行
-                table.getRow(2).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地块面积", optionIsBold));
-                table.getRow(2).getCell(1).setParagraph(NpoiHelper.setCellText(table,
+                table.getRow(2).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地类编码", optionIsBold));
+                table.getRow(2).getCell(1).setParagraph(NpoiHelper.setCellText(table, dkCode, null));
+                table.getRow(2).getCell(2).setParagraph(NpoiHelper.setCellText(table, "地类名称", optionIsBold));
+                table.getRow(2).getCell(3).setParagraph(NpoiHelper.setCellText(table, dkName, null));
+                // Table 表格第四行
+                table.getRow(3).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地块面积", optionIsBold));
+                table.getRow(3).getCell(1).setParagraph(NpoiHelper.setCellText(table,
                         NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(item.getArea())) + "亩", null));
-                table.getRow(2).getCell(2).setParagraph(NpoiHelper.setCellText(table, "土地位置", optionIsBold));
+                table.getRow(3).getCell(2).setParagraph(NpoiHelper.setCellText(table, "土地位置", optionIsBold));
                 // table.getRow(2).getCell(3).setParagraph(NpoiHelper.setCellText(table, item.getXzqmc(), null));
-                // Table 表格第四行
-                table.getRow(3).getCell(0).setColor("DBE5F1");
-                NpoiHelper.mergeHorizontal(table, 3, 0, 3);
-                table.getRow(3).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地块位置信息", optionIsBold));
-                // Table 表格第五行 -专题图
-                NpoiHelper.mergeHorizontal(table, 4, 0, 1);
-                NpoiHelper.mergeHorizontal(table, 4, 2, 3);
+                // Table 表格第五行
+                table.getRow(4).getCell(0).setColor("DBE5F1");
+                NpoiHelper.mergeHorizontal(table, 4, 0, 3);//合并单元格
+                table.getRow(4).getCell(0).setParagraph(NpoiHelper.setCellText(table, "地块位置信息", optionIsBold));
+                // Table 表格第六行 -专题图
+                NpoiHelper.mergeHorizontal(table, 5, 0, 3);
                 String mapF = "";
                 String mapM = "";
 
@@ -380,13 +396,13 @@ public class ReportServiceImpl implements IReportService {
                         }
                     }
                 }
-                // Table 表格第六行
-                table.getRow(5).getCell(0).setColor("DBE5F1");
-                NpoiHelper.mergeHorizontal(table, 5, 0, 3);
-                table.getRow(5).getCell(0).setParagraph(NpoiHelper.setCellText(table, "分析结论", optionIsBold));
                 // Table 表格第七行
+                table.getRow(6).getCell(0).setColor("DBE5F1");
                 NpoiHelper.mergeHorizontal(table, 6, 0, 3);
-                XWPFParagraph para6 = table.getRow(6).getCell(0).addParagraph();
+                table.getRow(6).getCell(0).setParagraph(NpoiHelper.setCellText(table, "分析结论", optionIsBold));
+                // Table 表格第八行
+                NpoiHelper.mergeHorizontal(table, 7, 0, 3);
+                XWPFParagraph para6 = table.getRow(7).getCell(0).addParagraph();
                 para6.setAlignment(ParagraphAlignment.LEFT);