From ca12247dbc0728c7900db4188565d4c4f7d907c4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 八月 2023 09:25:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService
---
DocumentServiceAPI.Application/DocManage/Dtos/Document_List_Dto.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/DocumentServiceAPI.Application/DocManage/Dtos/Document_List_Dto.cs b/DocumentServiceAPI.Application/DocManage/Dtos/Document_List_Dto.cs
index 4d84e43..ad86c15 100644
--- a/DocumentServiceAPI.Application/DocManage/Dtos/Document_List_Dto.cs
+++ b/DocumentServiceAPI.Application/DocManage/Dtos/Document_List_Dto.cs
@@ -63,7 +63,7 @@
/// <summary>
/// 鍒嗙被id
/// </summary>
- public int class_id { get; set; }
+ public int? class_id { get; set; }
public string name { get; set; }
/// <summary>
@@ -74,11 +74,61 @@
/// <summary>
/// 鎶曟爣鍗曚綅
/// </summary>
+ public int? org_id { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍚嶇О
+ /// </summary>
+ public int? project_id { get; set; }
+
+ public int status { get; set; }
+
+ public List<DocumentFile_Submit_Dto> newfiles { get; set; }
+
+ public List<DocumentFile_Submit_Dto> editfiles { get; set; }
+
+ public List<int> delfiles { get; set; }
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏂囨。淇℃伅
+ /// </summary>
+ public class Document_Info_Dto
+ {
+ public Document_Info_Dto() { }
+
+ public Document_Info_Dto(Doc_Info doc,List<FileInfo_List_Dto> filelist)
+ {
+ this.id = doc.id;
+ if (doc.classification_id.HasValue)
+ {
+ this.class_id = doc.classification_id.Value;
+ }
+ this.name = doc.doc_name;
+ if (doc.org_id.HasValue)
+ {
+ this.org_id = doc.org_id.Value;
+ }
+ this.status = doc.status;
+ this.files = filelist;
+ }
+
+ public int id { get; set; }
+
+ /// <summary>
+ /// 鍒嗙被id
+ /// </summary>
+ public int class_id { get; set; }
+ public string name { get; set; }
+
+ /// <summary>
+ /// 鎶曟爣鍗曚綅
+ /// </summary>
public int org_id { get; set; }
public int status { get; set; }
- public List<DocumentFile_Submit_Dto> files { get; set; }
+ public List<FileInfo_List_Dto> files { get; set; }
}
/// <summary>
@@ -86,6 +136,7 @@
/// </summary>
public class DocumentFile_Submit_Dto
{
+ public int id { get; set; }
/// <summary>
/// 鍘熸枃浠跺悕绉�
/// </summary>
@@ -133,5 +184,7 @@
public string filepath { get; set; }
+ public int sort { get; set; }
+
}
}
--
Gitblit v1.9.1