From 24f2b700ff15b6c10f7de1aa9e12ab47d97bf3e0 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 6 Jun 2023 15:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=80=80=E5=9B=9E=20?=
 =?UTF-8?q?=E4=B8=8D=E5=88=A0=E9=99=A4=E5=88=AB=E7=9A=84=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filemanage/model/entity/Documentation.java     | 44 ++++++++++++++++++++++
 .../model/entity/DocumentationGroup.java           | 38 +++++++++++++++++++
 .../pmapi/todocenter/manage/TodoCenterManage.java  |  2 +-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java
new file mode 100644
index 0000000..c837051
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/Documentation.java
@@ -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;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java
new file mode 100644
index 0000000..466721f
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/entity/DocumentationGroup.java
@@ -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;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index 93fd98a..f24462d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -393,7 +393,7 @@ public class TodoCenterManage {
                 }
                 nodeId = task.getTaskDefinitionKey();
                 // 退回该任务
-                processTaskService.handleTask(param, employeeCode);
+                processTaskService.handleTaskLs(param, employeeCode);
                 //退回审核后 所处理的逻辑
                 handlerManage.afterBackTodo(declaredProject,instance);
                 break;