Merge branch 'feature/snapshot' into dev

src/Hotline.Share/Dtos/Snapshot/HomePageDto.cs

@@ -94,123 +94,3 @@ public class HomeIndustryOutDto
     public string IndustryTypeTxt => IndustryType.GetDescription();
 }
 
-public class IndustryItemsOutDto : IndustryOutDto
-{
-    /// <summary>
-    /// 审批部门Id
-    /// </summary>
-    public string? ApproveOrgId { get; set; }
-
-    /// <summary>
-    /// 审批部门名字
-    /// </summary>
-    public string? ApproveOrgName { get; set; }
-
-    /// <summary>
-    /// 市民发放红包金额(单位:分)
-    /// </summary>
-    public int CitizenReadPackAmount { get; set; }
-
-    /// <summary>
-    /// 网络员发放红包金额(单位:分)
-    /// </summary>
-    public int GuiderReadPackAmount { get; set; }
-
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool IsEnable { get; set; }
-
-    /// <summary>
-    /// 排序
-    /// </summary>
-    public int DisplayOrder { get; set; }
-
-}
-public class IndustryOutDto
-{ 
-    /// <summary>
-    /// Id
-    /// </summary>
-    public string Id { get; set; }
-
-    /// <summary>
-    /// 名字
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// 帮助引导用语
-    /// </summary>
-    public string? TxtHelpRemarks { get; set; }
-
-    /// <summary>
-    /// 宫格说明文本
-    /// </summary>
-    public string? TxtRemarks { get; set; }
-
-    /// <summary>
-    /// 关怀说明
-    /// </summary>
-    public string? TxtCareRemarks { get; set; }
-
-    /// <summary>
-    /// 页面Url
-    /// </summary>
-    public string? PageUrl { get; set; }
-
-    /// <summary>
-    /// 关怀页面Url
-    /// </summary>
-    public string? PageCareUrl { get; set; }
-}
-
-/// <summary>
-/// 行业集合入参
-/// </summary>
-/// <param name="name">名称</param>
-/// <param name="departmentName">审批部门</param>
-public record IndustryListInDto(string? Name, string? ApproveOrgName) : PagedRequest;
-
-public class IndustryBaseOutDto
-{
-    /// <summary>
-    /// 行业信息
-    /// </summary>
-    public IndustryOutDto Industry { get; set; }
-
-    /// <summary>
-    /// 通知公告Id
-    /// </summary>
-    public string? BulletinId { get; set; }
-
-    /// <summary>
-    /// 作业区域集合
-    /// </summary>
-    public IList<SystemAreaOutDto> AreaTree { get; set; } = [];
-
-    /// <summary>
-    /// 附件集合
-    /// </summary>
-    public IList<IndustryFileDto> Files { get; set; } = [];
-
-    /// <summary>
-    /// 作业场所集合
-    /// </summary>
-    public IReadOnlyList<SystemDicDataOutDto> Workplace { get; set; }
-
-    /// <summary>
-    /// 场所名称集合
-    /// </summary>
-    public IReadOnlyList<SystemDicDataOutDto> WorkplaceName { get; set; }
-
-    /// <summary>
-    /// 作业类型集合
-    /// </summary>
-    public IReadOnlyList<SystemDicDataOutDto> JobType { get; set; }
-
-    /// <summary>
-    /// 经营单位类别集合
-    /// </summary>
-    public IReadOnlyList<SystemDicDataOutDto> BusinessUnitType { get; set; }
-}

src/Hotline.Share/Dtos/Snapshot/IndustryDto.cs

@@ -1,4 +1,6 @@
-using System;
+using Hotline.Share.Dtos.Settings;
+using Hotline.Share.Requests;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -10,6 +12,127 @@ internal class IndustryDto
 {
 }
 
+public class IndustryItemsOutDto : IndustryOutDto
+{
+    /// <summary>
+    /// 审批部门Id
+    /// </summary>
+    public string? ApproveOrgId { get; set; }
+
+    /// <summary>
+    /// 审批部门名字
+    /// </summary>
+    public string? ApproveOrgName { get; set; }
+
+    /// <summary>
+    /// 市民发放红包金额(单位:分)
+    /// </summary>
+    public int CitizenReadPackAmount { get; set; }
+
+    /// <summary>
+    /// 网络员发放红包金额(单位:分)
+    /// </summary>
+    public int GuiderReadPackAmount { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsEnable { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int DisplayOrder { get; set; }
+
+}
+public class IndustryOutDto
+{
+    /// <summary>
+    /// Id
+    /// </summary>
+    public string Id { get; set; }
+
+    /// <summary>
+    /// 名字
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 帮助引导用语
+    /// </summary>
+    public string? TxtHelpRemarks { get; set; }
+
+    /// <summary>
+    /// 宫格说明文本
+    /// </summary>
+    public string? TxtRemarks { get; set; }
+
+    /// <summary>
+    /// 关怀说明
+    /// </summary>
+    public string? TxtCareRemarks { get; set; }
+
+    /// <summary>
+    /// 页面Url
+    /// </summary>
+    public string? PageUrl { get; set; }
+
+    /// <summary>
+    /// 关怀页面Url
+    /// </summary>
+    public string? PageCareUrl { get; set; }
+}
+
+/// <summary>
+/// 行业集合入参
+/// </summary>
+/// <param name="name">名称</param>
+/// <param name="departmentName">审批部门</param>
+public record IndustryListInDto(string? Name, string? ApproveOrgName) : PagedRequest;
+
+public class IndustryBaseOutDto
+{
+    /// <summary>
+    /// 行业信息
+    /// </summary>
+    public IndustryOutDto Industry { get; set; }
+
+    /// <summary>
+    /// 通知公告Id
+    /// </summary>
+    public string? BulletinId { get; set; }
+
+    /// <summary>
+    /// 作业区域集合
+    /// </summary>
+    public IList<SystemAreaOutDto> AreaTree { get; set; } = [];
+
+    /// <summary>
+    /// 附件集合
+    /// </summary>
+    public IList<IndustryFileDto> Files { get; set; } = [];
+
+    /// <summary>
+    /// 作业场所集合
+    /// </summary>
+    public IReadOnlyList<SystemDicDataOutDto> Workplace { get; set; }
+
+    /// <summary>
+    /// 场所名称集合
+    /// </summary>
+    public IReadOnlyList<SystemDicDataOutDto> WorkplaceName { get; set; }
+
+    /// <summary>
+    /// 作业类型集合
+    /// </summary>
+    public IReadOnlyList<SystemDicDataOutDto> JobType { get; set; }
+
+    /// <summary>
+    /// 经营单位类别集合
+    /// </summary>
+    public IReadOnlyList<SystemDicDataOutDto> BusinessUnitType { get; set; }
+}
+
 public class AddIndustryDto
 {
     /// <summary>
@@ -140,7 +263,7 @@ public class AddIndustryDto
     public string CareCellImgUrl { get; set; }
 
     /// <summary>
-    /// 附件集合
+    /// 附件集合(小程序上面可以下载的 doc 文件)
     /// </summary>
     public IList<IndustryFileDto> Files { get; set; }
 }