+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10773,6 +10773,40 @@ ORDER by  gctggrc.id DESC
 
             strFileName += "VOUCHER.docx";
 
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+
+            try
+            {
+
+                foreach (var item in hrDtas)
+                {
+                    //标题
+                    builder.ParagraphFormat.StyleIdentifier = StyleIdentifier.Title;
+                    builder.Writeln("ACCOMMODATION  VOUCHER");
+
+                    builder.ParagraphFormat.StyleIdentifier = StyleIdentifier.Title;
+                    builder.Writeln($"VOUCHER No:{item.CheckNumber}   DATE: {item.CreateTime.ToString("yyyy-MM-dd")}");
+
+                    //表格
+                    builder.InsertCell(); //插入单元格
+                    builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
+                    builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
+
+
+
+
+
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+
+
             var fileDir = AppSettingsHelper.Get("WordBasePath") + strFileName;
             //doc.Save(fileDir);
             string Url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/" + strFileName;

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1783,7 +1783,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 //文件名称
                 string[] fileNameArray = file.FileName.Split(".");
 
-                string projectFileName = $"{fileNameArray[0].ToString()}{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.{fileNameArray[1].ToString()}";
+                string projectFileName = $"{fileNameArray[0].ToString().Replace("-","_").Replace("/", "_")}{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.{fileNameArray[1].ToString()}";
                 //上传的文件的路径
                 string filePath = $@"{localPath}公务相关文件";
                 if (!Directory.Exists(filePath))