Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -4397,12 +4397,27 @@ public class OrderController : BaseController
             await _orderSnapshotRepository.Queryable()
                 .LeftJoin<IndustryCase>((snapshot, industryCase) => snapshot.IndustryCase == industryCase.Id)
                 .Where((snapshot, industryCase) => snapshot.Id == order.Id)
-                .Select((snapshot, industryCase) => new { snapshot.IndustryId, snapshot.IndustryName, industryCase.Name, })
+                .Select((snapshot, industryCase) => new {
+                    snapshot.IndustryId, snapshot.IndustryName, industryCase.Name, 
+                    snapshot.IsRectifyDepartment,
+                    snapshot.IsDangerDepartment,
+                    snapshot.IsSafetyDepartment,
+                    snapshot.SignRemark,snapshot.SignUserId,
+                    snapshot.SignUserName,
+                    snapshot.SignTime
+                })
                 .FirstAsync(HttpContext.RequestAborted)
                 .Then(async snapshot =>
                 {
                     dto.IndustryName = snapshot.IndustryName + " " + snapshot.Name;
                     dto.IndustryId = snapshot.IndustryId;
+                    dto.IsRectifyDepartment = snapshot.IsRectifyDepartment;
+                    dto.IsDangerDepartment = snapshot.IsDangerDepartment;
+                    dto.IsSafetyDepartment = snapshot.IsSafetyDepartment;
+                    dto.SignUserId = snapshot.SignUserId;
+                    dto.SignUserName = snapshot.SignUserName;
+                    dto.SignTime = snapshot.SignTime;
+                    dto.SignRemark = snapshot.SignRemark;
                 });
         }
 

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

@@ -1049,6 +1049,41 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? IndustryName { get; set; }
 
+        /// <summary>
+        /// 部门-是否整改
+        /// </summary>
+        public bool? IsRectifyDepartment { get; set; }
+
+        /// <summary>
+        /// 部门-是否存在安全隐患
+        /// </summary>
+        public bool? IsDangerDepartment { get; set; }
+
+        /// <summary>
+        /// 标记-部门标记是否安全生产
+        /// </summary>
+        public bool? IsSafetyDepartment { get; set; }
+
+        /// <summary>
+        /// 标记-标记人
+        /// </summary>
+        public string? SignUserId { get; set; }
+
+        /// <summary>
+        /// 标记-标记人
+        /// </summary>
+        public string? SignUserName { get; set; }
+
+        /// <summary>
+        /// 标记-标记时间
+        /// </summary>
+        public DateTime? SignTime { get; set; }
+
+        /// <summary>
+        /// 标记-标记备注
+        /// </summary>
+        public string? SignRemark { get; set; }
+
         #endregion
 
         public bool? IsReTransact { get; set; }