Browse Source

添加a30项目拼接物料描述逻辑

pull/310/head
zhangxin 3 years ago
parent
commit
8ab61e6c64
2 changed files with 20 additions and 12 deletions
  1. +10
    -6
      services/log/implments/ArtDemandHead.service.impl.go
  2. +10
    -6
      services/log/implments/ArtDemandLst.service.impl.go

+ 10
- 6
services/log/implments/ArtDemandHead.service.impl.go View File

@ -448,12 +448,16 @@ func (impl *ArtDemandHeadServiceImplement) Select(user *models.Usertab, urlParam
data := artDemandHead
var responseItem model.ArtDemandHeadResponseItem
responseItem.ArtDemandHead = &data
article, err := baseDao.SelectOne(artDemandHead.ArtId)
if err != nil {
return nil, err
}
if article != nil {
responseItem.ArtDesc = article.Descr1
if data.ProjectId == baseModel.A30PorjectId {
responseItem.ArtDesc = data.DemandCtrlPara3
} else {
article, err := baseDao.SelectOne(artDemandHead.ArtId)
if err != nil {
return nil, err
}
if article != nil {
responseItem.ArtDesc = article.Descr1
}
}
if artDemandHead.Status == model.AccomplishedStatus {
responseItem.UrgencyDegree = 0


+ 10
- 6
services/log/implments/ArtDemandLst.service.impl.go View File

@ -473,12 +473,16 @@ func (impl *ArtDemandLstServiceImplement) Select(user *models.Usertab, urlParame
data := artDemandLst
var responseItem model.ArtDemandLstResponseItem
responseItem.ArtDemandLst = &data
article, err := baseDao.SelectOne(artDemandLst.ArtId)
if err != nil {
return nil, err
}
if article != nil {
responseItem.ArtDesc = article.Descr1
if data.ProjectId == baseModel.A30PorjectId {
responseItem.ArtDesc = data.DemandCtrlPara3
} else {
article, err := baseDao.SelectOne(artDemandLst.ArtId)
if err != nil {
return nil, err
}
if article != nil {
responseItem.ArtDesc = article.Descr1
}
}
if artDemandLst.Status == model.AccomplishedStatus {
responseItem.UrgencyDegree = 0


Loading…
Cancel
Save