导出文件成word修改标题空

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/DecisionTaskController.java

@@ -120,9 +120,8 @@ public class DecisionTaskController extends BaseController {
             String reportPath = decisionTask.getReportPath();
             if(StringUtils.isBlank(reportPath)) {
                 reportPath = reportDir + decisionTask.getName()+"/"+ decisionTask.getId () + ".docx";
-                decisionTaskService.getWordReport(detailsList, reportPath);
+                decisionTaskService.getWordReport(decisionTask,detailsList, reportPath);
                 decisionTask.setReportPath(reportPath);
-
                 DecisionTaskVo updateTaskVo = new DecisionTaskVo();
                 updateTaskVo.setId(decisionTask.getId());
                 updateTaskVo.setReportPath(reportPath);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/DecisionTaskService.java

@@ -26,7 +26,7 @@ public interface DecisionTaskService {
 
     Map<String,Object> getJoinDetails(String currentId,String detailsName,Integer type);
 
-    String getWordReport(List<DecisionDetailsVo> analyseResultList,String reportPath);
+    String getWordReport(DecisionTask decisionTask,List<DecisionDetailsVo> analyseResultList,String reportPath);
 
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/DecisionTaskServiceImpl.java

@@ -256,9 +256,9 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
     }
 
     @Override
-    public String getWordReport(List<DecisionDetailsVo> analyseResultList,String reportPath) {
+    public String getWordReport(DecisionTask decisionTask , List<DecisionDetailsVo> analyseResultList,String reportPath) {
         try {
-            createWordReport(analyseResultList,reportPath);
+            createWordReport(decisionTask ,analyseResultList,reportPath);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -273,7 +273,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
      * @param reportPath
      * @throws Exception
      */
-    private void createWordReport(List<DecisionDetailsVo> analyseResultList, String reportPath) throws Exception {
+    private void createWordReport(DecisionTask decisionTask,List<DecisionDetailsVo> analyseResultList, String reportPath) throws Exception {
         if (CollectionUtils.isEmpty(analyseResultList)) {
             throw new ServiceException("分析结果为空，无法生成报告");
         }
@@ -290,22 +290,8 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
             DecisionDetailsVo firstVo = analyseResultList.get(0);
             // 从dataList中获取第一个数据的node_id，用于获取分析范围的geom
             String geom = null;
-            Double shapeArea = null;
-            String analyseName = null;
-            
-            if (CollectionUtils.isNotEmpty(firstVo.getDataList())) {
-                Map<String, Object> firstData = firstVo.getDataList().get(0);
-                String nodeId = (String) firstData.get("node_id");
-                if (StringUtils.isNotBlank(nodeId)) {
-                    // 根据nodeId查询任务信息获取geom和shapeArea
-                    DecisionTask task = decisionTaskMapper.get(nodeId);
-                    if (task != null) {
-                        geom = task.getGeom();
-                        shapeArea = task.getShapeArea() != null ? task.getShapeArea().doubleValue() : null;
-                        analyseName = task.getName();
-                    }
-                }
-            }
+            BigDecimal shapeArea = decisionTask.getShapeArea();
+            String analyseName = decisionTask.getName();
 
             // 3. 生成分析信息段落
             addParagraph(document, "\t分析名称：" + (StringUtils.isNotBlank(analyseName) ? analyseName : ""));