模板权限

Myshipping.Application/Myshipping.Application.xml

@@ -2355,6 +2355,51 @@
             商品名称
             </summary>
         </member>
+        <member name="T:Myshipping.Application.Entity.BookingExcelTemplate">
+            <summary>
+            EXCEl打印模板
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Name">
+            <summary>
+            模板名称
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Type">
+            <summary>
+            分类
+            </summary>
+        </member>
+        <member name="T:Myshipping.Application.Entity.BookingExcelTemplateSub">
+            <summary>
+            订舱状态
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Pid">
+            <summary>
+            父键
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Field">
+            <summary>
+            字段名称
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Row">
+            <summary>
+            行
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Column">
+            <summary>
+            列 
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Describe">
+            <summary>
+            默认内容
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.Entity.BookingFile">
             <summary>
             订舱附件表
@@ -6993,6 +7038,21 @@
             人员id
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Id">
+            <summary>
+            业务id
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Name">
+            <summary>
+            模板名称
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Type">
+            <summary>
+            分类
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.BookingEDIExtDto">
             <summary>
             EDI扩展
@@ -9336,6 +9396,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingTemplateService.AddOrUpdateExcelTemplate(Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto)">
+            <summary>
+            新增编辑excel模板
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:Myshipping.Application.BookingTemplateInput">
             <summary>
             订舱模板输入参数

Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs

@@ -288,17 +288,24 @@ namespace Myshipping.Application
         [HttpGet("/BookingPrintTemplate/GetPrinttemplateRightList")]
         public async Task<dynamic> GetPrinttemplateRightList(long userId)
         {
+            var userlist = await _repUser.AsQueryable().Filter(null, true).ToListAsync();
             var list = await _repRight.AsQueryable().InnerJoin<BookingPrintTemplate>((d, t) => d.PrintTemplateId == t.Id && t.TenantId == UserManager.TENANT_ID).
                 WhereIF(userId != 0, d => d.SysUserId == userId).
-                Select((d, t) => new
+                Select((d, t) => new BookingPrinttemplateDto
                 {
+                    SysUserId=d.SysUserId,
                     TypeCode = t.TypeCode,
                     TypeName = t.TypeName,
                     FilePath = t.FilePath,
                     FileName = t.FileName,
                     TenantName = t.TenantName,
-                    UserName = _repUser.Where(x => x.Id == d.SysUserId).Select(x => x.Name).FirstAsync().Result
+                    UserName ="",
                 }).ToListAsync();
+            foreach (var item in list)
+            {
+                var username= userlist.Where(x => x.Id == item.SysUserId).Select(x => x.Name).FirstOrDefault();
+                item.UserName = username;
+            }
             return list;
         }
     }

Myshipping.Application/Service/BookingPrintTemplate/Dto/BookingPrinttemplateRightDto.cs

@@ -16,4 +16,20 @@ namespace Myshipping.Application.Service.BookingPrintTemplate.Dto
         public List<long> PrintTemplateId { get; set; }
 
     }
+
+
+
+    public class BookingPrinttemplateDto
+    {
+
+
+        public long SysUserId { get; set; }
+        public string TypeCode { get; set; }
+        public string TypeName { get; set; }
+        public string FilePath { get; set; }
+        public string FileName { get; set; }
+        public string TenantName { get; set; }
+        public string UserName { get; set; }
+    }
+
 }