正在显示
1 个修改的文件
包含
10 行增加
和
5 行删除
@@ -13,7 +13,13 @@ type WorkshopWorkTimeRecordDto struct { | @@ -13,7 +13,13 @@ type WorkshopWorkTimeRecordDto struct { | ||
13 | // 签到日期 | 13 | // 签到日期 |
14 | //SignDate string `json:"signDate"` | 14 | //SignDate string `json:"signDate"` |
15 | // 记录信息 | 15 | // 记录信息 |
16 | - *domain.WorkshopWorkTimeRecordInfo | 16 | + //*domain.WorkshopWorkTimeRecordInfo |
17 | + // 固定工时 | ||
18 | + EFTWorkTime float64 `json:"eftWorkTime"` | ||
19 | + // 临时工时 | ||
20 | + EDWorkTime float64 `json:"edWorkTime"` | ||
21 | + // 派遣工时 | ||
22 | + EPTWorkTime float64 `json:"eptWorkTime"` | ||
17 | // 记录日期 | 23 | // 记录日期 |
18 | RecordDate string `json:"recordDate"` | 24 | RecordDate string `json:"recordDate"` |
19 | // 组织名称 | 25 | // 组织名称 |
@@ -26,10 +32,9 @@ func (d *WorkshopWorkTimeRecordDto) LoadDto(m *domain.WorkshopWorkTimeRecord, or | @@ -26,10 +32,9 @@ func (d *WorkshopWorkTimeRecordDto) LoadDto(m *domain.WorkshopWorkTimeRecord, or | ||
26 | d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId | 32 | d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId |
27 | d.WorkStation = m.WorkStation | 33 | d.WorkStation = m.WorkStation |
28 | if m.WorkshopWorkTimeRecordInfo != nil { | 34 | if m.WorkshopWorkTimeRecordInfo != nil { |
29 | - d.WorkshopWorkTimeRecordInfo = &domain.WorkshopWorkTimeRecordInfo{} | ||
30 | - d.WorkshopWorkTimeRecordInfo.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1) | ||
31 | - d.WorkshopWorkTimeRecordInfo.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1) | ||
32 | - d.WorkshopWorkTimeRecordInfo.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1) | 35 | + d.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1) |
36 | + d.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1) | ||
37 | + d.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1) | ||
33 | } | 38 | } |
34 | d.WorkStation = m.WorkStation | 39 | d.WorkStation = m.WorkStation |
35 | d.RecordDate = m.RecordDate.Local().Format("2006-01-02") | 40 | d.RecordDate = m.RecordDate.Local().Format("2006-01-02") |
-
请 注册 或 登录 后发表评论