Merge branch 'master' of https://git.zhongjie51.com/zhongjie51/99ditui

src/platform/ZhonTai.Admin/Domain/ProjectLink/ProjectLinkEntity.cs

@@ -13,7 +13,7 @@ namespace ZhonTai.Admin.Domain.ProjectLink
     /// 推广码
     /// </summary>
     [Table(Name = "duitui_project_link")]
-    [Index("idx_{tablename}_01", nameof(Num), true)]
+    //[Index("idx_{tablename}_01", nameof(Num), true)]
     public partial class ProjectLinkEntity : EntityTenant
     {
         /// <summary>

src/platform/ZhonTai.Admin/Services/ProjectLink/Dto/ProjectLinkGetPageDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,6 +9,11 @@ namespace ZhonTai.Admin.Services.ProjectLink.Dto
 {
     public class ProjectLinkGetPageDto
     {
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        [Required]
+        public long ProjectId { get; set; }
         /// <summary>
         /// 是否使用 1使用 0未使用
         /// </summary>

src/platform/ZhonTai.Admin/Services/ProjectLink/Dto/ProjectLinkListOutput.cs

@@ -33,6 +33,10 @@ namespace ZhonTai.Admin.Services.ProjectLink.Dto
         /// </summary>
         public string QrcodeUrl { get; set; }
         /// <summary>
+        /// 查单链接
+        /// </summary>
+        public string QueryUrl { get; set; }
+        /// <summary>
         /// 推广口令
         /// </summary>
         public string ShareCommand { get; set; }

src/platform/ZhonTai.Admin/Services/ProjectLink/ProjectLinkService.cs

@@ -71,22 +71,23 @@ namespace ZhonTai.Admin.Services.ProjectLink
             var list = _ProjectLinkRepository.Select.DisableGlobalFilter(FilterNames.Tenant)
                 .WhereIf(ProjectId.HasValue && ProjectId.Value > 0, a => a.ProjectId == ProjectId)
                 .WhereIf(key.NotNull(), a => a.Company.Contains(key))
-                .GroupBy(m=>new { m.ProjectId,m.Company})
+                .GroupBy(m => new { m.ProjectId, m.Company })
             .Count(out var total)
             .Page(input.CurrentPage, input.PageSize)
             .ToList(m => new ProjectLinkManagePageOutput()
             {
-                ProjectId= m.Key.ProjectId,
-                Company= m.Key.Company,
-                Count= m.Count(),
-                UseCount= m.Sum(m.Value.IsUse==1?1:0),
-                ProjectName=""
-            });            
-            
-            var listProjectId = list.Select(m => m.ProjectId).Distinct().ToList();            
+                ProjectId = m.Key.ProjectId,
+                Company = m.Key.Company,
+                Count = m.Count(),
+                UseCount = m.Sum(m.Value.IsUse == 1 ? 1 : 0),
+                ProjectName = ""
+            });
+
+            var listProjectId = list.Select(m => m.ProjectId).Distinct().ToList();
             if (listProjectId.Count() > 0)
             {
-                var listProject = await _projectRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => listProjectId.Contains(m.Id)).ToListAsync(m=>new { 
+                var listProject = await _projectRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => listProjectId.Contains(m.Id)).ToListAsync(m => new
+                {
                     m.Id,
                     m.Name
                 });
@@ -119,6 +120,7 @@ namespace ZhonTai.Admin.Services.ProjectLink
             var key = input.Filter?.Keywords;
 
             var list = await _ProjectLinkRepository.Select.DisableGlobalFilter(FilterNames.Tenant)
+                .Where(m=>m.ProjectId==input.Filter.ProjectId)
                 .WhereIf(IsUse.HasValue && IsUse.Value >= 0, a => a.IsUse == IsUse)
                 .WhereIf(TenantId.HasValue && TenantId.Value > 0, a => a.TenantId == TenantId)
             .WhereIf(key.NotNull(), a => a.Num == key || a.Salesman == key || a.SalesmanPhone == key)
@@ -139,13 +141,14 @@ namespace ZhonTai.Admin.Services.ProjectLink
                 Salesman = m.Salesman,
                 SalesmanPhone = m.SalesmanPhone,
                 SalesmanRemark = m.SalesmanRemark,
-                TenantId = m.TenantId
+                TenantId = m.TenantId,
+                QueryUrl=m.QueryUrl
             });
             List<OrgEntity> listOrg = null;
             var listTenantId = list.Where(m => m.TenantId.HasValue).Select(m => m.TenantId).Distinct().ToList();
             if (listTenantId.Count() > 0)
             {
-                listOrg = await _orgRepository.Select.Where(m => listTenantId.Contains(m.TenantId.Value)).ToListAsync();
+                listOrg = await _orgRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => listTenantId.Contains(m.TenantId.Value)).ToListAsync();
                 foreach (var item in list)
                 {
                     var org = listOrg.FirstOrDefault(m => m.TenantId == item.TenantId);
@@ -230,7 +233,7 @@ namespace ZhonTai.Admin.Services.ProjectLink
                 throw new Exception($"一个项目只能上传一个推广码来源");
             }
             List<string> listNum = (from d in datatable.AsEnumerable() select d.Field<string>("编号")).ToList();
-            var count = await _ProjectLinkRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => listNum.Contains(m.Num)).CountAsync();
+            var count = await _ProjectLinkRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.ProjectId == ProjectId && m.Company==Company&& listNum.Contains(m.Num)).CountAsync();
             if (count > 0)
             {
                 throw new Exception($"编码重复");

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -7452,6 +7452,11 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="P:ZhonTai.Admin.Services.ProjectLink.Dto.ProjectLinkGetPageDto.ProjectId">
+            <summary>
+            项目Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.ProjectLink.Dto.ProjectLinkGetPageDto.IsUse">
             <summary>
             是否使用 1使用 0未使用
@@ -7497,6 +7502,11 @@
             二维码链接
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.ProjectLink.Dto.ProjectLinkListOutput.QueryUrl">
+            <summary>
+            查单链接
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.ProjectLink.Dto.ProjectLinkListOutput.ShareCommand">
             <summary>
             推广口令