|
|
@ -722,8 +722,8 @@ func (impl *CustDemandVerHeadServiceImplement) SelectUnique(user *global.User, u |
|
|
|
nowTime := time.Now() |
|
|
|
details, err := detailDao.SelectDistinct([]grmi.Predicate{ |
|
|
|
meta.CustDemandVerDetail_DemandYear.NewPredicate(grmi.Equal, nowTime.Year()), |
|
|
|
meta.CustDemandVerDetail_DemandWeek.NewPredicate(grmi.Equal, utils.WeekByDate(nowTime)), |
|
|
|
meta.CustDemandVerDetail_Status.NewPredicate(grmi.Equal, 1), |
|
|
|
meta.CustDemandVerDetail_DemandWeek.NewPredicate(grmi.GreaterThen, utils.WeekByDate(nowTime)), |
|
|
|
meta.CustDemandVerDetail_Status.NewPredicate(grmi.Equal, baseModel.STATUS_YES), |
|
|
|
}, nil) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
@ -901,6 +901,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e |
|
|
|
if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES { |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
entity.Status = baseModel.STATUS_YES |
|
|
|
err = dao.IssueVersion(entity) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
@ -1547,7 +1548,9 @@ func (impl *CustDemandVerHeadServiceImplement) CompareVersion(user *global.User, |
|
|
|
if err != nil { |
|
|
|
return data, err |
|
|
|
} |
|
|
|
|
|
|
|
if utils.ValueIsEmpty(custInfo.DemandModelId ){ |
|
|
|
return data, errors.New("该客户没有配置需求模型") |
|
|
|
} |
|
|
|
//第一步:查询对应的模型
|
|
|
|
mInfo, err := mDao.SelectOne(custInfo.DemandModelId) |
|
|
|
if err != nil { |
|
|
|