allied-creation / allied-creation-manufacture · 提交

转到一个项目

作者 yangfu
提交 9dfe2bc309e6fe4326bf82d76087004bea773169 2 个父辈 d5559aa4 35a77bab

Merge remote-tracking branch 'origin/test'

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 1 行删除
@@ -13,7 +13,7 @@ type WorkshopWorkTimeRecordDto struct { @@ -13,7 +13,7 @@ type WorkshopWorkTimeRecordDto struct {
13 // 签到日期 13 // 签到日期
14 //SignDate string `json:"signDate"` 14 //SignDate string `json:"signDate"`
15 // 记录信息 15 // 记录信息
16 - //*domain.WorkshopWorkTimeRecordInfo 16 + *domain.WorkshopWorkTimeRecordInfo
17 // 固定工时 17 // 固定工时
18 EFTWorkTime float64 `json:"eftWorkTime"` 18 EFTWorkTime float64 `json:"eftWorkTime"`
19 // 临时工时 19 // 临时工时
@@ -32,6 +32,10 @@ func (d *WorkshopWorkTimeRecordDto) LoadDto(m *domain.WorkshopWorkTimeRecord, or @@ -32,6 +32,10 @@ func (d *WorkshopWorkTimeRecordDto) LoadDto(m *domain.WorkshopWorkTimeRecord, or
32 d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId 32 d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId
33 d.WorkStation = m.WorkStation 33 d.WorkStation = m.WorkStation
34 if m.WorkshopWorkTimeRecordInfo != nil { 34 if m.WorkshopWorkTimeRecordInfo != nil {
  35 + d.WorkshopWorkTimeRecordInfo = &domain.WorkshopWorkTimeRecordInfo{}
  36 + d.WorkshopWorkTimeRecordInfo.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1)
  37 + d.WorkshopWorkTimeRecordInfo.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1)
  38 + d.WorkshopWorkTimeRecordInfo.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1)
35 d.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1) 39 d.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1)
36 d.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1) 40 d.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1)
37 d.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1) 41 d.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1)