1、项目任务树查询 bug fix

2、任务列表新增标签字段

data/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.65.161:8848
         #                  server-addr: 127.0.0.1:8848
         enabled: true
   #        username: nacos

project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java

@@ -0,0 +1,147 @@
+package com.sdm.project.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sdm.common.entity.pojo.BaseEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class SpdmNewTaskVo extends BaseEntity {
+
+    /**
+     * 父节点id，第一级节点的pid为0
+     */
+    private String pid;
+
+    private String pUuid;
+
+
+    /**
+     * 当前节点id
+     */
+    private String uuid;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+
+    /**
+     * 任务编码
+     */
+    private String taskCode;
+
+    private String nodeId;
+
+
+    /**
+     * 标准工时
+     */
+    private Integer days;
+
+    /**
+     * 实际工时
+     */
+    private Integer realDays;
+
+    private String standard;
+
+    private String folderId;
+
+    private Integer status;
+
+    private String achieveStatus;
+
+    /**
+     * 计划开始（精确到秒）
+     */
+    private String beginTime;
+
+    /**
+     * 计划结束（精确到秒）项目详情图片
+     */
+    private String endTime;
+
+    /**
+     * 实际完成时间（精确到秒）
+     */
+    private String finishTime;
+
+    /**
+     * 项目进度状态
+     */
+    private Integer progress;
+
+
+    /**
+     * 项目进度状态（未开始、进行中、已完成）
+     */
+    private String exeStatus;
+
+    private String confidence;
+
+    private String analyseTarget;
+    private String analyseSoftware;
+    private String approvalStatus;
+    private String comfirmStatus;
+    private String description;
+    /**
+     * 难度系数
+     */
+    private Float difficult;
+
+    private String department;
+    private String sectionName;
+    private String groupName;
+    @JsonProperty(value = "bCapacity")
+    private String bCapacity;
+    private String flowTemplateName;
+    private String englishName;
+
+
+    /**
+     * 关联的需求id
+     */
+    private String demandId;
+
+    /**
+     * 仿真负责人
+     */
+    private List<SpdmTaskMemberVo> pMemberList;
+
+    /**
+     * 仿真执行人
+     */
+    private List<SpdmTaskMemberVo> eMemberList;
+
+    /**
+     * 0：未关注 1：已关注
+     */
+    private Integer attentionFlag;
+
+    @JsonProperty(value = "Tag1")
+    private String Tag1;
+    @JsonProperty(value = "Tag2")
+    private String Tag2;
+    @JsonProperty(value = "Tag3")
+    private String Tag3;
+    @JsonProperty(value = "Tag4")
+    private String Tag4;
+    @JsonProperty(value = "Tag5")
+    private String Tag5;
+    @JsonProperty(value = "Tag6")
+    private String Tag6;
+    @JsonProperty(value = "Tag7")
+    private String Tag7;
+    @JsonProperty(value = "Tag8")
+    private String Tag8;
+    @JsonProperty(value = "Tag9")
+    private String Tag9;
+    @JsonProperty(value = "Tag10")
+    private String Tag10;
+
+}

system/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.65.161:8848
         # server-addr: localhost:8848
         enabled: true
   data:

task/src/main/resources/application-dev.yml

@@ -30,7 +30,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.65.161:8848
         #                  server-addr: 127.0.0.1:8848
         enabled: true
   #        username: nacos