Quellcode durchsuchen

Merge branch 'feature/snapshot' into dev

qinchaoyue vor 4 Monaten
Ursprung
Commit
6805803ba7

+ 2 - 0
src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -58,6 +58,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, (redPackAudit, order, snapshot, record, industry) => order.CreationTime <= dto.EndCreationTime && order.CreationTime >= dto.BeginCreationTime)
             .WhereIF(dto.IsDeal.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsDeal == dto.IsDeal)
             .WhereIF(dto.IsTruth.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsTruth == dto.IsTruth)
+            .WhereIF(dto.IsTruthDepartment.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsTruthDepartment == dto.IsTruthDepartment)
             .WhereIF(dto.BeginAuditTime.HasValue && dto.EndAuditTime.HasValue, (redPackAudit, order, snapshot, record, industry) => redPackAudit.AuditTime <= dto.EndAuditTime && redPackAudit.AuditTime >= dto.BeginAuditTime)
             .WhereIF(dto.IsIssued.HasValue, (redPackAudit, order, snapshot, record, industry) => redPackAudit.IsIssued == dto.IsIssued)
             .WhereIF(dto.IndustryId.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => snapshot.IndustryId == dto.IndustryId)
@@ -91,6 +92,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 IsDeal = snapshot.IsDeal,
                 NetworkENumber = snapshot.NetworkENumber,
                 IsTruth = snapshot.IsTruth,
+                IsTruthDepartment = snapshot.IsTruthDepartment,
                 IsRepetition = snapshot.IsRepetition,
                 CreationTime = order.CreationTime,
                 OrgLevelOneCode = order.OrgLevelOneCode,

+ 9 - 2
src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -194,7 +194,8 @@ public class AddSnapshotOrderInDto : Position
 /// <param name="BeginCreationTime">受理开始时间</param>
 /// <param name="EndCreationTime">受理结束时间</param>
 /// <param name="IsDeal">是否办理</param>
-/// <param name="IsTruth">是否属实</param>
+/// <param name="IsTruth">网格员是否属实</param>
+/// <param name="IsTruthDepartment">部门是否属实</param>
 /// <param name="BeginAuditTime">审批开始时间</param>
 /// <param name="EndAuditTime">审批结束时间</param>
 /// <param name="IsIssued">是否发放红包</param>
@@ -210,6 +211,7 @@ public record SnapshotOrderAuditItemsInDto(string? No, string? Title,
     DateTime? EndCreationTime,
     bool? IsDeal,
     bool? IsTruth,
+    bool? IsTruthDepartment,
     DateTime? BeginAuditTime,
     DateTime? EndAuditTime,
     bool? IsIssued,
@@ -361,10 +363,15 @@ public class SnapshotOrderAuditItemsOutDto
     public string? NetworkENumber { get; set; }
 
     /// <summary>
-    /// 是否属实
+    /// 网格员是否属实
     /// </summary>
     public bool? IsTruth { get; set; }
 
+    /// <summary>
+    /// 部门是否属实
+    /// </summary>
+    public bool? IsTruthDepartment { get; set; }
+
     /// <summary>
     /// 是否重复
     /// </summary>

+ 9 - 2
src/Hotline/Snapshot/OrderSnapshot.cs

@@ -76,9 +76,16 @@ public class OrderSnapshot : CreationSoftDeleteEntity
     [SugarColumn(ColumnDescription = "作业时间")]
     public DateTime? EndWorkTime { get; set; }
 
+    /// <summary>
+    /// 部门是否属实
+    /// </summary>
+    [SugarColumn(ColumnDescription = "部门是否属实")]
+    public bool? IsTruthDepartment { get; set; }
+
     /// <summary>
     /// 小程序公开
     /// </summary>
+    [SugarColumn(ColumnDescription = "小程序公开")]
     public bool? IsAppOpened { get; set; }
 
     #region 网格员回复
@@ -108,9 +115,9 @@ public class OrderSnapshot : CreationSoftDeleteEntity
     public string? NetworkENumber { get; set; }
 
     /// <summary>
-    /// 是否属实
+    /// 网格员是否属实
     /// </summary>
-    [SugarColumn(ColumnDescription = "是否属实")]
+    [SugarColumn(ColumnDescription = "网格员是否属实")]
     public bool? IsTruth { get; set; }
 
     /// <summary>