更新

src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherAddReqDTO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 public class ProBusinessOtherAddReqDTO {
     @ApiModelProperty( "当前节点id")
-    private String keyId;
+    private String key;
     @ApiModelProperty( "父节点id")
     private String parentId;
     @ApiModelProperty( "里程碑id")
@@ -43,8 +43,8 @@ public class ProBusinessOtherAddReqDTO {
     }
 
     public ProBusinessOtherAddReqDTO(String keyId, String parentId, String muilesId, String muilesName, Date startDate, Date endDate,
-                                  String planTime, String executor, String executorId, String realTime) {
-        this.keyId = keyId;
+        String planTime, String executor, String executorId, String realTime) {
+        this.key = keyId;
         this.parentId = parentId;
         this.muilesId = muilesId;
         this.muilesName = muilesName;

src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherListRespDTO.java

@@ -3,6 +3,8 @@ package org.jeecg.common.dto.archives;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.jeecg.modules.archives.entity.ProjectManageBusinessOther;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
@@ -19,6 +21,10 @@ public class ProBusinessOtherListRespDTO {
      private String id;
     @ApiModelProperty( "当前节点id")
     private String key;
+    @ApiModelProperty("里程碑名称")
+    @Getter
+    @Setter
+    private String title;
     @ApiModelProperty( "父节点id")
     private String parentId;
     @ApiModelProperty( "里程碑id")
@@ -61,6 +67,7 @@ public class ProBusinessOtherListRespDTO {
         this.executor = other.getExecutor();
         this.executorId = other.getExecutorId();
         this.realTime = other.getRealTime();
+        this.title = other.getMuilesName();
         this.isLeaf = false;
     }
 

src/main/java/org/jeecg/common/dto/basedata/ArchivesMilestoneListRespDTO.java

@@ -2,6 +2,8 @@ package org.jeecg.common.dto.basedata;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import org.jeecg.modules.basedata.entity.BaseArchivesMilestone;
 
 import java.util.List;
@@ -18,6 +20,10 @@ public class ArchivesMilestoneListRespDTO {
     private  String key;
     @ApiModelProperty("名称")
     private String title;
+    @ApiModelProperty("名称")
+    @Getter
+    @Setter
+    private String name;
     @ApiModelProperty("父节点id")
     private java.lang.String parentId;
     @ApiModelProperty("编码")
@@ -42,6 +48,7 @@ public class ArchivesMilestoneListRespDTO {
         this.code = baseArchivesMilestone.getCode();
         this.typeId = baseArchivesMilestone.getTypeId();
         this.type = baseArchivesMilestone.getType();
+        this.name = baseArchivesMilestone.getName();
         this.isLeaf = false;
     }
 

src/main/java/org/jeecg/common/dto/basedata/ArchivesPostListRespDTO.java

@@ -1,7 +1,8 @@
 package org.jeecg.common.dto.basedata;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.jeecg.modules.basedata.entity.BaseArchivesPost;
 import java.util.List;
 
@@ -21,6 +22,10 @@ public class ArchivesPostListRespDTO {
     private String code;
     @ApiModelProperty("职务名称")
     private String title;
+    @ApiModelProperty("职务名称")
+    @Getter
+    @Setter
+    private String name;
     @ApiModelProperty(" 是否叶子节点: 1:是 0:不是")
     private boolean isLeaf;
 
@@ -35,6 +40,7 @@ public class ArchivesPostListRespDTO {
         this.parentId = baseArchivesPost.getParentId();
         this.code = baseArchivesPost.getCode();
         this.title = baseArchivesPost.getName();
+        this.name = baseArchivesPost.getName();
         this.isLeaf = false;
     }
 

src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -96,7 +96,7 @@ public class ProjectManageArchivesController {
 			@ApiImplicitParam(name="milestone4", value="对应里程碑4",required=false, dataType="String"),
 			@ApiImplicitParam(name="milestone5", value="对应里程碑5",required=false, dataType="String"),
 			@ApiImplicitParam(name="proArchivesId", value="项目档案id",required=false, dataType="String"),
-			@ApiImplicitParam(name="keyId", value="当前节点id",required=false, dataType="String"),
+			@ApiImplicitParam(name="key", value="当前节点id",required=false, dataType="String"),
 			@ApiImplicitParam(name="parentId", value="父节点id",required=false, dataType="String"),
 			@ApiImplicitParam(name="muilesId", value="里程碑id",required=false, dataType="String"),
 			@ApiImplicitParam(name="muilesName", value="里程碑名称",required=false, dataType="String"),
@@ -168,7 +168,7 @@ public class ProjectManageArchivesController {
 			@ApiImplicitParam(name="milestone4", value="对应里程碑4",required=false, dataType="String"),
 			@ApiImplicitParam(name="milestone5", value="对应里程碑5",required=false, dataType="String"),
 			@ApiImplicitParam(name="proArchivesId", value="项目档案id",required=false, dataType="String"),
-			@ApiImplicitParam(name="keyId", value="当前节点id",required=false, dataType="String"),
+			@ApiImplicitParam(name="key", value="当前节点id",required=false, dataType="String"),
 			@ApiImplicitParam(name="parentId", value="父节点id",required=false, dataType="String"),
 			@ApiImplicitParam(name="muilesId", value="里程碑id",required=false, dataType="String"),
 			@ApiImplicitParam(name="muilesName", value="里程碑名称",required=false, dataType="String"),

src/main/java/org/jeecg/modules/archives/entity/ProjectManageBusinessOther.java

@@ -77,7 +77,7 @@ public class ProjectManageBusinessOther implements Serializable {
 	 public ProjectManageBusinessOther(ProBusinessOtherAddReqDTO plan, String proArchivesId, Integer planType, String pkOrg) {
 		 this.proArchivesId = proArchivesId;
 		 this.planType = planType;
-		 this.keyId = plan.getKeyId();
+		 this.keyId = plan.getKey();
 		 this.parentId = plan.getParentId();
 		 this.muilesId = plan.getMuilesId();
 		 this.muilesName = plan.getMuilesName();