Browse Source

修改 退回 不删除别的节点

master
PoffyZhang 1 year ago
parent
commit
24f2b700ff
3 changed files with 83 additions and 1 deletions
  1. +44
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java
  2. +38
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java
  3. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

+ 44
- 0
pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java View File

@@ -0,0 +1,44 @@
package com.ningdatech.pmapi.filemanage.model.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

/**
* @Classname Documentation
* @Description
* @Date 2023/6/6 14:41
* @Author PoffyZhang
*/
@Data
@TableName("nd_documentation")
@ApiModel(value = "nd_documentation", description = "资料文档")
public class Documentation {

@ApiModelProperty("主键")
@TableId(type = IdType.AUTO)
private Long id;

@ApiModelProperty("文件名")
private String fileName;

@ApiModelProperty("上传人")
private String creatBy;

@ApiModelProperty("上传时间")
private LocalDateTime creatOn;

@ApiModelProperty("文档大小 kb")
private Long size;

@ApiModelProperty("文档分类ID")
private Long groupId;

@ApiModelProperty("排序")
private Integer sort;
}

+ 38
- 0
pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java View File

@@ -0,0 +1,38 @@
package com.ningdatech.pmapi.filemanage.model.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

/**
* @Classname Documentation
* @Description
* @Date 2023/6/6 14:41
* @Author PoffyZhang
*/
@Data
@TableName("nd_documentation_group")
@ApiModel(value = "nd_documentation_group", description = "资料文档分组")
public class DocumentationGroup {

@ApiModelProperty("主键")
@TableId(type = IdType.AUTO)
private Long id;

@ApiModelProperty("上传人")
private String creatBy;

@ApiModelProperty("上传时间")
private LocalDateTime creatOn;

@ApiModelProperty("分组名")
private String name;

@ApiModelProperty("排序")
private Integer sort;
}

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java View File

@@ -393,7 +393,7 @@ public class TodoCenterManage {
}
nodeId = task.getTaskDefinitionKey();
// 退回该任务
processTaskService.handleTask(param, employeeCode);
processTaskService.handleTaskLs(param, employeeCode);
//退回审核后 所处理的逻辑
handlerManage.afterBackTodo(declaredProject,instance);
break;


Loading…
Cancel
Save