diff --git a/dao/me/Project.dao.go b/dao/me/Project.dao.go index a6e407b..3f604f3 100644 --- a/dao/me/Project.dao.go +++ b/dao/me/Project.dao.go @@ -18,7 +18,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ type ProjectDAO interface { @@ -35,7 +35,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ InsertOne(*model.Project) error @@ -52,7 +52,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ DeleteOne(string) error @@ -71,7 +71,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ SelectOne(string) (*model.Project, error) @@ -88,7 +88,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ UpdateOne(*model.Project) error @@ -105,7 +105,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Insert(*[]model.Project) error @@ -122,7 +122,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Delete(*[]model.Project) error @@ -137,7 +137,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ DeleteWhere([]grmi.Predicate) error @@ -158,7 +158,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Select([]grmi.Predicate, []grmi.Field) ([]model.Project, error) @@ -181,7 +181,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ SelectAndPaging(*grmi.Paging, []grmi.Predicate, []grmi.Field) (grmi.PagingResult, error) @@ -198,7 +198,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Update(*[]model.Project) error @@ -213,7 +213,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ UpdateWhere([]grmi.Predicate, *model.Project, ...string) error @@ -234,7 +234,7 @@ type ProjectDAO interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func NewProjectDAO(session *xorm.Session, plantNr int, userid string) ProjectDAO { diff --git a/dao/me/implments/Project.dao.impl.go b/dao/me/implments/Project.dao.impl.go index b0326db..5c53678 100644 --- a/dao/me/implments/Project.dao.impl.go +++ b/dao/me/implments/Project.dao.impl.go @@ -20,7 +20,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 13:39:52 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ type ProjectDAOImplement struct { @@ -45,7 +45,7 @@ type ProjectDAOImplement struct { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 13:39:52 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func NewProjectDAOImplement(session *xorm.Session, plantNr int, userid string) *ProjectDAOImplement { @@ -296,7 +296,7 @@ func (impl *ProjectDAOImplement) UpdateWhere(predicates []grmi.Predicate, entity session = session.Where(where, parameters...) } - columns = append(columns, meta.Project_LastUser.ColumnName) + columns = append(columns, meta.Project_LastUser.Name) entity.LastUser = impl.userid _, err := impl.session.Table(impl.meta.TableName).Cols(columns...).Update(entity) if err != nil { diff --git a/grmi/Date.go b/grmi/Date.go index d74ae58..7431312 100644 --- a/grmi/Date.go +++ b/grmi/Date.go @@ -19,6 +19,10 @@ func (self *Date) UnmarshalJSON(data []byte) error { if err != nil { return err } + if jsonString == "0001-01-01" { + *self = Date(time.Time{}) + return nil + } result, err := time.ParseInLocation(URLDateFormat, jsonString, utils.TimezoneLocation) if err != nil { return err diff --git a/grmi/DateTime.go b/grmi/DateTime.go index ec98133..d2d9d5b 100644 --- a/grmi/DateTime.go +++ b/grmi/DateTime.go @@ -19,6 +19,10 @@ func (self *DateTime) UnmarshalJSON(data []byte) error { if err != nil { return err } + if jsonString == "0001-01-01 00:00:00" { + *self = DateTime(time.Time{}) + return nil + } result, err := time.ParseInLocation(URLDateTimeFormat, jsonString, utils.TimezoneLocation) if err != nil { return err diff --git a/meta/me/Project.meta.go b/meta/me/Project.meta.go index 2720507..824d63d 100644 --- a/meta/me/Project.meta.go +++ b/meta/me/Project.meta.go @@ -13,63 +13,26 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:28:44 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ var Project_PlantNr = grmi.NewField("PlantNr", "[ME_Project].PlantNr", "plantnr", grmi.TypeInt) var Project_ProjectId = grmi.NewField("ProjectId", "[ME_Project].ProjectId", "projectid", grmi.TypeString) var Project_Descr = grmi.NewField("Descr", "[ME_Project].Descr", "descr", grmi.TypeString) -var Project_EnableToggle = grmi.NewField("EnableToggle", "[ME_Project].EnableToggle", "enabletoggle", grmi.TypeBool) -var Project_PlantSiteCode = grmi.NewField("PlantSiteCode", "[ME_Project].PlantSiteCode", "plantsitecode", grmi.TypeInt) -var Project_CustName1 = grmi.NewField("CustName1", "[ME_Project].CustName1", "custname1", grmi.TypeString) -var Project_CustName2 = grmi.NewField("CustName2", "[ME_Project].CustName2", "custname2", grmi.TypeString) -var Project_FileServerHost = grmi.NewField("FileServerHost", "[ME_Project].FileServerHost", "fileserverhost", grmi.TypeString) -var Project_FileFolder1 = grmi.NewField("FileFolder1", "[ME_Project].FileFolder1", "filefolder1", grmi.TypeString) -var Project_FileFolder2 = grmi.NewField("FileFolder2", "[ME_Project].FileFolder2", "filefolder2", grmi.TypeString) -var Project_FileFolder3 = grmi.NewField("FileFolder3", "[ME_Project].FileFolder3", "filefolder3", grmi.TypeString) -var Project_FileFolder4 = grmi.NewField("FileFolder4", "[ME_Project].FileFolder4", "filefolder4", grmi.TypeString) -var Project_FileFolder5 = grmi.NewField("FileFolder5", "[ME_Project].FileFolder5", "filefolder5", grmi.TypeString) -var Project_FileFolder6 = grmi.NewField("FileFolder6", "[ME_Project].FileFolder6", "filefolder6", grmi.TypeString) -var Project_File1NameRegexp = grmi.NewField("File1NameRegexp", "[ME_Project].File1NameRegexp", "file1nameregexp", grmi.TypeString) -var Project_File2NameRegexp = grmi.NewField("File2NameRegexp", "[ME_Project].File2NameRegexp", "file2nameregexp", grmi.TypeString) -var Project_File3NameRegexp = grmi.NewField("File3NameRegexp", "[ME_Project].File3NameRegexp", "file3nameregexp", grmi.TypeString) -var Project_File4NameRegexp = grmi.NewField("File4NameRegexp", "[ME_Project].File4NameRegexp", "file4nameregexp", grmi.TypeString) -var Project_File5NameRegexp = grmi.NewField("File5NameRegexp", "[ME_Project].File5NameRegexp", "file5nameregexp", grmi.TypeString) -var Project_File6NameRegexp = grmi.NewField("File6NameRegexp", "[ME_Project].File6NameRegexp", "file6nameregexp", grmi.TypeString) -var Project_OrderVerifyRuleToggle1 = grmi.NewField("OrderVerifyRuleToggle1", "[ME_Project].OrderVerifyRuleToggle1", "orderverifyruletoggle1", grmi.TypeBool) -var Project_OrderVerifyRuleToggle2 = grmi.NewField("OrderVerifyRuleToggle2", "[ME_Project].OrderVerifyRuleToggle2", "orderverifyruletoggle2", grmi.TypeBool) -var Project_OrderVerifyRuleToggle3 = grmi.NewField("OrderVerifyRuleToggle3", "[ME_Project].OrderVerifyRuleToggle3", "orderverifyruletoggle3", grmi.TypeBool) -var Project_OrderVerifyRuleToggle4 = grmi.NewField("OrderVerifyRuleToggle4", "[ME_Project].OrderVerifyRuleToggle4", "orderverifyruletoggle4", grmi.TypeBool) -var Project_OrderVerifyRuleToggle5 = grmi.NewField("OrderVerifyRuleToggle5", "[ME_Project].OrderVerifyRuleToggle5", "orderverifyruletoggle5", grmi.TypeBool) -var Project_OrderVerifyRuleToggle6 = grmi.NewField("OrderVerifyRuleToggle6", "[ME_Project].OrderVerifyRuleToggle6", "orderverifyruletoggle6", grmi.TypeBool) -var Project_OrderVerifyRule1 = grmi.NewField("OrderVerifyRule1", "[ME_Project].OrderVerifyRule1", "orderverifyrule1", grmi.TypeString) -var Project_OrderVerifyRule2 = grmi.NewField("OrderVerifyRule2", "[ME_Project].OrderVerifyRule2", "orderverifyrule2", grmi.TypeString) -var Project_OrderVerifyRule3 = grmi.NewField("OrderVerifyRule3", "[ME_Project].OrderVerifyRule3", "orderverifyrule3", grmi.TypeString) -var Project_OrderVerifyRule4 = grmi.NewField("OrderVerifyRule4", "[ME_Project].OrderVerifyRule4", "orderverifyrule4", grmi.TypeString) -var Project_OrderVerifyRule5 = grmi.NewField("OrderVerifyRule5", "[ME_Project].OrderVerifyRule5", "orderverifyrule5", grmi.TypeString) -var Project_OrderVerifyRule6 = grmi.NewField("OrderVerifyRule6", "[ME_Project].OrderVerifyRule6", "orderverifyrule6", grmi.TypeString) -var Project_EmailServerHost = grmi.NewField("EmailServerHost", "[ME_Project].EmailServerHost", "emailserverhost", grmi.TypeString) -var Project_EmailServerPort = grmi.NewField("EmailServerPort", "[ME_Project].EmailServerPort", "emailserverport", grmi.TypeInt) -var Project_FromEmail = grmi.NewField("FromEmail", "[ME_Project].FromEmail", "fromemail", grmi.TypeString) -var Project_FromPwd = grmi.NewField("FromPwd", "[ME_Project].FromPwd", "frompwd", grmi.TypeString) -var Project_ErrorRecievers = grmi.NewField("ErrorRecievers", "[ME_Project].ErrorRecievers", "errorrecievers", grmi.TypeString) -var Project_ErrorCcRecievers = grmi.NewField("ErrorCcRecievers", "[ME_Project].ErrorCcRecievers", "errorccrecievers", grmi.TypeString) -var Project_LogUrl = grmi.NewField("LogUrl", "[ME_Project].LogUrl", "logurl", grmi.TypeString) -var Project_LogTable = grmi.NewField("LogTable", "[ME_Project].LogTable", "logtable", grmi.TypeString) -var Project_CustOrderSnr = grmi.NewField("CustOrderSnr", "[ME_Project].CustOrderSnr", "custordersnr", grmi.TypeString) -var Project_WorkOrderSnr = grmi.NewField("WorkOrderSnr", "[ME_Project].WorkOrderSnr", "workordersnr", grmi.TypeString) -var Project_SerialOrderSnr = grmi.NewField("SerialOrderSnr", "[ME_Project].SerialOrderSnr", "serialordersnr", grmi.TypeString) -var Project_ManualOrderSnr = grmi.NewField("ManualOrderSnr", "[ME_Project].ManualOrderSnr", "manualordersnr", grmi.TypeString) -var Project_OrderMsgSnr = grmi.NewField("OrderMsgSnr", "[ME_Project].OrderMsgSnr", "ordermsgsnr", grmi.TypeString) -var Project_ReworkOrderSnr = grmi.NewField("ReworkOrderSnr", "[ME_Project].ReworkOrderSnr", "reworkordersnr", grmi.TypeString) -var Project_PackOrderSnr = grmi.NewField("PackOrderSnr", "[ME_Project].PackOrderSnr", "packordersnr", grmi.TypeString) -var Project_PackOrderSyncSnr = grmi.NewField("PackOrderSyncSnr", "[ME_Project].PackOrderSyncSnr", "packordersyncsnr", grmi.TypeString) -var Project_ShipOrderSnr = grmi.NewField("ShipOrderSnr", "[ME_Project].ShipOrderSnr", "shipordersnr", grmi.TypeString) -var Project_ShipFileSnr = grmi.NewField("ShipFileSnr", "[ME_Project].ShipFileSnr", "shipfilesnr", grmi.TypeString) -var Project_AsnFileSnr = grmi.NewField("AsnFileSnr", "[ME_Project].AsnFileSnr", "asnfilesnr", grmi.TypeString) -var Project_LogDemandSnr = grmi.NewField("LogDemandSnr", "[ME_Project].LogDemandSnr", "logdemandsnr", grmi.TypeString) -var Project_LogDemandCacheSnr = grmi.NewField("LogDemandCacheSnr", "[ME_Project].logDemandCacheSnr", "logdemandcachesnr", grmi.TypeString) -var Project_WorkOrderCacheSnr = grmi.NewField("WorkOrderCacheSnr", "[ME_Project].WorkOrderCacheSnr", "workordercachesnr", grmi.TypeString) +var Project_CustomerId = grmi.NewField("CustomerId", "[ME_Project].CustomerId", "customerid", grmi.TypeString) +var Project_SOP = grmi.NewField("SOP", "[ME_Project].SOP", "sop", grmi.TypeDate) +var Project_EOP = grmi.NewField("EOP", "[ME_Project].EOP", "eop", grmi.TypeDate) +var Project_ProjectDate1 = grmi.NewField("ProjectDate1", "[ME_Project].ProjectDate1", "projectdate1", grmi.TypeDate) +var Project_ProjectDate2 = grmi.NewField("ProjectDate2", "[ME_Project].ProjectDate2", "projectdate2", grmi.TypeDate) +var Project_ProjectDate3 = grmi.NewField("ProjectDate3", "[ME_Project].ProjectDate3", "projectdate3", grmi.TypeDate) +var Project_ProjectDate4 = grmi.NewField("ProjectDate4", "[ME_Project].ProjectDate4", "projectdate4", grmi.TypeDate) +var Project_AlertDaysBeforeEOP = grmi.NewField("AlertDaysBeforeEOP", "[ME_Project].AlertDaysBeforeEOP", "alertdaysbeforeeop", grmi.TypeInt) +var Project_CtrlPara1 = grmi.NewField("CtrlPara1", "[ME_Project].CtrlPara1", "ctrlpara1", grmi.TypeInt) +var Project_CtrlPara2 = grmi.NewField("CtrlPara2", "[ME_Project].CtrlPara2", "ctrlpara2", grmi.TypeInt) +var Project_CtrlStr1 = grmi.NewField("CtrlStr1", "[ME_Project].CtrlStr1", "ctrlstr1", grmi.TypeString) +var Project_CtrlStr2 = grmi.NewField("CtrlStr2", "[ME_Project].CtrlStr2", "ctrlstr2", grmi.TypeString) +var Project_CtrlTime1 = grmi.NewField("CtrlTime1", "[ME_Project].CtrlTime1", "ctrltime1", grmi.TypeDateTime) +var Project_CtrlTime2 = grmi.NewField("CtrlTime2", "[ME_Project].CtrlTime2", "ctrltime2", grmi.TypeDateTime) var Project_LastModify = grmi.NewField("LastModify", "[ME_Project].LastModify", "lastmodify", grmi.TypeDateTime) var Project_LastUser = grmi.NewField("LastUser", "[ME_Project].LastUser", "lastuser", grmi.TypeString) var Project_CreateTime = grmi.NewField("CreateTime", "[ME_Project].CreateTime", "createtime", grmi.TypeDateTime) @@ -80,70 +43,33 @@ var Project_CreateTime = grmi.NewField("CreateTime", "[ME_Project].CreateTime", * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:28:44 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ var Project = grmi.NewEntity( "ME_Project", func() interface{} { return &model.Project{} }, map[string]grmi.Field{ - Project_PlantNr.Name: Project_PlantNr, - Project_ProjectId.Name: Project_ProjectId, - Project_Descr.Name: Project_Descr, - Project_EnableToggle.Name: Project_EnableToggle, - Project_PlantSiteCode.Name: Project_PlantSiteCode, - Project_CustName1.Name: Project_CustName1, - Project_CustName2.Name: Project_CustName2, - Project_FileServerHost.Name: Project_FileServerHost, - Project_FileFolder1.Name: Project_FileFolder1, - Project_FileFolder2.Name: Project_FileFolder2, - Project_FileFolder3.Name: Project_FileFolder3, - Project_FileFolder4.Name: Project_FileFolder4, - Project_FileFolder5.Name: Project_FileFolder5, - Project_FileFolder6.Name: Project_FileFolder6, - Project_File1NameRegexp.Name: Project_File1NameRegexp, - Project_File2NameRegexp.Name: Project_File2NameRegexp, - Project_File3NameRegexp.Name: Project_File3NameRegexp, - Project_File4NameRegexp.Name: Project_File4NameRegexp, - Project_File5NameRegexp.Name: Project_File5NameRegexp, - Project_File6NameRegexp.Name: Project_File6NameRegexp, - Project_OrderVerifyRuleToggle1.Name: Project_OrderVerifyRuleToggle1, - Project_OrderVerifyRuleToggle2.Name: Project_OrderVerifyRuleToggle2, - Project_OrderVerifyRuleToggle3.Name: Project_OrderVerifyRuleToggle3, - Project_OrderVerifyRuleToggle4.Name: Project_OrderVerifyRuleToggle4, - Project_OrderVerifyRuleToggle5.Name: Project_OrderVerifyRuleToggle5, - Project_OrderVerifyRuleToggle6.Name: Project_OrderVerifyRuleToggle6, - Project_OrderVerifyRule1.Name: Project_OrderVerifyRule1, - Project_OrderVerifyRule2.Name: Project_OrderVerifyRule2, - Project_OrderVerifyRule3.Name: Project_OrderVerifyRule3, - Project_OrderVerifyRule4.Name: Project_OrderVerifyRule4, - Project_OrderVerifyRule5.Name: Project_OrderVerifyRule5, - Project_OrderVerifyRule6.Name: Project_OrderVerifyRule6, - Project_EmailServerHost.Name: Project_EmailServerHost, - Project_EmailServerPort.Name: Project_EmailServerPort, - Project_FromEmail.Name: Project_FromEmail, - Project_FromPwd.Name: Project_FromPwd, - Project_ErrorRecievers.Name: Project_ErrorRecievers, - Project_ErrorCcRecievers.Name: Project_ErrorCcRecievers, - Project_LogUrl.Name: Project_LogUrl, - Project_LogTable.Name: Project_LogTable, - Project_CustOrderSnr.Name: Project_CustOrderSnr, - Project_WorkOrderSnr.Name: Project_WorkOrderSnr, - Project_SerialOrderSnr.Name: Project_SerialOrderSnr, - Project_ManualOrderSnr.Name: Project_ManualOrderSnr, - Project_OrderMsgSnr.Name: Project_OrderMsgSnr, - Project_ReworkOrderSnr.Name: Project_ReworkOrderSnr, - Project_PackOrderSnr.Name: Project_PackOrderSnr, - Project_PackOrderSyncSnr.Name: Project_PackOrderSyncSnr, - Project_ShipOrderSnr.Name: Project_ShipOrderSnr, - Project_ShipFileSnr.Name: Project_ShipFileSnr, - Project_AsnFileSnr.Name: Project_AsnFileSnr, - Project_LogDemandSnr.Name: Project_LogDemandSnr, - Project_LogDemandCacheSnr.Name: Project_LogDemandCacheSnr, - Project_WorkOrderCacheSnr.Name: Project_WorkOrderCacheSnr, - Project_LastModify.Name: Project_LastModify, - Project_LastUser.Name: Project_LastUser, - Project_CreateTime.Name: Project_CreateTime, + Project_PlantNr.Name: Project_PlantNr, + Project_ProjectId.Name: Project_ProjectId, + Project_Descr.Name: Project_Descr, + Project_CustomerId.Name: Project_CustomerId, + Project_SOP.Name: Project_SOP, + Project_EOP.Name: Project_EOP, + Project_ProjectDate1.Name: Project_ProjectDate1, + Project_ProjectDate2.Name: Project_ProjectDate2, + Project_ProjectDate3.Name: Project_ProjectDate3, + Project_ProjectDate4.Name: Project_ProjectDate4, + Project_AlertDaysBeforeEOP.Name: Project_AlertDaysBeforeEOP, + Project_CtrlPara1.Name: Project_CtrlPara1, + Project_CtrlPara2.Name: Project_CtrlPara2, + Project_CtrlStr1.Name: Project_CtrlStr1, + Project_CtrlStr2.Name: Project_CtrlStr2, + Project_CtrlTime1.Name: Project_CtrlTime1, + Project_CtrlTime2.Name: Project_CtrlTime2, + Project_LastModify.Name: Project_LastModify, + Project_LastUser.Name: Project_LastUser, + Project_CreateTime.Name: Project_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "EnableToggle", "PlantSiteCode", "CustName1", "CustName2", "FileServerHost", "FileFolder1", "FileFolder2", "FileFolder3", "FileFolder4", "FileFolder5", "FileFolder6", "File1NameRegexp", "File2NameRegexp", "File3NameRegexp", "File4NameRegexp", "File5NameRegexp", "File6NameRegexp", "OrderVerifyRuleToggle1", "OrderVerifyRuleToggle2", "OrderVerifyRuleToggle3", "OrderVerifyRuleToggle4", "OrderVerifyRuleToggle5", "OrderVerifyRuleToggle6", "OrderVerifyRule1", "OrderVerifyRule2", "OrderVerifyRule3", "OrderVerifyRule4", "OrderVerifyRule5", "OrderVerifyRule6", "EmailServerHost", "EmailServerPort", "FromEmail", "FromPwd", "ErrorRecievers", "ErrorCcRecievers", "LogUrl", "LogTable", "CustOrderSnr", "WorkOrderSnr", "SerialOrderSnr", "ManualOrderSnr", "OrderMsgSnr", "ReworkOrderSnr", "PackOrderSnr", "PackOrderSyncSnr", "ShipOrderSnr", "ShipFileSnr", "AsnFileSnr", "LogDemandSnr", "logDemandCacheSnr", "WorkOrderCacheSnr", "LastUser"}) + []string{"Descr", "CustomerId", "SOP", "EOP", "ProjectDate1", "ProjectDate2", "ProjectDate3", "ProjectDate4", "AlertDaysBeforeEOP", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) diff --git a/models/base/EscalateModelHead.model.go b/models/base/EscalateModelHead.model.go index 0bee9e1..1d4716f 100644 --- a/models/base/EscalateModelHead.model.go +++ b/models/base/EscalateModelHead.model.go @@ -20,23 +20,24 @@ import ( * ******************************************************************************/ type EscalateModelHead struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"EscalateModelHead-PlantNr"` - EscalateModelId string `xorm:"pk nvarchar(40) 'EscalateModelId'" json:"EscalateModelHead-EscalateModelId"` - Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"EscalateModelHead-Descr"` - EscalateType string `xorm:"nvarchar(40) 'EscalateType' not null" json:"EscalateModelHead-EscalateType"` - EMailServerHost string `xorm:"nvarchar(255) 'EMailServerHost' not null" json:"EscalateModelHead-EMailServerHost"` - EMailServerPort int `xorm:"int 'EMailServerPort' not null" json:"EscalateModelHead-EMailServerPort"` - FromEmail string `xorm:"nvarchar(255) 'FromEmail' not null" json:"EscalateModelHead-FromEmail"` - EmailPwd string `xorm:"nvarchar(255) 'EmailPwd' not null" json:"EscalateModelHead-EmailPwd"` - CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"EscalateModelHead-CtrlPara1"` - CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"EscalateModelHead-CtrlPara2"` - CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"EscalateModelHead-CtrlStr1"` - CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"EscalateModelHead-CtrlStr2"` - CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1'" json:"EscalateModelHead-CtrlTime1"` - CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2'" json:"EscalateModelHead-CtrlTime2"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"EscalateModelHead-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"EscalateModelHead-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"EscalateModelHead-CreateTime"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"EscalateModelHead-PlantNr"` + EscalateModelId string `xorm:"pk nvarchar(40) 'EscalateModelId'" json:"EscalateModelHead-EscalateModelId"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"EscalateModelHead-Descr"` + EscalateType string `xorm:"nvarchar(40) 'EscalateType' not null" json:"EscalateModelHead-EscalateType"` + EMailServerHost string `xorm:"nvarchar(255) 'EMailServerHost' not null" json:"EscalateModelHead-EMailServerHost"` + EMailServerPort int `xorm:"int 'EMailServerPort' not null" json:"EscalateModelHead-EMailServerPort"` + FromEmail string `xorm:"nvarchar(255) 'FromEmail' not null" json:"EscalateModelHead-FromEmail"` + EmailPwd string `xorm:"nvarchar(255) 'EmailPwd' not null" json:"EscalateModelHead-EmailPwd"` + CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"EscalateModelHead-CtrlPara1"` + CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"EscalateModelHead-CtrlPara2"` + CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"EscalateModelHead-CtrlStr1"` + CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"EscalateModelHead-CtrlStr2"` + CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1'" json:"EscalateModelHead-CtrlTime1"` + CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2'" json:"EscalateModelHead-CtrlTime2"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"EscalateModelHead-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"EscalateModelHead-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"EscalateModelHead-CreateTime"` + EscalateModelLevellst []EscalateModelLevellst `xorm:"-" json:"EscalateModelHead-EscalateModelLevellst"` } /****************************************************************************** diff --git a/models/base/EscalateModelLevellst.model.go b/models/base/EscalateModelLevellst.model.go index cc1307b..c7bf63f 100644 --- a/models/base/EscalateModelLevellst.model.go +++ b/models/base/EscalateModelLevellst.model.go @@ -20,23 +20,24 @@ import ( * ******************************************************************************/ type EscalateModelLevellst struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"EscalateModelLevellst-PlantNr"` - EscalateModelId string `xorm:"pk nvarchar(40) 'EscalateModelId'" json:"EscalateModelLevellst-EscalateModelId"` - EscalateLevel int `xorm:"pk int 'EscalateLevel'" json:"EscalateModelLevellst-EscalateLevel"` - Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"EscalateModelLevellst-Descr"` - EscalateLeadTime int `xorm:"int 'EscalateLeadTime'" json:"EscalateModelLevellst-EscalateLeadTime"` - EscalateLeadTime1 int `xorm:"int 'EscalateLeadTime1'" json:"EscalateModelLevellst-EscalateLeadTime1"` - EscalateLeadTime2 int `xorm:"int 'EscalateLeadTime2'" json:"EscalateModelLevellst-EscalateLeadTime2"` - TimeUom string `xorm:"nvarchar(40) 'TimeUom' not null" json:"EscalateModelLevellst-TimeUom"` - CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"EscalateModelLevellst-CtrlPara1"` - CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"EscalateModelLevellst-CtrlPara2"` - CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"EscalateModelLevellst-CtrlStr1"` - CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"EscalateModelLevellst-CtrlStr2"` - CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1'" json:"EscalateModelLevellst-CtrlTime1"` - CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2'" json:"EscalateModelLevellst-CtrlTime2"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"EscalateModelLevellst-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"EscalateModelLevellst-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"EscalateModelLevellst-CreateTime"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"EscalateModelLevellst-PlantNr"` + EscalateModelId string `xorm:"pk nvarchar(40) 'EscalateModelId'" json:"EscalateModelLevellst-EscalateModelId"` + EscalateLevel int `xorm:"pk int 'EscalateLevel'" json:"EscalateModelLevellst-EscalateLevel"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"EscalateModelLevellst-Descr"` + EscalateLeadTime int `xorm:"int 'EscalateLeadTime'" json:"EscalateModelLevellst-EscalateLeadTime"` + EscalateLeadTime1 int `xorm:"int 'EscalateLeadTime1'" json:"EscalateModelLevellst-EscalateLeadTime1"` + EscalateLeadTime2 int `xorm:"int 'EscalateLeadTime2'" json:"EscalateModelLevellst-EscalateLeadTime2"` + TimeUom string `xorm:"nvarchar(40) 'TimeUom' not null" json:"EscalateModelLevellst-TimeUom"` + CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"EscalateModelLevellst-CtrlPara1"` + CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"EscalateModelLevellst-CtrlPara2"` + CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"EscalateModelLevellst-CtrlStr1"` + CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"EscalateModelLevellst-CtrlStr2"` + CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1'" json:"EscalateModelLevellst-CtrlTime1"` + CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2'" json:"EscalateModelLevellst-CtrlTime2"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"EscalateModelLevellst-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"EscalateModelLevellst-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"EscalateModelLevellst-CreateTime"` + EscalateModelLevelDetail []EscalateModelLevelDetail `xorm:"-" json:"EscalateModelLevellst-EscalateModelLevelDetail"` } /****************************************************************************** diff --git a/models/me/Project.model.go b/models/me/Project.model.go index fa53a3f..0eac94e 100644 --- a/models/me/Project.model.go +++ b/models/me/Project.model.go @@ -16,67 +16,30 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:28:44 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ type Project struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_Project-PlantNr"` - ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ME_Project-ProjectId"` - Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"ME_Project-Descr"` - EnableToggle bool `xorm:"bit 'EnableToggle' not null" json:"ME_Project-EnableToggle"` - PlantSiteCode int `xorm:"int 'PlantSiteCode' not null" json:"ME_Project-PlantSiteCode"` - CustName1 string `xorm:"nvarchar(100) 'CustName1' not null" json:"ME_Project-CustName1"` - CustName2 string `xorm:"nvarchar(100) 'CustName2' not null" json:"ME_Project-CustName2"` - FileServerHost string `xorm:"nvarchar(60) 'FileServerHost' not null" json:"ME_Project-FileServerHost"` - FileFolder1 string `xorm:"nvarchar(100) 'FileFolder1' not null" json:"ME_Project-FileFolder1"` - FileFolder2 string `xorm:"nvarchar(100) 'FileFolder2' not null" json:"ME_Project-FileFolder2"` - FileFolder3 string `xorm:"nvarchar(100) 'FileFolder3' not null" json:"ME_Project-FileFolder3"` - FileFolder4 string `xorm:"nvarchar(100) 'FileFolder4' not null" json:"ME_Project-FileFolder4"` - FileFolder5 string `xorm:"nvarchar(100) 'FileFolder5' not null" json:"ME_Project-FileFolder5"` - FileFolder6 string `xorm:"nvarchar(100) 'FileFolder6' not null" json:"ME_Project-FileFolder6"` - File1NameRegexp string `xorm:"nvarchar(100) 'File1NameRegexp' not null" json:"ME_Project-File1NameRegexp"` - File2NameRegexp string `xorm:"nvarchar(100) 'File2NameRegexp' not null" json:"ME_Project-File2NameRegexp"` - File3NameRegexp string `xorm:"nvarchar(100) 'File3NameRegexp' not null" json:"ME_Project-File3NameRegexp"` - File4NameRegexp string `xorm:"nvarchar(100) 'File4NameRegexp' not null" json:"ME_Project-File4NameRegexp"` - File5NameRegexp string `xorm:"nvarchar(100) 'File5NameRegexp' not null" json:"ME_Project-File5NameRegexp"` - File6NameRegexp string `xorm:"nvarchar(100) 'File6NameRegexp' not null" json:"ME_Project-File6NameRegexp"` - OrderVerifyRuleToggle1 bool `xorm:"bit 'OrderVerifyRuleToggle1' not null" json:"ME_Project-OrderVerifyRuleToggle1"` - OrderVerifyRuleToggle2 bool `xorm:"bit 'OrderVerifyRuleToggle2' not null" json:"ME_Project-OrderVerifyRuleToggle2"` - OrderVerifyRuleToggle3 bool `xorm:"bit 'OrderVerifyRuleToggle3' not null" json:"ME_Project-OrderVerifyRuleToggle3"` - OrderVerifyRuleToggle4 bool `xorm:"bit 'OrderVerifyRuleToggle4' not null" json:"ME_Project-OrderVerifyRuleToggle4"` - OrderVerifyRuleToggle5 bool `xorm:"bit 'OrderVerifyRuleToggle5' not null" json:"ME_Project-OrderVerifyRuleToggle5"` - OrderVerifyRuleToggle6 bool `xorm:"bit 'OrderVerifyRuleToggle6' not null" json:"ME_Project-OrderVerifyRuleToggle6"` - OrderVerifyRule1 string `xorm:"nvarchar(100) 'OrderVerifyRule1' not null" json:"ME_Project-OrderVerifyRule1"` - OrderVerifyRule2 string `xorm:"nvarchar(100) 'OrderVerifyRule2' not null" json:"ME_Project-OrderVerifyRule2"` - OrderVerifyRule3 string `xorm:"nvarchar(100) 'OrderVerifyRule3' not null" json:"ME_Project-OrderVerifyRule3"` - OrderVerifyRule4 string `xorm:"nvarchar(100) 'OrderVerifyRule4' not null" json:"ME_Project-OrderVerifyRule4"` - OrderVerifyRule5 string `xorm:"nvarchar(100) 'OrderVerifyRule5' not null" json:"ME_Project-OrderVerifyRule5"` - OrderVerifyRule6 string `xorm:"nvarchar(100) 'OrderVerifyRule6' not null" json:"ME_Project-OrderVerifyRule6"` - EmailServerHost string `xorm:"nvarchar(60) 'EmailServerHost' not null" json:"ME_Project-EmailServerHost"` - EmailServerPort int `xorm:"int 'EmailServerPort' not null" json:"ME_Project-EmailServerPort"` - FromEmail string `xorm:"nvarchar(100) 'FromEmail' not null" json:"ME_Project-FromEmail"` - FromPwd string `xorm:"nvarchar(100) 'FromPwd' not null" json:"ME_Project-FromPwd"` - ErrorRecievers string `xorm:"nvarchar(100) 'ErrorRecievers' not null" json:"ME_Project-ErrorRecievers"` - ErrorCcRecievers string `xorm:"nvarchar(100) 'ErrorCcRecievers' not null" json:"ME_Project-ErrorCcRecievers"` - LogUrl string `xorm:"nvarchar(60) 'LogUrl' not null" json:"ME_Project-LogUrl"` - LogTable string `xorm:"nvarchar(40) 'LogTable' not null" json:"ME_Project-LogTable"` - CustOrderSnr string `xorm:"nvarchar(40) 'CustOrderSnr' not null" json:"ME_Project-CustOrderSnr"` - WorkOrderSnr string `xorm:"nvarchar(40) 'WorkOrderSnr' not null" json:"ME_Project-WorkOrderSnr"` - SerialOrderSnr string `xorm:"nvarchar(40) 'SerialOrderSnr' not null" json:"ME_Project-SerialOrderSnr"` - ManualOrderSnr string `xorm:"nvarchar(40) 'ManualOrderSnr' not null" json:"ME_Project-ManualOrderSnr"` - OrderMsgSnr string `xorm:"nvarchar(40) 'OrderMsgSnr' not null" json:"ME_Project-OrderMsgSnr"` - ReworkOrderSnr string `xorm:"nvarchar(40) 'ReworkOrderSnr' not null" json:"ME_Project-ReworkOrderSnr"` - PackOrderSnr string `xorm:"nvarchar(40) 'PackOrderSnr' not null" json:"ME_Project-PackOrderSnr"` - PackOrderSyncSnr string `xorm:"nvarchar(40) 'PackOrderSyncSnr' not null" json:"ME_Project-PackOrderSyncSnr"` - ShipOrderSnr string `xorm:"nvarchar(40) 'ShipOrderSnr' not null" json:"ME_Project-ShipOrderSnr"` - ShipFileSnr string `xorm:"nvarchar(40) 'ShipFileSnr' not null" json:"ME_Project-ShipFileSnr"` - AsnFileSnr string `xorm:"nvarchar(40) 'AsnFileSnr' not null" json:"ME_Project-AsnFileSnr"` - LogDemandSnr string `xorm:"nvarchar(40) 'LogDemandSnr'" json:"ME_Project-LogDemandSnr"` - LogDemandCacheSnr string `xorm:"nvarchar(40) 'logDemandCacheSnr'" json:"ME_Project-logDemandCacheSnr"` - WorkOrderCacheSnr string `xorm:"nvarchar(40) 'WorkOrderCacheSnr'" json:"ME_Project-WorkOrderCacheSnr"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_Project-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_Project-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_Project-CreateTime"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_Project-PlantNr"` + ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ME_Project-ProjectId"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"ME_Project-Descr"` + CustomerId string `xorm:"nvarchar(40) 'CustomerId' not null" json:"ME_Project-CustomerId"` + SOP grmi.Date `xorm:"date 'SOP'" json:"ME_Project-SOP"` + EOP grmi.Date `xorm:"date 'EOP'" json:"ME_Project-EOP"` + ProjectDate1 grmi.Date `xorm:"date 'ProjectDate1'" json:"ME_Project-ProjectDate1"` + ProjectDate2 grmi.Date `xorm:"date 'ProjectDate2'" json:"ME_Project-ProjectDate2"` + ProjectDate3 grmi.Date `xorm:"date 'ProjectDate3'" json:"ME_Project-ProjectDate3"` + ProjectDate4 grmi.Date `xorm:"date 'ProjectDate4'" json:"ME_Project-ProjectDate4"` + AlertDaysBeforeEOP int `xorm:"int 'AlertDaysBeforeEOP' not null" json:"ME_Project-AlertDaysBeforeEOP"` + CtrlPara1 int `xorm:"int 'CtrlPara1' not null" json:"ME_Project-CtrlPara1"` + CtrlPara2 int `xorm:"int 'CtrlPara2' not null" json:"ME_Project-CtrlPara2"` + CtrlStr1 string `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"ME_Project-CtrlStr1"` + CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"ME_Project-CtrlStr2"` + CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1'" json:"ME_Project-CtrlTime1"` + CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2'" json:"ME_Project-CtrlTime2"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_Project-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_Project-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_Project-CreateTime"` } /****************************************************************************** @@ -90,7 +53,7 @@ type Project struct { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:28:44 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func (self *Project) GetKey() core.PK { diff --git a/services/base/implments/EscalateModelHead.service.impl.go b/services/base/implments/EscalateModelHead.service.impl.go index 4d5bd2f..bbb64dc 100644 --- a/services/base/implments/EscalateModelHead.service.impl.go +++ b/services/base/implments/EscalateModelHead.service.impl.go @@ -101,15 +101,87 @@ func (impl *EscalateModelHeadServiceImplement) InsertOne(user *global.User, enti engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() + + // add Begin() before any action + err := session.Begin() + if err != nil { + session.Rollback() + return err + } dao := dal.NewEscalateModelHeadDAO(session, user.PlantNr, user.UserId) + levelDao := dal.NewEscalateModelLevellstDAO(session, user.PlantNr, user.UserId) + detailDao := dal.NewEscalateModelLevelDetailDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(entity.EscalateModelId) if err != nil { + session.Rollback() return err } if record != nil { + session.Rollback() return grmi.NewBusinessError("已经存在相同主键的记录!") } + + //第一步:先插入头部 err = dao.InsertOne(entity) + if err != nil { + session.Rollback() + return err + } + //第二步: 删除步骤及其明细 + err = levelDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevellst_EscalateModelId.NewPredicate(grmi.Equal, entity.EscalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + + err = detailDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevelDetail_EscalateModelId.NewPredicate(grmi.Equal, entity.EscalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + //第三步: 添加步骤及其明细 + //批量插入 + alldata := make([]model.EscalateModelLevellst, 0) + alluser := make([]model.EscalateModelLevelDetail, 0) + for _, v := range entity.EscalateModelLevellst { + onedata := model.EscalateModelLevellst{} + onedata.Descr = v.Descr + onedata.PlantNr = user.PlantNr + onedata.EscalateModelId = entity.EscalateModelId + onedata.EscalateLevel = v.EscalateLevel + onedata.EscalateLeadTime = v.EscalateLeadTime + onedata.TimeUom = v.TimeUom + alldata = append(alldata, onedata) + for kk, vv := range v.EscalateModelLevelDetail { + one := model.EscalateModelLevelDetail{} + one.Pos = (kk + 1) + one.PlantNr = user.PlantNr + one.EscalateModelId = entity.EscalateModelId + one.EscalateLevel = vv.EscalateLevel + one.InformUserId = vv.InformUserId + one.InformType = vv.InformType + one.MsgHead = vv.MsgHead + one.MsgBody = vv.MsgBody + one.MsgSignature = vv.MsgSignature + alluser = append(alluser, one) + } + + } + err = levelDao.Insert(&alldata) + if err != nil { + session.Rollback() + return err + } + err = detailDao.Insert(&alluser) + if err != nil { + session.Rollback() + return err + } + err = session.Commit() if err != nil { return err } @@ -128,6 +200,15 @@ func (impl *EscalateModelHeadServiceImplement) DeleteOne(user *global.User, esca engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() + + // add Begin() before any action + err := session.Begin() + if err != nil { + session.Rollback() + return err + } + levelDao := dal.NewEscalateModelLevellstDAO(session, user.PlantNr, user.UserId) + detailDao := dal.NewEscalateModelLevelDetailDAO(session, user.PlantNr, user.UserId) dao := dal.NewEscalateModelHeadDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(escalateModelId) if err != nil { @@ -140,6 +221,26 @@ func (impl *EscalateModelHeadServiceImplement) DeleteOne(user *global.User, esca if err != nil { return err } + err = levelDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevellst_EscalateModelId.NewPredicate(grmi.Equal, escalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + + err = detailDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevelDetail_EscalateModelId.NewPredicate(grmi.Equal, escalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + + err = session.Commit() + if err != nil { + return err + } return nil } @@ -156,10 +257,25 @@ func (impl *EscalateModelHeadServiceImplement) SelectOne(user *global.User, esca session := engine.NewSession() defer session.Close() dao := dal.NewEscalateModelHeadDAO(session, user.PlantNr, user.UserId) + levelDao := dal.NewEscalateModelLevellstDAO(session, user.PlantNr, user.UserId) + detailDao := dal.NewEscalateModelLevelDetailDAO(session, user.PlantNr, user.UserId) result, err := dao.SelectOne(escalateModelId) if err != nil { return nil, err } + //查询对应的所有级别 + datalist, err := levelDao.Select([]grmi.Predicate{ + meta.EscalateModelLevellst_EscalateModelId.NewPredicate(grmi.Equal, escalateModelId), + }, nil) + //查询对应的所有详情 + for k, _ := range datalist { + detailData := make([]model.EscalateModelLevelDetail, 0) + detailData, err = detailDao.Select([]grmi.Predicate{ + meta.EscalateModelLevelDetail_EscalateModelId.NewPredicate(grmi.Equal, escalateModelId), + }, nil) + datalist[k].EscalateModelLevelDetail = detailData + } + result.EscalateModelLevellst = datalist return result, nil } @@ -175,15 +291,86 @@ func (impl *EscalateModelHeadServiceImplement) UpdateOne(user *global.User, enti engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() + + // add Begin() before any action + err := session.Begin() + if err != nil { + session.Rollback() + return err + } dao := dal.NewEscalateModelHeadDAO(session, user.PlantNr, user.UserId) + levelDao := dal.NewEscalateModelLevellstDAO(session, user.PlantNr, user.UserId) + detailDao := dal.NewEscalateModelLevelDetailDAO(session, user.PlantNr, user.UserId) record, err := dao.SelectOne(entity.EscalateModelId) if err != nil { + session.Rollback() return err } if record == nil { + session.Rollback() return grmi.NewBusinessError("不存在指定记录!") } err = dao.UpdateOne(entity) + if err != nil { + session.Rollback() + return err + } + + //第二步: 删除步骤及其明细 + err = levelDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevellst_EscalateModelId.NewPredicate(grmi.Equal, entity.EscalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + + err = detailDao.DeleteWhere([]grmi.Predicate{ + meta.EscalateModelLevelDetail_EscalateModelId.NewPredicate(grmi.Equal, entity.EscalateModelId), + }) + if err != nil { + session.Rollback() + return err + } + //第三步: 添加步骤及其明细 + //批量插入 + alldata := make([]model.EscalateModelLevellst, 0) + alluser := make([]model.EscalateModelLevelDetail, 0) + for _, v := range entity.EscalateModelLevellst { + onedata := model.EscalateModelLevellst{} + onedata.Descr = v.Descr + onedata.PlantNr = user.PlantNr + onedata.EscalateModelId = entity.EscalateModelId + onedata.EscalateLevel = v.EscalateLevel + onedata.EscalateLeadTime = v.EscalateLeadTime + onedata.TimeUom = v.TimeUom + alldata = append(alldata, onedata) + for kk, vv := range v.EscalateModelLevelDetail { + one := model.EscalateModelLevelDetail{} + one.Pos = (kk + 1) + one.PlantNr = user.PlantNr + one.EscalateModelId = entity.EscalateModelId + one.EscalateLevel = vv.EscalateLevel + one.InformUserId = vv.InformUserId + one.InformType = vv.InformType + one.MsgHead = vv.MsgHead + one.MsgBody = vv.MsgBody + one.MsgSignature = vv.MsgSignature + alluser = append(alluser, one) + } + + } + err = levelDao.Insert(&alldata) + if err != nil { + session.Rollback() + return err + } + err = detailDao.Insert(&alluser) + if err != nil { + session.Rollback() + return err + } + err = session.Commit() if err != nil { return err } diff --git a/services/me/Project.service.go b/services/me/Project.service.go index 944bae7..0aad09c 100644 --- a/services/me/Project.service.go +++ b/services/me/Project.service.go @@ -18,7 +18,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ type ProjectService interface { @@ -37,7 +37,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ InsertOne(*global.User, *model.Project) error @@ -54,7 +54,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ DeleteOne(*global.User, string) error @@ -73,7 +73,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ SelectOne(*global.User, string) (*model.Project, error) @@ -92,7 +92,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ UpdateOne(*global.User, *model.Project) error @@ -111,7 +111,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Insert(*global.User, *[]model.Project) error @@ -130,7 +130,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Delete(*global.User, *[]model.Project) error @@ -151,7 +151,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Select(*global.User, map[string]string) ([]model.Project, error) @@ -172,7 +172,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ SelectAndPaging(*global.User, map[string]string) (grmi.PagingResult, error) @@ -191,7 +191,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ Update(*global.User, *[]model.Project) error @@ -208,7 +208,7 @@ type ProjectService interface { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func NewProjectService() ProjectService { diff --git a/services/me/implments/Project.service.impl.go b/services/me/implments/Project.service.impl.go index 9c21beb..9258fa0 100644 --- a/services/me/implments/Project.service.impl.go +++ b/services/me/implments/Project.service.impl.go @@ -17,67 +17,30 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ var DefaultConditionOfProject = grmi.NewCondition( map[string]grmi.ConditionItem{ - meta.Project_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectId, grmi.Equal, true), - meta.Project_Descr.UrlParameterName: grmi.NewConditionItem(meta.Project_Descr, grmi.Equal, false), - meta.Project_EnableToggle.UrlParameterName: grmi.NewConditionItem(meta.Project_EnableToggle, grmi.Equal, false), - meta.Project_PlantSiteCode.UrlParameterName: grmi.NewConditionItem(meta.Project_PlantSiteCode, grmi.Equal, false), - meta.Project_CustName1.UrlParameterName: grmi.NewConditionItem(meta.Project_CustName1, grmi.Equal, false), - meta.Project_CustName2.UrlParameterName: grmi.NewConditionItem(meta.Project_CustName2, grmi.Equal, false), - meta.Project_FileServerHost.UrlParameterName: grmi.NewConditionItem(meta.Project_FileServerHost, grmi.Equal, false), - meta.Project_FileFolder1.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder1, grmi.Equal, false), - meta.Project_FileFolder2.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder2, grmi.Equal, false), - meta.Project_FileFolder3.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder3, grmi.Equal, false), - meta.Project_FileFolder4.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder4, grmi.Equal, false), - meta.Project_FileFolder5.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder5, grmi.Equal, false), - meta.Project_FileFolder6.UrlParameterName: grmi.NewConditionItem(meta.Project_FileFolder6, grmi.Equal, false), - meta.Project_File1NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File1NameRegexp, grmi.Equal, false), - meta.Project_File2NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File2NameRegexp, grmi.Equal, false), - meta.Project_File3NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File3NameRegexp, grmi.Equal, false), - meta.Project_File4NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File4NameRegexp, grmi.Equal, false), - meta.Project_File5NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File5NameRegexp, grmi.Equal, false), - meta.Project_File6NameRegexp.UrlParameterName: grmi.NewConditionItem(meta.Project_File6NameRegexp, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle1.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle1, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle2.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle2, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle3.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle3, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle4.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle4, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle5.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle5, grmi.Equal, false), - meta.Project_OrderVerifyRuleToggle6.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRuleToggle6, grmi.Equal, false), - meta.Project_OrderVerifyRule1.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule1, grmi.Equal, false), - meta.Project_OrderVerifyRule2.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule2, grmi.Equal, false), - meta.Project_OrderVerifyRule3.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule3, grmi.Equal, false), - meta.Project_OrderVerifyRule4.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule4, grmi.Equal, false), - meta.Project_OrderVerifyRule5.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule5, grmi.Equal, false), - meta.Project_OrderVerifyRule6.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderVerifyRule6, grmi.Equal, false), - meta.Project_EmailServerHost.UrlParameterName: grmi.NewConditionItem(meta.Project_EmailServerHost, grmi.Equal, false), - meta.Project_EmailServerPort.UrlParameterName: grmi.NewConditionItem(meta.Project_EmailServerPort, grmi.Equal, false), - meta.Project_FromEmail.UrlParameterName: grmi.NewConditionItem(meta.Project_FromEmail, grmi.Equal, false), - meta.Project_FromPwd.UrlParameterName: grmi.NewConditionItem(meta.Project_FromPwd, grmi.Equal, false), - meta.Project_ErrorRecievers.UrlParameterName: grmi.NewConditionItem(meta.Project_ErrorRecievers, grmi.Equal, false), - meta.Project_ErrorCcRecievers.UrlParameterName: grmi.NewConditionItem(meta.Project_ErrorCcRecievers, grmi.Equal, false), - meta.Project_LogUrl.UrlParameterName: grmi.NewConditionItem(meta.Project_LogUrl, grmi.Equal, false), - meta.Project_LogTable.UrlParameterName: grmi.NewConditionItem(meta.Project_LogTable, grmi.Equal, false), - meta.Project_CustOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_CustOrderSnr, grmi.Equal, false), - meta.Project_WorkOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_WorkOrderSnr, grmi.Equal, false), - meta.Project_SerialOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_SerialOrderSnr, grmi.Equal, false), - meta.Project_ManualOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_ManualOrderSnr, grmi.Equal, false), - meta.Project_OrderMsgSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_OrderMsgSnr, grmi.Equal, false), - meta.Project_ReworkOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_ReworkOrderSnr, grmi.Equal, false), - meta.Project_PackOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_PackOrderSnr, grmi.Equal, false), - meta.Project_PackOrderSyncSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_PackOrderSyncSnr, grmi.Equal, false), - meta.Project_ShipOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_ShipOrderSnr, grmi.Equal, false), - meta.Project_ShipFileSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_ShipFileSnr, grmi.Equal, false), - meta.Project_AsnFileSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_AsnFileSnr, grmi.Equal, false), - meta.Project_LogDemandSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_LogDemandSnr, grmi.Equal, false), - meta.Project_LogDemandCacheSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_LogDemandCacheSnr, grmi.Equal, false), - meta.Project_WorkOrderCacheSnr.UrlParameterName: grmi.NewConditionItem(meta.Project_WorkOrderCacheSnr, grmi.Equal, false), - meta.Project_LastModify.UrlParameterName: grmi.NewConditionItem(meta.Project_LastModify, grmi.Approximate, false), - meta.Project_LastUser.UrlParameterName: grmi.NewConditionItem(meta.Project_LastUser, grmi.Equal, false), - meta.Project_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.Project_CreateTime, grmi.Approximate, false), + meta.Project_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectId, grmi.Equal, true), + meta.Project_Descr.UrlParameterName: grmi.NewConditionItem(meta.Project_Descr, grmi.Equal, false), + meta.Project_CustomerId.UrlParameterName: grmi.NewConditionItem(meta.Project_CustomerId, grmi.Equal, false), + meta.Project_SOP.UrlParameterName: grmi.NewConditionItem(meta.Project_SOP, grmi.Approximate, false), + meta.Project_EOP.UrlParameterName: grmi.NewConditionItem(meta.Project_EOP, grmi.Approximate, false), + meta.Project_ProjectDate1.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectDate1, grmi.Approximate, false), + meta.Project_ProjectDate2.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectDate2, grmi.Approximate, false), + meta.Project_ProjectDate3.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectDate3, grmi.Approximate, false), + meta.Project_ProjectDate4.UrlParameterName: grmi.NewConditionItem(meta.Project_ProjectDate4, grmi.Approximate, false), + meta.Project_AlertDaysBeforeEOP.UrlParameterName: grmi.NewConditionItem(meta.Project_AlertDaysBeforeEOP, grmi.Equal, false), + meta.Project_CtrlPara1.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlPara1, grmi.Equal, false), + meta.Project_CtrlPara2.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlPara2, grmi.Equal, false), + meta.Project_CtrlStr1.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlStr1, grmi.Equal, false), + meta.Project_CtrlStr2.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlStr2, grmi.Equal, false), + meta.Project_CtrlTime1.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlTime1, grmi.Approximate, false), + meta.Project_CtrlTime2.UrlParameterName: grmi.NewConditionItem(meta.Project_CtrlTime2, grmi.Approximate, false), + meta.Project_LastModify.UrlParameterName: grmi.NewConditionItem(meta.Project_LastModify, grmi.Approximate, false), + meta.Project_LastUser.UrlParameterName: grmi.NewConditionItem(meta.Project_LastUser, grmi.Equal, false), + meta.Project_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.Project_CreateTime, grmi.Approximate, false), }, nil, ) @@ -88,7 +51,7 @@ var DefaultConditionOfProject = grmi.NewCondition( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ var DefaultConditionOfProjectAndPaging = grmi.NewCondition( @@ -105,7 +68,7 @@ var DefaultConditionOfProjectAndPaging = grmi.NewCondition( * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ type ProjectServiceImplement struct { @@ -122,7 +85,7 @@ type ProjectServiceImplement struct { * * @Author : 代码生成器创建 * - * @Date : 2021-08-20 11:11:05 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func NewProjectServiceImplement() *ProjectServiceImplement { diff --git a/web/controllers/base/base.go b/web/controllers/base/base.go index 4b5643f..12d4b74 100644 --- a/web/controllers/base/base.go +++ b/web/controllers/base/base.go @@ -651,11 +651,11 @@ func RegisterRoutes() { // EscalateModelHead的服务实例 var serviceOfEscalateModelHead = svr.NewEscalateModelHeadService() // EscalateModelHead插入一条 - // RegisterInsertOneEscalateModelHead(escalatemodelhead, "/insertone", serviceOfEscalateModelHead.InsertOne) + RegisterInsertOneEscalateModelHead(escalatemodelhead, "/insertone", serviceOfEscalateModelHead.InsertOne) // EscalateModelHead插入多条 // RegisterInsertEscalateModelHead(escalatemodelhead, "/insert", serviceOfEscalateModelHead.Insert) // EscalateModelHead删除一条 - // RegisterDeleteOneEscalateModelHead(escalatemodelhead, "/deleteone", serviceOfEscalateModelHead.DeleteOne) + RegisterDeleteOneEscalateModelHead(escalatemodelhead, "/deleteone", serviceOfEscalateModelHead.DeleteOne) // EscalateModelHead删除多条 // RegisterDeleteEscalateModelHead(escalatemodelhead, "/delete", serviceOfEscalateModelHead.Delete) // EscalateModelHead查询多条 @@ -665,7 +665,7 @@ func RegisterRoutes() { // EscalateModelHead查询一条 RegisterSelectOneEscalateModelHead(escalatemodelhead, "/selectone", serviceOfEscalateModelHead.SelectOne) // EscalateModelHead修改一条 - // RegisterUpdateOneEscalateModelHead(escalatemodelhead, "/updateone", serviceOfEscalateModelHead.UpdateOne) + RegisterUpdateOneEscalateModelHead(escalatemodelhead, "/updateone", serviceOfEscalateModelHead.UpdateOne) // EscalateModelHead修改多条 // RegisterUpdateEscalateModelHead(escalatemodelhead, "/update", serviceOfEscalateModelHead.Update) diff --git a/web/controllers/me/Project.rest.go b/web/controllers/me/Project.rest.go index e434929..0edd51a 100644 --- a/web/controllers/me/Project.rest.go +++ b/web/controllers/me/Project.rest.go @@ -29,7 +29,7 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterOneProject(party router.Party, httpMethod string, path string, method func(*global.User, *model.Project) error) { @@ -80,7 +80,7 @@ func RegisterOneProject(party router.Party, httpMethod string, path string, meth * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterIDOfProject(party router.Party, httpMethod string, path string, method func(*global.User, string) error) { @@ -119,7 +119,7 @@ func RegisterIDOfProject(party router.Party, httpMethod string, path string, met * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterInsertOneProject(party router.Party, path string, method func(*global.User, *model.Project) error) { @@ -142,7 +142,7 @@ func RegisterInsertOneProject(party router.Party, path string, method func(*glob * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterDeleteOneProject(party router.Party, path string, method func(*global.User, string) error) { @@ -165,7 +165,7 @@ func RegisterDeleteOneProject(party router.Party, path string, method func(*glob * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterSelectOneProject(party router.Party, path string, method func(*global.User, string) (*model.Project, error)) { @@ -206,7 +206,7 @@ func RegisterSelectOneProject(party router.Party, path string, method func(*glob * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterUpdateOneProject(party router.Party, path string, method func(*global.User, *model.Project) error) { @@ -231,7 +231,7 @@ func RegisterUpdateOneProject(party router.Party, path string, method func(*glob * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterMultiProject(party router.Party, httpMethod string, path string, method func(*global.User, *[]model.Project) error) { @@ -274,7 +274,7 @@ func RegisterMultiProject(party router.Party, httpMethod string, path string, me * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterInsertProject(party router.Party, path string, method func(*global.User, *[]model.Project) error) { @@ -297,7 +297,7 @@ func RegisterInsertProject(party router.Party, path string, method func(*global. * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterDeleteProject(party router.Party, path string, method func(*global.User, *[]model.Project) error) { @@ -320,7 +320,7 @@ func RegisterDeleteProject(party router.Party, path string, method func(*global. * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterSelectProject(party router.Party, path string, method func(*global.User, map[string]string) ([]model.Project, error)) { @@ -356,7 +356,7 @@ func RegisterSelectProject(party router.Party, path string, method func(*global. * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterQueryProject(party router.Party, path string, method func(*global.User, map[string]string) (grmi.PagingResult, error)) { @@ -392,7 +392,7 @@ func RegisterQueryProject(party router.Party, path string, method func(*global.U * * @Author : 代码生成器创建 * - * @Date : 2021-09-26 17:06:56 + * @Date : 2021-10-08 09:45:06 * ******************************************************************************/ func RegisterUpdateProject(party router.Party, path string, method func(*global.User, *[]model.Project) error) { diff --git a/web/controllers/me/me.go b/web/controllers/me/me.go index cff7f54..d090247 100644 --- a/web/controllers/me/me.go +++ b/web/controllers/me/me.go @@ -29,11 +29,11 @@ func RegisterRoutes() { // Project的服务实例 var serviceOfProject = svr.NewProjectService() // Project插入一条 - // RegisterInsertOneProject(project, "/insertone", serviceOfProject.InsertOne) + RegisterInsertOneProject(project, "/insertone", serviceOfProject.InsertOne) // Project插入多条 // RegisterInsertProject(project, "/insert", serviceOfProject.Insert) // Project删除一条 - // RegisterDeleteOneProject(project, "/deleteone", serviceOfProject.DeleteOne) + RegisterDeleteOneProject(project, "/deleteone", serviceOfProject.DeleteOne) // Project删除多条 // RegisterDeleteProject(project, "/delete", serviceOfProject.Delete) // Project查询多条 @@ -43,7 +43,7 @@ func RegisterRoutes() { // Project查询一条 RegisterSelectOneProject(project, "/selectone", serviceOfProject.SelectOne) // Project修改一条 - // RegisterUpdateOneProject(project, "/updateone", serviceOfProject.UpdateOne) + RegisterUpdateOneProject(project, "/updateone", serviceOfProject.UpdateOne) // Project修改多条 // RegisterUpdateProject(project, "/update", serviceOfProject.Update)