Merge remote-tracking branch 'origin/test'

@@ -13,7 +13,13 @@ type WorkshopWorkTimeRecordDto struct {
 	// 签到日期
 	// 签到日期
 	//SignDate string `json:"signDate"`
 	//SignDate string `json:"signDate"`
 	// 记录信息
 	// 记录信息
-	*domain.WorkshopWorkTimeRecordInfo
+	//*domain.WorkshopWorkTimeRecordInfo
+	// 固定工时
+	EFTWorkTime float64 `json:"eftWorkTime"`
+	// 临时工时
+	EDWorkTime float64 `json:"edWorkTime"`
+	// 派遣工时
+	EPTWorkTime float64 `json:"eptWorkTime"`
 	// 记录日期
 	// 记录日期
 	RecordDate string `json:"recordDate"`
 	RecordDate string `json:"recordDate"`
 	// 组织名称
 	// 组织名称
@@ -26,10 +32,9 @@ func (d *WorkshopWorkTimeRecordDto) LoadDto(m *domain.WorkshopWorkTimeRecord, or
 	d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId
 	d.WorkshopWorkTimeRecordId = m.WorkshopWorkTimeRecordId
 	d.WorkStation = m.WorkStation
 	d.WorkStation = m.WorkStation
 	if m.WorkshopWorkTimeRecordInfo != nil {
 	if m.WorkshopWorkTimeRecordInfo != nil {
-		d.WorkshopWorkTimeRecordInfo = &domain.WorkshopWorkTimeRecordInfo{}
-		d.WorkshopWorkTimeRecordInfo.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1)
-		d.WorkshopWorkTimeRecordInfo.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1)
-		d.WorkshopWorkTimeRecordInfo.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1)
+		d.EPTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EPTWorkTime, 1)
+		d.EDWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EDWorkTime, 1)
+		d.EFTWorkTime = utils.Round(m.WorkshopWorkTimeRecordInfo.EFTWorkTime, 1)
 	}
 	}
 	d.WorkStation = m.WorkStation
 	d.WorkStation = m.WorkStation
 	d.RecordDate = m.RecordDate.Local().Format("2006-01-02")
 	d.RecordDate = m.RecordDate.Local().Format("2006-01-02")