修改报告

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

@@ -1,7 +1,9 @@
 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.vo.FactorSpatialVo;
 import com.onemap.analyse.mapper.FzxzMapper;
 import com.onemap.analyse.mapper.FactorUseMapper;
 import com.onemap.analyse.mapper.base.FzxzResMapper;
@@ -46,7 +48,7 @@ public class ReportServiceImpl implements IReportService {
 
     // 根据选址任务生成报告
     public FzxzReport createReport(String bsm, List<String> xzbsmList) {
-        String temp=tempLinux;
+        String temp = tempLinux;
 
         // 保存生成报告日志
         iLogService.saveLog(bsm, "智能选址", "开始生成选址报告", "info");
@@ -146,25 +148,10 @@ public class ReportServiceImpl implements IReportService {
                 Map<String, Object> map = new HashMap<>();
                 FactorUseDTO fzxzXzyzDTO = fzxzXzyzDTOList.get(i);
                 map.put("YXYZMC", fzxzXzyzDTO.getFactorName());
-                String yztj = "";
-                // if (fzxzXzyzDTO.getSpatialType() != null) {
-                //     if ("contain".equals(fzxzXzyzDTO.getSpatialType())) {
-                //         yztj = "包含";
-                //     } else if ("n_contain".equals(fzxzXzyzDTO.getSpatialType())) {
-                //         yztj = "不包含";
-                //     } else if ("identity".equals(fzxzXzyzDTO.getSpatialType())) {
-                //         yztj = "相交";
-                //     } else if ("n_identity".equals(fzxzXzyzDTO.getSpatialType())) {
-                //         yztj = "不相交";
-                //     }
-                // }
 
-                map.put("YZTJ_TEXT", yztj);
-                Float yxz = (float) 0;
-                // if (fzxzXzyzDTO.getYxz() != null) {
-                //     yxz = fzxzXzyzDTO.getYxz();
-                // }
-                map.put("YXZ", yxz);
+                Map<String, String> factorMap=   getFactorContent(fzxzXzyzDTO.getConditionInfoObj());
+                map.put("YZTJ_TEXT", factorMap.get("YZTJ_TEXT"));
+                map.put("YXZ", factorMap.get("YXZ"));
                 dataTablelist.add(map);
             }
             XWPFTable tableYz = NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "表1：选址影响因子", pos++);
@@ -368,7 +355,6 @@ public class ReportServiceImpl implements IReportService {
                 para6.setAlignment(ParagraphAlignment.LEFT);
 
 
-
                 int jgyzid = 1;
                 for (int j = 0; j < fzxzXzyzDTOList.size(); j++) {
                     FactorUseDTO fzxzJgyzDTO = fzxzXzyzDTOList.get(j);
@@ -432,6 +418,36 @@ public class ReportServiceImpl implements IReportService {
         System.out.println(outfilepath);
     }
 
+    /**
+     * 获取因子内容
+     * @param factorSpatialVo
+     * @return
+     */
+    private Map<String, String> getFactorContent(FactorSpatialVo factorSpatialVo) {
+        Map<String, String> map = new HashMap<>();
+        String spName = "";
+        if (factorSpatialVo.getDefaultType().equals("intersect")) {
+            spName = "重叠";
+        } else if (factorSpatialVo.getDefaultType().equals("not_intersect")) {
+            spName = "不重叠";
+        } else if (factorSpatialVo.getDefaultType().equals("contain")) {
+            spName = "位于";
+        } else if (factorSpatialVo.getDefaultType().equals("not_contain")) {
+            spName = "不位于";
+        } else if (factorSpatialVo.getDefaultType().equals("gt")) {
+            spName = "大于";
+        } else if (factorSpatialVo.getDefaultType().equals("lt")) {
+            spName = "小于";
+        } else if (factorSpatialVo.getDefaultType().equals("get")) {
+            spName = "大于等于";
+        } else if (factorSpatialVo.getDefaultType().equals("let")) {
+            spName = "小于等于";
+        }
+        map.put("YZTJ_TEXT", spName);
+        map.put("YXZ", factorSpatialVo.getDefaultValue().toString());
+        return map;
+    }
+
     /**
      * TODO 待定
      * 导出报告图片