From a08501c5bd7497295ac57ebd62fcb4e9a7b7e907 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 13 Nov 2023 10:03:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/taskprogress/entity/TaskProgress.java     | 3 ++-
 .../modules/taskprogress/mapper/xml/TaskProgressMapper.xml | 2 ++
 .../taskprogress/service/impl/TaskProgressServiceImpl.java | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java
index 5a42ac324..89f845547 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java
@@ -177,6 +177,7 @@ public class TaskProgress implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "合并预警：1提前2正常3逾期【优先级：逾期>提前>正常】")
     private java.lang.Integer mergeWarning;
-
+    @ApiModelProperty(value = "任务级别")
+    private Integer level;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml
index 2b84ad705..ecfefdd69 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml
@@ -95,6 +95,7 @@
             <if test="beginWarning != null">
                 begin_warning = #{beginWarning,jdbcType=INTEGER},
             </if>
+            level = #{level,jdbcType=INTEGER}
         </set>
         where project_sn = #{projectSn}
         and task_name = #{taskName}
@@ -115,6 +116,7 @@
             begin_warning = #{beginWarning},
             end_warning = #{endWarning},
             status = #{status},
+            level = #{level,jdbcType=INTEGER},
         </set>
         where id = #{id}
     </update>
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
index c2b9ae4f4..d3b6cd438 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
@@ -115,6 +115,7 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
                     .eq(TaskProgress::getId, taskProgress.getParentId()));
             taskProgress.setPredecessorIds(tp.getPredecessorIds() + "," + taskProgress.getParentId());
         }
+
         setStatusRel(taskProgress);
         save(taskProgress);
         addWarning(taskProgress);
@@ -126,6 +127,10 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
      * @param taskProgress
      */
     private void setStatusRel(TaskProgress taskProgress) {
+        if (Objects.equals(taskProgress.getParentId(), 0L)) {
+            taskProgress.setLevel(1);
+        }
+
         if (taskProgress.getActualStartDate() != null && taskProgress.getStartDate().compareTo(taskProgress.getActualStartDate()) < 0) {
             taskProgress.setBeginWarning(3);
         } else if (taskProgress.getActualStartDate() != null && taskProgress.getStartDate().compareTo(taskProgress.getActualStartDate()) > 0) {
@@ -327,6 +332,8 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
             progressTask.setDuration(task.getDuration().getDuration());
             // 父节点id
             progressTask.setParentId(parentId);
+            // 当前深度
+            progressTask.setLevel(task.getOutlineLevel());
             // 进度比例
             double progressRatio = task.getPercentageComplete().doubleValue();
             progressTask.setProgressRatio(progressRatio);