Browse Source

修正了以时间作为主键进行查询时的错误

pull/10/head
allanwei 4 years ago
parent
commit
68f182b9ed
7 changed files with 13 additions and 9 deletions
  1. +2
    -2
      dao/base/implments/WorkLineSpecialTime.dao.impl.go
  2. +2
    -2
      dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go
  3. +2
    -2
      dao/log/implments/ArtDemandLst.dao.impl.go
  4. +4
    -0
      grmi/DateTime.go
  5. +1
    -1
      models/base/WorkLineSpecialTime.model.go
  6. +1
    -1
      models/base/WorkLineWorkShiftSpecialTime.model.go
  7. +1
    -1
      models/log/ArtDemandLst.model.go

+ 2
- 2
dao/base/implments/WorkLineSpecialTime.dao.impl.go View File

@ -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)
}


+ 2
- 2
dao/base/implments/WorkLineWorkShiftSpecialTime.dao.impl.go View File

@ -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)
}


+ 2
- 2
dao/log/implments/ArtDemandLst.dao.impl.go View File

@ -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)
}


+ 4
- 0
grmi/DateTime.go View File

@ -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)
}

+ 1
- 1
models/base/WorkLineSpecialTime.model.go View File

@ -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()}
}

+ 1
- 1
models/base/WorkLineWorkShiftSpecialTime.model.go View File

@ -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()}
}

+ 1
- 1
models/log/ArtDemandLst.model.go View File

@ -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()}
}

Loading…
Cancel
Save