diff --git a/dao/base/implments/WorkLineSpecialTime.dao.impl.go b/dao/base/implments/WorkLineSpecialTime.dao.impl.go index 1bee4d1..3d52b5f 100644 --- a/dao/base/implments/WorkLineSpecialTime.dao.impl.go +++ b/dao/base/implments/WorkLineSpecialTime.dao.impl.go @@ -31,7 +31,7 @@ func (impl *WorkLineSpecialTimeDAOImplement) InsertOne(entity *model.WorkLineSpe //删除指定键的WorkLineSpecialTime func (impl *WorkLineSpecialTimeDAOImplement) DeleteOne(workLineid string, begTime grmi.DateTime) error { - _, err := impl.session.Table(meta.WorkLineSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineid, begTime}).Delete(meta.WorkLineSpecialTime.Indicator) + _, err := impl.session.Table(meta.WorkLineSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineid, begTime.Restore()}).Delete(meta.WorkLineSpecialTime.Indicator) if err != nil { return grmi.NewDataBaseError(err) } @@ -42,7 +42,7 @@ func (impl *WorkLineSpecialTimeDAOImplement) DeleteOne(workLineid string, begTim //查找指定键的WorkLineSpecialTime func (impl *WorkLineSpecialTimeDAOImplement) SelectOne(workLineid string, begTime grmi.DateTime) (*model.WorkLineSpecialTime, error) { var data model.WorkLineSpecialTime - ok, err := impl.session.Table(meta.WorkLineSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineid, begTime}).Get(&data) + ok, err := impl.session.Table(meta.WorkLineSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineid, begTime.Restore()}).Get(&data) if err != nil { return nil, grmi.NewDataBaseError(err) } diff --git a/dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go b/dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go index 735145f..4fc70df 100644 --- a/dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go +++ b/dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go @@ -31,7 +31,7 @@ func (impl *WorkLineWorkShiftSpecialTimeDAOImplement) InsertOne(entity *model.Wo //删除指定键的WorkLineWorkShiftSpecialTime func (impl *WorkLineWorkShiftSpecialTimeDAOImplement) DeleteOne(workLineId string, workDay string, pos int, begTime grmi.DateTime) error { - _, err := impl.session.Table(meta.WorkLineWorkShiftSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineId, workDay, pos, begTime}).Delete(meta.WorkLineWorkShiftSpecialTime.Indicator) + _, err := impl.session.Table(meta.WorkLineWorkShiftSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineId, workDay, pos, begTime.Restore()}).Delete(meta.WorkLineWorkShiftSpecialTime.Indicator) if err != nil { return grmi.NewDataBaseError(err) } @@ -42,7 +42,7 @@ func (impl *WorkLineWorkShiftSpecialTimeDAOImplement) DeleteOne(workLineId strin //查找指定键的WorkLineWorkShiftSpecialTime func (impl *WorkLineWorkShiftSpecialTimeDAOImplement) SelectOne(workLineId string, workDay string, pos int, begTime grmi.DateTime) (*model.WorkLineWorkShiftSpecialTime, error) { var data model.WorkLineWorkShiftSpecialTime - ok, err := impl.session.Table(meta.WorkLineWorkShiftSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineId, workDay, pos, begTime}).Get(&data) + ok, err := impl.session.Table(meta.WorkLineWorkShiftSpecialTime.TableName).ID(core.PK{impl.plantNr, workLineId, workDay, pos, begTime.Restore()}).Get(&data) if err != nil { return nil, grmi.NewDataBaseError(err) } diff --git a/dao/log/implments/ArtDemandLst.dao.impl.go b/dao/log/implments/ArtDemandLst.dao.impl.go index 6066ea0..7733112 100644 --- a/dao/log/implments/ArtDemandLst.dao.impl.go +++ b/dao/log/implments/ArtDemandLst.dao.impl.go @@ -31,7 +31,7 @@ func (impl *ArtDemandLstDAOImplement) InsertOne(entity *model.ArtDemandLst) erro //删除指定键的ArtDemandLst func (impl *ArtDemandLstDAOImplement) DeleteOne(artId string, demandTime grmi.DateTime) error { - _, err := impl.session.Table(meta.ArtDemandLst.TableName).ID(core.PK{impl.plantNr, artId, demandTime}).Delete(meta.ArtDemandLst.Indicator) + _, err := impl.session.Table(meta.ArtDemandLst.TableName).ID(core.PK{impl.plantNr, artId, demandTime.Restore()}).Delete(meta.ArtDemandLst.Indicator) if err != nil { return grmi.NewDataBaseError(err) } @@ -42,7 +42,7 @@ func (impl *ArtDemandLstDAOImplement) DeleteOne(artId string, demandTime grmi.Da //查找指定键的ArtDemandLst func (impl *ArtDemandLstDAOImplement) SelectOne(artId string, demandTime grmi.DateTime) (*model.ArtDemandLst, error) { var data model.ArtDemandLst - ok, err := impl.session.Table(meta.ArtDemandLst.TableName).ID(core.PK{impl.plantNr, artId, demandTime}).Get(&data) + ok, err := impl.session.Table(meta.ArtDemandLst.TableName).ID(core.PK{impl.plantNr, artId, demandTime.Restore()}).Get(&data) if err != nil { return nil, grmi.NewDataBaseError(err) } diff --git a/grmi/DateTime.go b/grmi/DateTime.go index 258940f..f3279c0 100644 --- a/grmi/DateTime.go +++ b/grmi/DateTime.go @@ -25,3 +25,7 @@ func (self *DateTime) UnmarshalJSON(data []byte) error { *self = DateTime(result) return nil } + +func (self *DateTime) Restore() time.Time { + return time.Time(*self) +} diff --git a/models/base/WorkLineSpecialTime.model.go b/models/base/WorkLineSpecialTime.model.go index 712782a..f7f166d 100644 --- a/models/base/WorkLineSpecialTime.model.go +++ b/models/base/WorkLineSpecialTime.model.go @@ -20,5 +20,5 @@ type WorkLineSpecialTime struct { //获取WorkLineSpecialTime的主键 func (self *WorkLineSpecialTime) GetKey() core.PK { - return core.PK{self.PlantNr, self.WorkLineid, self.BegTime} + return core.PK{self.PlantNr, self.WorkLineid, self.BegTime.Restore()} } diff --git a/models/base/WorkLineWorkShiftSpecialTime.model.go b/models/base/WorkLineWorkShiftSpecialTime.model.go index 4eae173..25a619b 100644 --- a/models/base/WorkLineWorkShiftSpecialTime.model.go +++ b/models/base/WorkLineWorkShiftSpecialTime.model.go @@ -22,5 +22,5 @@ type WorkLineWorkShiftSpecialTime struct { //获取WorkLineWorkShiftSpecialTime的主键 func (self *WorkLineWorkShiftSpecialTime) GetKey() core.PK { - return core.PK{self.PlantNr, self.WorkLineId, self.WorkDay, self.Pos, self.BegTime} + return core.PK{self.PlantNr, self.WorkLineId, self.WorkDay, self.Pos, self.BegTime.Restore()} } diff --git a/models/log/ArtDemandLst.model.go b/models/log/ArtDemandLst.model.go index 5b8b865..95f4e66 100644 --- a/models/log/ArtDemandLst.model.go +++ b/models/log/ArtDemandLst.model.go @@ -39,5 +39,5 @@ type ArtDemandLst struct { //获取ArtDemandLst的主键 func (self *ArtDemandLst) GetKey() core.PK { - return core.PK{self.PlantNr, self.ArtId, self.DemandTime} + return core.PK{self.PlantNr, self.ArtId, self.DemandTime.Restore()} }