From b1400d8f898fc6e4c93195aa8cfd31e840d5ea9a Mon Sep 17 00:00:00 2001
From: wintel <yubaolee@163.com>
Date: Wed, 20 Sep 2023 22:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Request/AddOrUpdateSysPrinterPlanReq.cs                | 5 ++++-
 OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs        | 3 ++-
 OpenAuth.Repository/Domain/SysPrinterPlan.cs               | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenAuth.App/SysPrinterPlanApp/Request/AddOrUpdateSysPrinterPlanReq.cs b/OpenAuth.App/SysPrinterPlanApp/Request/AddOrUpdateSysPrinterPlanReq.cs
index 3f393aa7..061e3e2c 100644
--- a/OpenAuth.App/SysPrinterPlanApp/Request/AddOrUpdateSysPrinterPlanReq.cs
+++ b/OpenAuth.App/SysPrinterPlanApp/Request/AddOrUpdateSysPrinterPlanReq.cs
@@ -58,6 +58,9 @@ namespace OpenAuth.App.Request
        /// </summary>
        public bool Disable { get; set; }
 
-       
+       /// <summary>
+       /// 分组字段，通常用于主从表结构打印时
+       /// </summary>
+       public string GroupBy { get; set; }
     }
 }
\ No newline at end of file
diff --git a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
index 3491bbbe..59588cf0 100644
--- a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
+++ b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
@@ -91,7 +91,8 @@ namespace OpenAuth.App
             {
                 Name = obj.Name,
                 SourceSql = obj.SourceSql,
-                PlanContent = obj.PlanContent
+                PlanContent = obj.PlanContent,
+                GroupBy = obj.GroupBy
             },u => u.Id == obj.Id);
         }
         
diff --git a/OpenAuth.Repository/Domain/SysPrinterPlan.cs b/OpenAuth.Repository/Domain/SysPrinterPlan.cs
index 32e66864..122896f7 100644
--- a/OpenAuth.Repository/Domain/SysPrinterPlan.cs
+++ b/OpenAuth.Repository/Domain/SysPrinterPlan.cs
@@ -26,6 +26,7 @@ namespace OpenAuth.Repository.Domain
             this.SourceSql = "";
             this.CloumnView = "";
             this.PlanContent = "";
+            this.GroupBy = "";
             this.CreateTime = DateTime.Now;
             this.Disable = false;
         }
@@ -53,6 +54,12 @@ namespace OpenAuth.Repository.Domain
         /// </summary>
         [Description("中文视图名;设计打印方案时，提供中文快捷按钮的视图来源")]
         public string CloumnView { get; set; }
+        
+        /// <summary>
+        ///分组字段，通常用于主从表结构打印时
+        /// </summary>
+        [Description("分组字段，通常用于主从表结构打印时")]
+        public string GroupBy { get; set; }
 
         /// <summary>
         ///打印方案内容;打印方案JSON对象