From bf0c5d38ac459d7d6085d29e48e2798baca347d5 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 24 Jun 2021 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0title=E5=92=8Csource=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/report/Display.meta.go | 6 +++++- models/report/Display.model.go | 2 ++ services/report/implments/Display.service.impl.go | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/report/Display.meta.go b/meta/report/Display.meta.go index 382783f..dd37124 100644 --- a/meta/report/Display.meta.go +++ b/meta/report/Display.meta.go @@ -18,6 +18,8 @@ import ( ******************************************************************************/ var Display_DisplayId = grmi.NewField("DisplayId", "RP_Display.DisplayId", "displayid", grmi.TypeInt) var Display_DisplayName = grmi.NewField("DisplayName", "RP_Display.DisplayName", "displayname", grmi.TypeString) +var Display_Title = grmi.NewField("Title", "RP_Display.Title", "title", grmi.TypeString) +var Display_Source = grmi.NewField("Source", "RP_Display.Source", "source", grmi.TypeString) var Display_DPCtrlPara1 = grmi.NewField("DPCtrlPara1", "RP_Display.DPCtrlPara1", "dpctrlpara1", grmi.TypeInt) var Display_DPCtrlPara2 = grmi.NewField("DPCtrlPara2", "RP_Display.DPCtrlPara2", "dpctrlpara2", grmi.TypeInt) var Display_DPCtrlPara3 = grmi.NewField("DPCtrlPara3", "RP_Display.DPCtrlPara3", "dpctrlpara3", grmi.TypeString) @@ -43,6 +45,8 @@ var Display = grmi.NewEntity( map[string]grmi.Field{ Display_DisplayId.Name: Display_DisplayId, Display_DisplayName.Name: Display_DisplayName, + Display_Title.Name: Display_Title, + Display_Source.Name: Display_Source, Display_DPCtrlPara1.Name: Display_DPCtrlPara1, Display_DPCtrlPara2.Name: Display_DPCtrlPara2, Display_DPCtrlPara3.Name: Display_DPCtrlPara3, @@ -54,4 +58,4 @@ var Display = grmi.NewEntity( Display_CreateTime.Name: Display_CreateTime, }, []string{}, - []string{"DisplayName", "DPCtrlPara1", "DPCtrlPara2", "DPCtrlPara3", "DPCtrlPara4", "DPCtrlPara5", "DPCtrlPara6", "LastUser"}) + []string{"DisplayName", "Title", "Source", "DPCtrlPara1", "DPCtrlPara2", "DPCtrlPara3", "DPCtrlPara4", "DPCtrlPara5", "DPCtrlPara6", "LastUser"}) diff --git a/models/report/Display.model.go b/models/report/Display.model.go index 7f8ad4d..b013db1 100644 --- a/models/report/Display.model.go +++ b/models/report/Display.model.go @@ -22,6 +22,8 @@ import ( type Display struct { DisplayId int `xorm:"pk int 'DisplayId'" json:"RP_Display-DisplayId"` DisplayName string `xorm:"nvarchar(100) 'DisplayName' not null" json:"RP_Display-DisplayName"` + Title string `xorm:"nvarchar(255) 'Title' not null" json:"RP_Display-Title"` + Source string `xorm:"nvarchar(40) 'Source' not null" json:"RP_Display-Source"` DPCtrlPara1 int `xorm:"int 'DPCtrlPara1' not null" json:"RP_Display-DPCtrlPara1"` DPCtrlPara2 int `xorm:"int 'DPCtrlPara2' not null" json:"RP_Display-DPCtrlPara2"` DPCtrlPara3 string `xorm:"nvarchar(100) 'DPCtrlPara3' not null" json:"RP_Display-DPCtrlPara3"` diff --git a/services/report/implments/Display.service.impl.go b/services/report/implments/Display.service.impl.go index 6d44f6b..befc76b 100644 --- a/services/report/implments/Display.service.impl.go +++ b/services/report/implments/Display.service.impl.go @@ -24,6 +24,8 @@ var DefaultConditionOfDisplay = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.Display_DisplayId.UrlParameterName: grmi.NewConditionItem(meta.Display_DisplayId, grmi.Equal, true), meta.Display_DisplayName.UrlParameterName: grmi.NewConditionItem(meta.Display_DisplayName, grmi.Equal, false), + meta.Display_Title.UrlParameterName: grmi.NewConditionItem(meta.Display_Title, grmi.Equal, false), + meta.Display_Source.UrlParameterName: grmi.NewConditionItem(meta.Display_Source, grmi.Equal, false), meta.Display_DPCtrlPara1.UrlParameterName: grmi.NewConditionItem(meta.Display_DPCtrlPara1, grmi.Equal, false), meta.Display_DPCtrlPara2.UrlParameterName: grmi.NewConditionItem(meta.Display_DPCtrlPara2, grmi.Equal, false), meta.Display_DPCtrlPara3.UrlParameterName: grmi.NewConditionItem(meta.Display_DPCtrlPara3, grmi.Equal, false),