添加不分页的字段拼接和筛选查询

services/log/implments/ArtDemandLst.service.impl.go

@@ -414,7 +414,34 @@ func (impl *ArtDemandLstServiceImplement) Select(user *models.Usertab, urlParame
 		if err != nil {
 			return nil, err
 		}
-		return result, nil
+		baseDao := baseDal.NewArticleDAO(session, user.Pid, user.Userid)
+		responseLi := make([]model.ArtDemandLstResponseItem, 0, len(result))
+		now := time.Now()
+		for _, artDemandLst := range result {
+			data:= artDemandLst
+			var responseItem model.ArtDemandLstResponseItem
+			responseItem.ArtDemandLst = &data
+			article, err := baseDao.SelectOne(artDemandLst.ArtId)
+			if err != nil {
+				return nil, err
+			}
+			if article == nil {
+				continue
+			}
+			responseItem.ArtDesc = article.Descr1
+			demandDate := artDemandLst.DemandDate.Restore()
+			days := (demandDate.Unix() - now.Unix()) / 86400
+			responseItem.SurplusDays = days
+			if days > 2 {
+				responseItem.UrgencyDegree = model.UrgencyNot
+			} else if days >= 0 && days <= 2 {
+				responseItem.UrgencyDegree = model.UrgencyNormal
+			} else {
+				responseItem.UrgencyDegree = model.UrgencySerious
+			}
+			responseLi = append(responseLi, responseItem)
+		}
+		return responseLi, nil
 	}
 }