Merge pull request 'dashboard' (#232) from fix_dashboard_lou into fix

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/232

services/pln/implments/CustOrder.Dashborad.impl.go

@@ -62,22 +62,22 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 	var jPHPercent float64      //IPPM
 	for _, v := range dashlist {
 		if v.ParamName == "TimeBeat" {
-			timeBeat = v.FloatParam1
+			timeBeat = utils.ValueToFloat(v.CharParam1, 0.0)
 		}
 		if v.ParamName == "PersonNum" {
-			personNum = v.IntParam1
+			personNum = utils.ValueToInt(v.CharParam1, 0)
 		}
 		if v.ParamName == "AttendancePersonNum" {
-			attendancePersonNum = v.IntParam1
+			attendancePersonNum = utils.ValueToInt(v.CharParam1, 0)
 		}
 		if v.ParamName == "Days" {
-			days = v.IntParam1
+			days = utils.ValueToInt(v.CharParam1, 0)
 		}
 		if v.ParamName == "IppmTarge" {
-			ippmTarge = v.IntParam1
+			ippmTarge = utils.ValueToInt(v.CharParam1, 0)
 		}
 		if v.ParamName == "JPHPercent" {
-			jPHPercent = v.FloatParam1
+			jPHPercent = utils.ValueToFloat(v.CharParam1, 0.0)
 		}
 
 	}
@@ -299,11 +299,14 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 	if dayModelEndTime < dayModelStartTime {
 		return nil, errors.New("日模型开始时间大于结束时间")
 	}
+
 	dayModelStartHour := startDayTime.Add(time.Duration(dayModelStartTime) * time.Second)
-	dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second)
+	//dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second)
 	endDayTime := utils.GetZeroTime(time.Now().AddDate(0, 0, 1))
 
-	DayModelHours, err := utils.GetHoursData(dayModelStartHour, dayModelEndHour)
+	nowEndHour := time.Now()
+	DayModelHours, err := utils.GetHoursData(dayModelStartHour, nowEndHour)
+
 	_ = endDayTime
 	_ = DayModelHours
 	if err != nil {
@@ -325,7 +328,7 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 	}(&wg)
 	//图例003
 	go func(wg *sync.WaitGroup) {
-		DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId)
+		DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId)
 		wg.Done() // 操作完成，减少一个计数
 	}(&wg)
 	//图例004
@@ -1231,7 +1234,7 @@ func (impl *CustOrderServiceImplement) GetUsefulTime(start, end time.Time, timeL
 }
 
 //图例3
-func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) {
+func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel,jPHPercent float64, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
@@ -1439,6 +1442,7 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou
 		}
 		DashboardData3.DashboardData2 = append(DashboardData3.DashboardData2, two)
 	}
+	DashboardData3.CompleteNumber = utils.ValueToInt(utils.ValueToFloat(DashboardData3.CompleteNumber, 0.0)*jPHPercent, 0)
 	return DashboardData3, nil
 }