浏览代码

选址去掉报告生成

gushoubang 1 年之前
父节点
当前提交
1c573984fb

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

@@ -84,8 +84,8 @@ public class ReportServiceImpl implements IReportService {
                 f.mkdirs();
             }
             String reportPath = res.getXmmc() + "(选址报告)_" + timeStamp + ".docx";
-            // ###选址报告###
-            createReport(res, allPath + "/" + reportPath, dkIds);
+            // TODO ###选址报告耗时,暂时隐藏###
+            // createReport(res, allPath + "/" + reportPath, dkIds);
             // 生成返回结果
             fzxzReport.setReportfile(filePath + "/" + reportPath);
             fzxzReport.setBsm(bsm);
@@ -157,7 +157,7 @@ public class ReportServiceImpl implements IReportService {
             tableTitle.setWidth(2880);
             tabYzTitles.add(tableTitle);
             // 查询选址因子,并且转换为List<Map> 因子条件(包含:C、不包含:N、分析:A)
-            QueryWrapper<FactorUseDTO> wrapper = new QueryWrapper<FactorUseDTO>();
+            QueryWrapper<FactorUseDTO> wrapper = new QueryWrapper<>();
             wrapper.eq("task_id", res.getBsm());
             List<FactorUseDTO> fzxzXzyzDTOList = fzxzXzyzMapper.selectList(wrapper);
             List<Map<String, Object>> dataTablelist = new ArrayList<>();
@@ -259,8 +259,6 @@ public class ReportServiceImpl implements IReportService {
                 NpoiHelper.content(document, "\t按照项目选址要求和影响因子,经对所选范围内的所有用地进行分析,筛选出符合要求的方案共" + fzxzJgGisDTOList.size() + "个。", pos++);
             }
 
-            // int index = 1;
-
             for (int i = 0; i < fzxzJgGisDTOList.size(); i++) {
                 SelectionResDTO item = fzxzJgGisDTOList.get(i);