|
|
@ -480,14 +480,19 @@ func (impl *PlanOrderVersionServiceImplement) GetExistVersion(user *global.User) |
|
|
|
week, year, _ := utils.WeekByDate(now) |
|
|
|
result.Version = fmt.Sprintf("%d.%02d", year, week) |
|
|
|
dao := dal.NewPlanOrderVersionDAO(session, user.PlantNr, user.UserId) |
|
|
|
planOrderVersionLi, err := dao.Select([]grmi.Predicate{meta.PlanOrderVersion_DemandYear.NewPredicate(grmi.Equal, year), meta.PlanOrderVersion_DemandWeek.NewPredicate(grmi.Equal, week)}, nil) |
|
|
|
planOrderVersionLi, err := dao.Select([]grmi.Predicate{meta.PlanOrderVersion_DemandYear.NewPredicate(grmi.Equal, year), meta.PlanOrderVersion_DemandWeek.NewPredicate(grmi.Equal, week)}, []grmi.Field{meta.PlanOrderVersion_CreateTime}) |
|
|
|
if err != nil { |
|
|
|
return nil, grmi.NewBusinessError("查询已存在发布版本失败, error:" + err.Error()) |
|
|
|
} |
|
|
|
if len(planOrderVersionLi) == 0 { |
|
|
|
result.Message = "当前周未发布过版本" |
|
|
|
result.PublishedVersionNr = make([]string, 0, 0) |
|
|
|
} else { |
|
|
|
result.Message = "当前周已发布过版本" |
|
|
|
result.PublishedVersionNr = make([]string, 0, len(planOrderVersionLi)) |
|
|
|
for _, planOrderVersion := range planOrderVersionLi { |
|
|
|
result.PublishedVersionNr = append(result.PublishedVersionNr, planOrderVersion.VersionNr) |
|
|
|
} |
|
|
|
} |
|
|
|
return result, nil |
|
|
|
} |