bug修复

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;
 
 }

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>

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);