|
|
@ -42,6 +42,7 @@ var DefaultConditionOfCustDemandVerHead = grmi.NewCondition( |
|
|
|
meta.CustDemandVerHead_VersionId.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_VersionId, grmi.Equal, true), |
|
|
|
meta.CustDemandVerHead_Descr.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_Descr, grmi.Equal, false), |
|
|
|
meta.CustDemandVerHead_Status.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_Status, grmi.Equal, false), |
|
|
|
meta.CustDemandVerHead_GlobalPublish.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_GlobalPublish, grmi.Equal, false), |
|
|
|
meta.CustDemandVerHead_PlanReleaseTime.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_PlanReleaseTime, grmi.Approximate, false), |
|
|
|
meta.CustDemandVerHead_ActualReleaseTime.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_ActualReleaseTime, grmi.Approximate, false), |
|
|
|
meta.CustDemandVerHead_CreateMode.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_CreateMode, grmi.Equal, false), |
|
|
@ -262,6 +263,9 @@ func (impl *CustDemandVerHeadServiceImplement) DeleteOne(user *global.User, cust |
|
|
|
if record == nil { |
|
|
|
return grmi.NewBusinessError("不存在指定记录!") |
|
|
|
} |
|
|
|
if record.GlobalPublish == baseModel.STATUS_INT_YES{ |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
err = dao.DeleteOne(customerId, versionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
@ -320,7 +324,7 @@ func (impl *CustDemandVerHeadServiceImplement) SelectOne(user *global.User, cust |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
if mInfo == nil { |
|
|
|
return nil,grmi.NewBusinessError("客户需求模型不存在!") |
|
|
|
return nil, grmi.NewBusinessError("客户需求模型不存在!") |
|
|
|
} |
|
|
|
result.CreateModeDescr = mInfo.Descr |
|
|
|
//构建数组
|
|
|
@ -443,9 +447,12 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti |
|
|
|
if record == nil { |
|
|
|
return grmi.NewBusinessError("不存在指定记录!") |
|
|
|
} |
|
|
|
if record.Status == "1" { |
|
|
|
if record.Status == baseModel.STATUS_YES { |
|
|
|
return grmi.NewBusinessError("发布的版本不允许修改!") |
|
|
|
} |
|
|
|
if record.GlobalPublish == baseModel.STATUS_INT_YES{ |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
err = dao.UpdateOne(entity) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
@ -841,7 +848,19 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e |
|
|
|
|
|
|
|
dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId) |
|
|
|
detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId) |
|
|
|
err := dao.IssueVersion(entity) |
|
|
|
//查询版本信息
|
|
|
|
IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
if IssueInfo == nil{ |
|
|
|
return errors.New("发布版本不存在!") |
|
|
|
} |
|
|
|
if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{ |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
err = dao.IssueVersion(entity) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
@ -860,6 +879,135 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
custDemandHead := new(model.CustDemandHead) |
|
|
|
custDemandHead.PlantNr = entity.PlantNr |
|
|
|
custDemandHead.CustomerId = entity.CustomerId |
|
|
|
custDemandHead.VersionId = entity.VersionId |
|
|
|
custDemandHead.Descr = entity.Descr |
|
|
|
custDemandHead.Status = entity.Status |
|
|
|
custDemandHead.PlanReleaseTime = entity.PlanReleaseTime |
|
|
|
custDemandHead.ActualReleaseTime = entity.ActualReleaseTime |
|
|
|
custDemandHead.CreateMode = entity.CreateMode |
|
|
|
custDemandHead.CreateUser = entity.CreateUser |
|
|
|
//添加对应的版本信息
|
|
|
|
err = headDao.InsertOne(custDemandHead) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
err = session.Commit() |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************************** |
|
|
|
* |
|
|
|
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/ap/CustDemandVerHeadService.RemoveIssueVersion |
|
|
|
* |
|
|
|
******************************************************************************/ |
|
|
|
func (impl *CustDemandVerHeadServiceImplement) RemoveIssueVersion(user *global.User, entity *model.CustDemandVerHead) error { |
|
|
|
|
|
|
|
grmi.Log(user, "/services/ap/implments/CustDemandVerHead.service.impl.go", "RemoveIssueVersion", "取消发布版本") |
|
|
|
|
|
|
|
engine := db.Eloquent.Master() |
|
|
|
session := engine.NewSession() |
|
|
|
defer session.Close() |
|
|
|
|
|
|
|
// add Begin() before any action
|
|
|
|
if err := session.Begin(); err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId) |
|
|
|
detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId) |
|
|
|
//查询版本信息
|
|
|
|
IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{ |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
//取消发布版本
|
|
|
|
entity.Status = baseModel.STATUS_NO |
|
|
|
err = dao.IssueVersion(entity) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
//取消发布版本
|
|
|
|
err = detailDao.RemoveIssueVersion(entity.CustomerId, entity.VersionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
//删除对应的版本号
|
|
|
|
headDao := dal.NewCustDemandHeadDAO(session, user.PlantNr, user.UserId) |
|
|
|
err = headDao.DeleteWhere([]grmi.Predicate{ |
|
|
|
meta.CustDemandHead_CustomerId.NewPredicate(grmi.Equal, entity.CustomerId), |
|
|
|
}) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
err = session.Commit() |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
|
/****************************************************************************** |
|
|
|
* |
|
|
|
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/ap/CustDemandVerHeadService.IssueGlobalVersion |
|
|
|
* |
|
|
|
******************************************************************************/ |
|
|
|
func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.User, entity *model.CustDemandVerHead) error { |
|
|
|
|
|
|
|
grmi.Log(user, "/services/ap/implments/CustDemandVerHead.service.impl.go", "IssueVersion", "发布版本") |
|
|
|
|
|
|
|
engine := db.Eloquent.Master() |
|
|
|
session := engine.NewSession() |
|
|
|
defer session.Close() |
|
|
|
|
|
|
|
// add Begin() before any action
|
|
|
|
if err := session.Begin(); err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId) |
|
|
|
detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId) |
|
|
|
//查询版本信息
|
|
|
|
IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
if IssueInfo == nil{ |
|
|
|
return errors.New("发布版本不存在!") |
|
|
|
} |
|
|
|
if IssueInfo.Status != baseModel.STATUS_YES{ |
|
|
|
return errors.New("该版本没有发布!") |
|
|
|
} |
|
|
|
if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{ |
|
|
|
return errors.New("该版本已经全局发布!") |
|
|
|
} |
|
|
|
entity.GlobalPublish = baseModel.STATUS_INT_YES |
|
|
|
err = dao.IssueGlobalVersion(entity) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
err = detailDao.IssueVersion(entity.CustomerId, entity.VersionId) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
detailList, err := detailDao.Select([]grmi.Predicate{ |
|
|
|
meta.CustDemandVerDetail_CustomerId.NewPredicate(grmi.Equal, entity.CustomerId), |
|
|
|
meta.CustDemandVerDetail_VersionId.NewPredicate(grmi.Equal, entity.VersionId), |
|
|
@ -935,22 +1083,6 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e |
|
|
|
FEntity: request, |
|
|
|
}) |
|
|
|
|
|
|
|
custDemandHead := new(model.CustDemandHead) |
|
|
|
custDemandHead.PlantNr = entity.PlantNr |
|
|
|
custDemandHead.CustomerId = entity.CustomerId |
|
|
|
custDemandHead.VersionId = entity.VersionId |
|
|
|
custDemandHead.Descr = entity.Descr |
|
|
|
custDemandHead.Status = entity.Status |
|
|
|
custDemandHead.PlanReleaseTime = entity.PlanReleaseTime |
|
|
|
custDemandHead.ActualReleaseTime = entity.ActualReleaseTime |
|
|
|
custDemandHead.CreateMode = entity.CreateMode |
|
|
|
custDemandHead.CreateUser = entity.CreateUser |
|
|
|
//添加对应的版本信息
|
|
|
|
err = headDao.InsertOne(custDemandHead) |
|
|
|
if err != nil { |
|
|
|
session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
err = session.Commit() |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
@ -2498,6 +2630,7 @@ func (impl *CustDemandVerHeadServiceImplement) SelectOneByCust(user *global.User |
|
|
|
item[key] = 0 |
|
|
|
} |
|
|
|
one.Item = item |
|
|
|
one.SortKeys = SortWeeks |
|
|
|
temData = append(temData, one) |
|
|
|
} |
|
|
|
//第三步:构建数组
|
|
|
|