Merge branch 'test' into lib/test

src/Hotline.Api/Controllers/OrderController.cs

@@ -152,6 +152,7 @@ public class OrderController : BaseController
     private readonly IOrderSnapshotRepository _orderSnapshotRepository;
     private readonly IOrderSnapshotApplication _orderSnapshotApplication;
     private readonly IIndustryRepository _industryRepository;
+    private readonly IRepository<SystemDicData> _sysDicDataRepository;
 
     public OrderController(
         IOrderDomainService orderDomainService,
@@ -222,7 +223,8 @@ public class OrderController : BaseController
         ISystemLogApplication systemLogApplication,
         IOrderSnapshotRepository orderSnapshotRepository,
         IIndustryRepository industryRepository,
-        IOrderSnapshotApplication orderSnapshotApplication)
+        IOrderSnapshotApplication orderSnapshotApplication,
+         IRepository<SystemDicData> sysDicDataRepository)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -293,6 +295,7 @@ public class OrderController : BaseController
         _orderSnapshotRepository = orderSnapshotRepository;
         _industryRepository = industryRepository;
         _orderSnapshotApplication = orderSnapshotApplication;
+        _sysDicDataRepository = sysDicDataRepository;
     }
 
     #endregion
@@ -3747,6 +3750,11 @@ public class OrderController : BaseController
                 orderTags.Add(new SystemDicData() { Id = item });
             }
             order.OrderTags = orderTags;
+            var dicData = await _sysDicDataRepository.Queryable().Where(p => dto.Tags.Contains(p.Id)).Select(p => p.DicDataValue).ToListAsync();
+            if (dicData != null && dicData.Any())
+            {
+                order.OrderTagCode = String.Join(", ", dicData);
+            }
         }
 
         await _orderDomainService.AddAsync(order, true, HttpContext.RequestAborted);
@@ -3993,7 +4001,13 @@ public class OrderController : BaseController
                 orderTags.Add(new SystemDicData() { Id = item });
             }
             order.OrderTags = orderTags;
+            var dicData = await _sysDicDataRepository.Queryable().Where(p => dto.Tags.Contains(p.Id)).Select(p => p.DicDataValue).ToListAsync();
+            if (dicData != null && dicData.Any())
+            {
+                order.OrderTagCode = String.Join(", ", dicData);
+            }
         }
+        else order.OrderTagCode = string.Empty;
 
         //处理工单的期满时间
         //首先是工单编辑页面提交的、流程已经开启、工单未归档的工单才能修改期满时间

src/Hotline.Api/Controllers/TestController.cs

@@ -1102,199 +1102,6 @@ ICallApplication callApplication,
             "RGDH9951150024082950312",
 "RGDH9951150024080750198",
 "RGDH9951150024083050009",
-"RGDH9951150024083150167",
-"RGDH9951150024083150102",
-"RGDH9951150024083050052",
-"RGDH9951150024080750184",
-"RGDH9951150024083050108",
-"RGDH9951150024083050314",
-"RGDH9951150024083050363",
-"RGDH9951150024083150243",
-"RGDH9951150024082850303",
-"QT9951150024082150023",
-"RGDH9951150024080750185",
-"RGDH9951150024083150065",
-"RGDH9951150024082850032",
-"RGDH9951150024082950295",
-"RGDH9951150024080750189",
-"RGDH9951150024082650189",
-"RGDH9951150024083050008",
-"RGDH9951150024082950036",
-"RGDH9951150024082850341",
-"RGDH9951150024080750215",
-"RGDH9951150024081450005",
-"RGDH9951150024080750212",
-"RGDH9951150024083050137",
-"RGDH9951150024082450124",
-"RGDH9951150024083150188",
-"RGDH9951150024083150083",
-"RGDH9951150024082850082",
-"RGDH9951150024080750174",
-"RGDH9951150024082950371",
-"RGDH9951150024082950114",
-"RGDH9951150024083050339",
-"RGDH9951150024080750217",
-"RGDH9951150024082950040",
-"RGDH9951150024083050031",
-"RGDH9951150024083150267",
-"RGDH9951150024083050064",
-"RGDH9951150024072650086",
-"RGDH9951150024082950360",
-"RGDH9951150024080750195",
-"RGDH9951150024080750210",
-"RGDH9951150024082950250",
-"RGDH9951150024083050145",
-"RGDH9951150024083050356",
-"RGDH9951150024080750194",
-"RGDH9951150024080750173",
-"RGDH9951150024080750213",
-"RGDH9951150024080750218",
-"RGDH9951150024083150271",
-"RGDH9951150024083150134",
-"RGDH9951150024080750179",
-"RGDH9951150024083050140",
-"RGDH9951150024083150262",
-"RGDH9951150024083050119",
-"RGDH9951150024083150177",
-"RGDH9951150024083050146",
-"RGDH9951150024080750223",
-"RGDH9951150024080750221",
-"RGDH9951150024083150130",
-"RGDH9951150024080750209",
-"RGDH9951150024083150237",
-"RGDH9951150024082850095",
-"RGDH9951150024082850223",
-"RGDH9951150024083050077",
-"RGDH9951150024082950118",
-"RGDH9951150024082850056",
-"RGDH9951150024082550177",
-"RGDH9951150024083050358",
-"RGDH9951150024080750193",
-"RGDH9951150024082150011",
-"RGDH9951150024082950167",
-"RGDH9951150024083050201",
-"RGDH9951150024082850048",
-"RGDH9951150024083150161",
-"RGDH9951150024083050300",
-"RGDH9951150024083150016",
-"RGDH9951150024083150101",
-"RGDH9951150024082850207",
-"RGDH9951150024083150144",
-"RGDH9951150024082750300",
-"RGDH9951150024083050230",
-"RGDH9951150024080750211",
-"RGDH9951150024082750379",
-"RGDH9951150024082850252",
-"RGDH9951150024083050204",
-"RGDH9951150024080750176",
-"RGDH9951150024080750190",
-"RGDH9951150024083150027",
-"RGDH9951150024082850308",
-"RGDH9951150024082850070",
-"RGDH9951150024082950068",
-"RGDH9951150024083050002",
-"RGDH9951150024083050130",
-"RGDH9951150024083050060",
-"RGDH9951150024082950282",
-"RGDH9951150024082950320",
-"RGDH9951150024082850312",
-"RGDH9951150024083150040",
-"RGDH9951150024080750202",
-"RGDH9951150024083150216",
-"RGDH9951150024082750156",
-"RGDH9951150024082850224",
-"RGDH9951150024083150238",
-"RGDH9951150024083050327",
-"RGDH9951150024082950090",
-"RGDH9951150024083150131",
-"RGDH9951150024080750187",
-"RGDH9951150024082350072",
-"RGDH9951150024080750177",
-"RGDH9951150024082950010",
-"RGDH9951150024082850263",
-"RGDH9951150024082850087",
-"RGDH9951150024083050234",
-"RGDH9951150024083150098",
-"RGDH9951150024083050166",
-"RGDH9951150024082850339",
-"RGDH9951150024083150157",
-"RGDH9951150024080150214",
-"RGDH9951150024083150149",
-"RGDH9951150024083150264",
-"RGDH9951150024080750200",
-"RGDH9951150024083150116",
-"RGDH9951150024082950188",
-"RGDH9951150024083050148",
-"RGDH9951150024082750338",
-"RGDH9951150024082950268",
-"RGDH9951150024083050337",
-"RGDH9951150024082250263",
-"RGDH9951150024080750196",
-"RGDH9951150024080750192",
-"RGDH9951150024082850272",
-"RGDH9951150024082650290",
-"RGDH9951150024083150117",
-"RGDH9951150024080750207",
-"RGDH9951150024080750201",
-"RGDH9951150024080750188",
-"RGDH9951150024083050011",
-"RGDH9951150024083050067",
-"RGDH9951150024083050193",
-"RGDH9951150024082850242",
-"RGDH9951150024082950121",
-"RGDH9951150024080750222",
-"RGDH9951150024082950280",
-"RGDH9951150024080750205",
-"RGDH9951150024083050334",
-"RGDH9951150024083150235",
-"RGDH9951150024082950156",
-"RGDH9951150024080750220",
-"RGDH9951150024082750209",
-"RGDH9951150024083150046",
-"RGDH9951150024080750214",
-"RGDH9951150024082850116",
-"RGDH9951150024083050082",
-"RGDH9951150024083150118",
-"RGDH9951150024082950338",
-"RGDH9951150024082950359",
-"RGDH9951150024083150156",
-"RGDH9951150024083150072",
-"RGDH9951150024082150001",
-"RGDH9951150024082850186",
-"RGDH9951150024082750377",
-"RGDH9951150024083150166",
-"RGDH9951150024083050255",
-"RGDH9951150024083050190",
-"RGDH9951150024080750175",
-"RGDH9951150024083050184",
-"RGDH9951150024083050021",
-"RGDH9951150024082850317",
-"RGDH9951150024082950146",
-"RGDH9951150024083150172",
-"RGDH9951150024083050354",
-"RGDH9951150024082850305",
-"RGDH9951150024082850351",
-"RGDH9951150024082950340",
-"RGDH9951150024083150273",
-"RGDH9951150024080750208",
-"RGDH9951150024083150053",
-"RGDH9951150024082850291",
-"RGDH9951150024082950104",
-"RGDH9951150024082850247",
-"RGDH9951150024082850320",
-"RGDH9951150024083050285",
-"RGDH9951150024082850011",
-"RGDH9951150024083050174",
-"RGDH9951150024083150212",
-"RGDH9951150024083050323",
-"RGDH9951150024080750224",
-"RGDH9951150024083150244",
-"RGDH9951150024080750199",
-"RGDH9951150024082850269",
-"RGDH9951150024082850053",
-"RGDH9951150024082950342",
-"RGDH9951150024082950046",
-"RGDH9951150024082950194"
         };
         _logger.LogWarning($"推送数据共：{provinceNos.Count}");
 

src/Hotline.Application.Contracts/Validators/Order/AddOrderDtoValidator.cs

@@ -102,9 +102,9 @@ public class AddOrderDtoValidator : AbstractValidator<AddOrderDto>
         #endregion
 
         #region 投诉对象信息
-        RuleFor(d => d.OrderExtension.EnterpriseName).MaxLengthWithChineseChar(80).When(d => d.OrderExtension != null).WithMessage("企业名称最多80字符");
+        RuleFor(d => d.OrderExtension.EnterpriseName).MaxLengthWithChineseChar(50).When(d => d.OrderExtension != null).WithMessage("企业名称最多50字符");
         RuleFor(d => d.OrderExtension.UnifiedSocialCreditCode).MaxLengthWithChineseChar(30).When(d => d.OrderExtension != null).WithMessage("统一社会信用代码最多30字符");
-        RuleFor(d => d.OrderExtension.RegisterAddress).MaxLengthWithChineseChar(400).When(d => d.OrderExtension != null).WithMessage("企业注册地址最多400字符");
+        RuleFor(d => d.OrderExtension.RegisterAddress).MaxLengthWithChineseChar(50).When(d => d.OrderExtension != null).WithMessage("企业注册地址最多50字符");
         RuleFor(d => d.OrderExtension.RegisterNumber).MaxLengthWithChineseChar(50).When(d => d.OrderExtension != null).WithMessage("注册号最多50字符");
         RuleFor(d => d.OrderExtension.EnterpriseContact).MaxLengthWithChineseChar(70).When(d => d.OrderExtension != null).WithMessage("联系人最多70字符");
         RuleFor(d => d.OrderExtension.MarketTypeCode).MaxLengthWithChineseChar(64).When(d => d.OrderExtension != null).WithMessage("市场主体类型代码最多64字符");

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -92,11 +92,12 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 工单标签（自贡）
         /// </summary>
-        public string? OrderTag  => OrderTags != null && OrderTags.Any()? string.Join(",", OrderTags.Select(x => x.DicDataName)) : string.Empty; 
+        public string? OrderTag => OrderTags != null && OrderTags.Any() ? string.Join(",", OrderTags.Select(x => x.DicDataName)) : string.Empty;
 
-        public string? OrderTagCode => OrderTags != null && OrderTags.Any() ? string.Join(",", OrderTags.Select(x => x.DicDataValue)) : string.Empty; 
+        // public string? OrderTagCode => OrderTags != null && OrderTags.Any() ? string.Join(",", OrderTags.Select(x => x.DicDataValue)) : string.Empty; 
+        public string? OrderTagCode { get; set; }
 
-		public List<SystemDicDataOutDto>? OrderTags { get; set; }
+        public List<SystemDicDataOutDto>? OrderTags { get; set; }
 
         #region 流程信息
 

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.117</Version>
+    <Version>1.0.118</Version>
   </PropertyGroup>
 
   <ItemGroup>