时间格式化

@@ -2,7 +2,6 @@ package command
 
 
 import (
 import (
 	"github.com/beego/beego/v2/core/validation"
 	"github.com/beego/beego/v2/core/validation"
-	"time"
 )
 )
 
 
 type UpdateProjectCommand struct {
 type UpdateProjectCommand struct {
@@ -17,16 +16,16 @@ type UpdateProjectCommand struct {
 }
 }
 
 
 type UpdateProjectTemplateCommand struct {
 type UpdateProjectTemplateCommand struct {
-	CompanyId      int64      `cname:"公司ID" json:"companyId"`
-	CycleId        int64      `cname:"周期ID" json:"cycleId,string" valid:"Required"`
-	Id             int64      `cname:"项目ID" json:"id,string" valid:"Required"`
-	TemplateId     int64      `cname:"模板ID" json:"templateId,string"`
-	Recipients     []string   `cname:"被评估人ID"  json:"recipients"`
-	TimeStart      *time.Time `cname:"自评起始时间" json:"timeStart" valid:"Required"`
-	TimeEnd        *time.Time `cname:"自评截止时间" json:"timeEnd" valid:"Required"`
-	KpiCycle       int        `cname:"评估周期" json:"kpiCycle" valid:"Required"`
-	KpiResultStart *time.Time `cname:"绩效结果开始查看时间" json:"kpiResultStart"`
-	Activate       int        `cname:"启动项目" json:"activate"`
+	CompanyId      int64    `cname:"公司ID" json:"companyId"`
+	CycleId        int64    `cname:"周期ID" json:"cycleId,string" valid:"Required"`
+	Id             int64    `cname:"项目ID" json:"id,string" valid:"Required"`
+	TemplateId     int64    `cname:"模板ID" json:"templateId,string"`
+	Recipients     []string `cname:"被评估人ID"  json:"recipients"`
+	TimeStart      string   `cname:"自评起始时间" json:"timeStart" valid:"Required"`
+	TimeEnd        string   `cname:"自评截止时间" json:"timeEnd" valid:"Required"`
+	KpiCycle       int      `cname:"评估周期" json:"kpiCycle" valid:"Required"`
+	KpiResultStart string   `cname:"绩效结果开始查看时间" json:"kpiResultStart"`
+	Activate       int      `cname:"启动项目" json:"activate"`
 }
 }
 
 
 type CheckRecipientCommand struct {
 type CheckRecipientCommand struct {
@@ -48,4 +47,13 @@ func (in *UpdateProjectTemplateCommand) Valid(validation *validation.Validation)
 		validation.SetError("recipients", "请添加被评估人")
 		validation.SetError("recipients", "请添加被评估人")
 		return
 		return
 	}
 	}
+	if len(in.TimeStart) == 0 {
+		validation.SetError("timeEnd", "请选择开始时间")
+		return
+	}
+	if len(in.TimeEnd) == 0 {
+		validation.SetError("timeEnd", "请选择结束时间")
+		return
+	}
+
 }
 }

@@ -9,6 +9,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 	"strconv"
 	"strconv"
+	"time"
 )
 )
 
 
 type EvaluationProjectService struct {
 type EvaluationProjectService struct {
@@ -177,18 +178,31 @@ func (rs *EvaluationProjectService) UpdateTemplate(in *command.UpdateProjectTemp
 		project.State = domain.ProjectStateEnable
 		project.State = domain.ProjectStateEnable
 	}
 	}
 
 
+	start, err := time.ParseInLocation("2006-01-02 15:04:05", in.TimeStart, time.Local)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	end, err := time.ParseInLocation("2006-01-02 15:04:05", in.TimeEnd, time.Local)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	kpiStart, err := time.ParseInLocation("2006-01-02 15:04:05", in.KpiResultStart, time.Local)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+
 	project.Recipients = in.Recipients
 	project.Recipients = in.Recipients
 	project.Template = cycleTemplate.Template
 	project.Template = cycleTemplate.Template
 	for i := range project.Template.LinkNodes {
 	for i := range project.Template.LinkNodes {
 		node := project.Template.LinkNodes[i]
 		node := project.Template.LinkNodes[i]
 		node.KpiCycle = in.KpiCycle // 设置周期
 		node.KpiCycle = in.KpiCycle // 设置周期
 		if node.Type == domain.LinkNodeViewResult {
 		if node.Type == domain.LinkNodeViewResult {
-			if in.KpiResultStart != nil {
-				node.TimeStart = in.KpiResultStart
+			if len(in.KpiResultStart) > 0 {
+				node.TimeStart = &kpiStart
 			}
 			}
 		} else {
 		} else {
-			node.TimeStart = in.TimeStart
-			node.TimeEnd = in.TimeEnd
+			node.TimeStart = &start
+			node.TimeEnd = &end
 		}
 		}
 	}
 	}