修改因子字段

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

@@ -227,8 +227,8 @@ public class FzssServiceImpl implements IFzssService {
         iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成", "info");
 
         // 7.生成报告,生成world文件
-        // FzxzReport fzxzReport = iReportService.createReport(fzxzDTO.getBsm(), null);
-        // updateFzxzReport(taskId, fzxzReport.getReportfile());
+        FzxzReport fzxzReport = iReportService.createReport(fzxzDTO.getBsm(), null);
+        updateFzxzReport(taskId, fzxzReport.getReportfile());
 
         // 8.开始规划,更新任务状态
         updateFzxzStatus(taskId, Rwzt.getComplete());

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

@@ -142,11 +142,11 @@ public class ReportServiceImpl implements IReportService {
             List<FactorUseDTO> fzxzXzyzDTOList = fzxzXzyzMapper.selectList(wrapper);
             List<Map<String, Object>> dataTablelist = new ArrayList<>();
             for (int i = 0; i < fzxzXzyzDTOList.size(); i++) {
-                // TODO 添加选址因子
-                // Map<String, Object> map = new HashMap<>();
-                // FactorUseDTO fzxzXzyzDTO = fzxzXzyzDTOList.get(i);
-                // map.put("YXYZMC", fzxzXzyzDTO.getFactorName());
-                // String yztj = "";
+                // 添加选址因子
+                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 = "包含";
@@ -158,14 +158,14 @@ public class ReportServiceImpl implements IReportService {
                 //         yztj = "不相交";
                 //     }
                 // }
-                //
-                // map.put("YZTJ_TEXT", yztj);
-                // Float yxz = (float) 0;
+
+                map.put("YZTJ_TEXT", yztj);
+                Float yxz = (float) 0;
                 // if (fzxzXzyzDTO.getYxz() != null) {
                 //     yxz = fzxzXzyzDTO.getYxz();
                 // }
-                // map.put("YXZ", yxz);
-                // dataTablelist.add(map);
+                map.put("YXZ", yxz);
+                dataTablelist.add(map);
             }
             XWPFTable tableYz = NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "表1：选址影响因子", pos++);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FactorTemplateDTO.java

@@ -2,19 +2,22 @@ package com.onemap.apply.domain.config.fzss;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @TableName("t_fzss_fzxz_factor_temp")
 @Data
 public class FactorTemplateDTO {
-    @JsonProperty("tempId")
+    @JsonIgnore
     String id;
 
     @TableField("land_type_code")
+    @JsonIgnore
     String landTypeCode;
 
     @TableField("factor_id")
+    @JsonProperty("id")
     String factorId;
 
     @TableField("factor_bsm")
@@ -26,9 +29,11 @@ public class FactorTemplateDTO {
     String factorName;
 
     @TableField("order_index")
+    @JsonIgnore
     String orderIndex;
 
     @TableField("condition_info")
     String conditionInfo;
+    @JsonIgnore
     Boolean system;
 }