jihs 4 years ago
parent
commit
9244f993d5

+ 4 - 1
src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherAddReqDTO.java

@@ -38,12 +38,14 @@ public class ProBusinessOtherAddReqDTO {
     private String executorId;
     @ApiModelProperty( "实际人天")
     private String realTime;
+    @ApiModelProperty("排序")
+    private Integer sort;
 
     public ProBusinessOtherAddReqDTO() {
     }
 
     public ProBusinessOtherAddReqDTO(String keyId, String parentId, String muilesId, String muilesName, Date startDate, Date endDate,
-        String planTime, String executor, String executorId, String realTime) {
+        String planTime, String executor, String executorId, String realTime, Integer sort) {
         this.key = keyId;
         this.parentId = parentId;
         this.muilesId = muilesId;
@@ -54,5 +56,6 @@ public class ProBusinessOtherAddReqDTO {
         this.executor = executor;
         this.executorId = executorId;
         this.realTime = realTime;
+        this.sort = sort;
     }
 }

+ 2 - 0
src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherListRespDTO.java

@@ -51,6 +51,8 @@ public class ProBusinessOtherListRespDTO {
     private String realTime;
     @ApiModelProperty(" 是否叶子节点: 1:是 0:不是")
     private boolean isLeaf;
+    @ApiModelProperty( "排序")
+    private Integer sort;
     @Getter
     @Setter
     private List<String> executors;

+ 5 - 0
src/main/java/org/jeecg/modules/archives/entity/ProjectManageBusinessOther.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.dto.archives.ProBusinessOtherAddReqDTO;
@@ -69,6 +70,10 @@ public class ProjectManageBusinessOther implements Serializable {
 	private String delFlag;
 	@ApiModelProperty( "组织")
 	private String pkOrg;
+	 @ApiModelProperty( "排序")
+	private Integer sort;
+
+
 	 public ProjectManageBusinessOther() {
 	 }