From 4ce8fcc6e4437bcd1861ca080e7631cf0e7ab922 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 22 Mar 2022 09:36:11 +0800
Subject: [PATCH] =?UTF-8?q?20220322=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ptccsens/service/ExportService.java       | 43 +++++++++++++++----
 .../resources/mapper_dao/ProTaskDetailDao.xml |  2 +-
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ccsens/ptccsens/service/ExportService.java b/src/main/java/com/ccsens/ptccsens/service/ExportService.java
index 44db6b2..f938d22 100644
--- a/src/main/java/com/ccsens/ptccsens/service/ExportService.java
+++ b/src/main/java/com/ccsens/ptccsens/service/ExportService.java
@@ -101,13 +101,7 @@ public class ExportService implements IExportService {
         wbs.add(projectInfo);
         List<PoiUtil.PoiUtilCell> s1 = new ArrayList<>();
         wbs.add(s1);
-    }
-
-    /**
-     * 生成任务数据
-     */
-    private void generateWbsTask(Workbook wb, List<List<PoiUtil.PoiUtilCell>> wbs, List<TallWbsVo.WbsTaskInfo> wbsTaskInfo,int rowIndex) {
-        //任务标题
+        //添加任务表头
         List<PoiUtil.PoiUtilCell> taskHeader = new ArrayList<>();
         taskHeader.add(new PoiUtil.PoiUtilCell("项目任务分解（PWBS）",15,1));
         wbs.add(taskHeader);
@@ -129,6 +123,36 @@ public class ExportService implements IExportService {
         taskTitle.add(new PoiUtil.PoiUtilCell("插件2"));
         taskTitle.add(new PoiUtil.PoiUtilCell("插件3"));
         wbs.add(taskTitle);
+    }
+
+    /**
+     * 生成任务数据
+     */
+    private void generateWbsTask(Workbook wb, List<List<PoiUtil.PoiUtilCell>> wbs, List<TallWbsVo.WbsTaskInfo> wbsTaskInfo,int rowIndex) {
+//        //任务标题
+//        List<PoiUtil.PoiUtilCell> taskHeader = new ArrayList<>();
+//        taskHeader.add(new PoiUtil.PoiUtilCell("项目任务分解（PWBS）",15,1));
+//        wbs.add(taskHeader);
+//        rowIndex++;
+//        //任务表头
+//        List<PoiUtil.PoiUtilCell> taskTitle = new ArrayList<>();
+//        taskTitle.add(new PoiUtil.PoiUtilCell("序号"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("任务（节点"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("二级任务（节点）"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("任务描述/要求"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("时间/开始时间"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("结束时间"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("任务时长"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("标签"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("负责人"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("检查人"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("交付物"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("即时奖惩"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("插件1"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("插件2"));
+//        taskTitle.add(new PoiUtil.PoiUtilCell("插件3"));
+//        wbs.add(taskTitle);
+//        rowIndex++;
         //任务信息
         if(CollectionUtil.isEmpty(wbsTaskInfo)){
             return;
@@ -148,6 +172,7 @@ public class ExportService implements IExportService {
                 if(CollectionUtil.isEmpty(secondTaskList)){
                     flag = false;
                     pageNum = 1;
+                    continue;
                 }else {
                     pageNum++;
                 }
@@ -218,7 +243,7 @@ public class ExportService implements IExportService {
                     wbs.add(taskRow);
                 }
                 PoiUtil.exportWB("WBS", rowIndex, wbs, wb);
-                rowIndex += 100;
+                rowIndex += (secondTaskList.size());
                 wbs.clear();
             }
 
@@ -294,7 +319,7 @@ public class ExportService implements IExportService {
 //
 //            }
         }
-        //写入数据
+//        //写入数据
 //        PoiUtil.exportWB("WBS", rowIndex, wbs, wb);
     }
 
diff --git a/src/main/resources/mapper_dao/ProTaskDetailDao.xml b/src/main/resources/mapper_dao/ProTaskDetailDao.xml
index 32a1103..fb3ee65 100644
--- a/src/main/resources/mapper_dao/ProTaskDetailDao.xml
+++ b/src/main/resources/mapper_dao/ProTaskDetailDao.xml
@@ -544,7 +544,7 @@
         <if test="queryType == 1">
             AND plan_start_time >= #{timeNode}
         </if>
-        <if test="triggerType == 0">
+        <if test="triggerType == 0 and taskId != null">
             and ts.id != #{taskId}
         </if>
         ) AS alltask