作者 tangxvhui

修复 时间格式化时区错误

@@ -2,11 +2,12 @@ package service @@ -2,11 +2,12 @@ package service
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 - service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"  
6 "sort" 5 "sort"
7 "strconv" 6 "strconv"
8 "time" 7 "time"
9 8
  9 + service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
  10 +
10 "github.com/linmadan/egglib-go/core/application" 11 "github.com/linmadan/egglib-go/core/application"
11 "github.com/linmadan/egglib-go/utils/tool_funs" 12 "github.com/linmadan/egglib-go/utils/tool_funs"
12 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory" 13 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
@@ -373,7 +374,7 @@ func (srv StaffAssessServeice) createStaffAssessSelf( @@ -373,7 +374,7 @@ func (srv StaffAssessServeice) createStaffAssessSelf(
373 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{ 374 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{
374 "transactionContext": transactionContext, 375 "transactionContext": transactionContext,
375 }) 376 })
376 - beginDay := assessTemp.BeginTime.Format("2006-01-02") 377 + beginDay := assessTemp.BeginTime.Local().Format("2006-01-02")
377 _, assessListOld, err := assessRepo.Find(map[string]interface{}{"cycleId": assessTemp.CycleId, "beginDay": beginDay, "types": domain.AssessSelf}) 378 _, assessListOld, err := assessRepo.Find(map[string]interface{}{"cycleId": assessTemp.CycleId, "beginDay": beginDay, "types": domain.AssessSelf})
378 if err != nil { 379 if err != nil {
379 return nil, err 380 return nil, err
@@ -419,7 +420,7 @@ func (srv StaffAssessServeice) createStaffAssessSupper( @@ -419,7 +420,7 @@ func (srv StaffAssessServeice) createStaffAssessSupper(
419 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{ 420 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{
420 "transactionContext": transactionContext, 421 "transactionContext": transactionContext,
421 }) 422 })
422 - beginDay := assessTemp.BeginTime.Format("2006-01-02") 423 + beginDay := assessTemp.BeginTime.Local().Format("2006-01-02")
423 _, assessListOld, err := assessRepo.Find(map[string]interface{}{"cycleId": assessTemp.CycleId, "beginDay": beginDay, "types": domain.AssessSuper}) 424 _, assessListOld, err := assessRepo.Find(map[string]interface{}{"cycleId": assessTemp.CycleId, "beginDay": beginDay, "types": domain.AssessSuper})
424 if err != nil { 425 if err != nil {
425 return nil, err 426 return nil, err
@@ -1390,7 +1390,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command. @@ -1390,7 +1390,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command.
1390 TargetUserName: v.TargetUser.UserName, 1390 TargetUserName: v.TargetUser.UserName,
1391 TargetUserId: v.TargetUser.UserId, 1391 TargetUserId: v.TargetUser.UserId,
1392 EvaluationStatus: string(v.Status), 1392 EvaluationStatus: string(v.Status),
1393 - EndTime: v.EndTime.Format("2006-01-02 15:04:05"), 1393 + EndTime: v.EndTime.Local().Format("2006-01-02 15:04:05"),
1394 TotalScoreSelf: "", 1394 TotalScoreSelf: "",
1395 Department: "", 1395 Department: "",
1396 Position: "", 1396 Position: "",
@@ -1420,7 +1420,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command. @@ -1420,7 +1420,7 @@ func (srv *SummaryEvaluationService) ListExecutorEvaluationSuper(param *command.
1420 result["endTime"] = "" 1420 result["endTime"] = ""
1421 result["uncompleted_number"] = 0 1421 result["uncompleted_number"] = 0
1422 if len(evaluationList) > 0 { 1422 if len(evaluationList) > 0 {
1423 - result["endTime"] = evaluationList[0].EndTime.Format("2006-01-02 15:04:05") 1423 + result["endTime"] = evaluationList[0].EndTime.Local().Format("2006-01-02 15:04:05")
1424 result["uncompleted_number"] = cntUn 1424 result["uncompleted_number"] = cntUn
1425 } 1425 }
1426 return result, nil 1426 return result, nil