From 14e5ac03923dcbcaab25602910c8c8af35cdf671 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 18 Mar 2021 17:12:18 +0800
Subject: [PATCH] =?UTF-8?q?20210318=E4=BF=AE=E6=94=B9wbs=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/tall/service/ExcelService.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
index 43375b88..3ef37805 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@@ -143,10 +143,10 @@ public class ExcelService implements IExcelService {
         if (projectInfoStart == 0) {
             throw new BaseException(CodeEnum.WSB_NOT_PROJECT_HEADER);
         }
-        if (projectInfoStart == 0) {
+        if (memberStart == 0) {
             throw new BaseException(CodeEnum.WSB_NOT_MEMBER_HEADER);
         }
-        if (projectInfoStart == 0) {
+        if (taskStart == 0) {
             throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER);
         }
         readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId, sysProject);
@@ -391,7 +391,6 @@ public class ExcelService implements IExcelService {
                 }
             }else if (StrUtil.isNotEmpty(roleRelevanceProjectId)) {
 
-
             }
 
         }
@@ -648,12 +647,17 @@ public class ExcelService implements IExcelService {
             String task1 = ExcelUtil.getCellValue(row.getCell(1));
             //二级任务名称
             String task2 = ExcelUtil.getCellValue(row.getCell(2));
-
+            //详情
             String description = ExcelUtil.getCellValue(row.getCell(3));
+            //开始时间
             String beginTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(4)));
+            //结束时间
             String endTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(5)));
+            //重复
             String repeat = ExcelUtil.getCellValue(row.getCell(7));
+            //关联子任务表
             String subTaskCell = ExcelUtil.getCellValue(row.getCell(8));
+            //关联子项目表
             String subProject = ExcelUtil.getCellValue(row.getCell(9));
             String deliver = ExcelUtil.getCellValue(row.getCell(10));
             String executorRole = ExcelUtil.getCellValue(row.getCell(11));