|
|
@@ -4,7 +4,6 @@ package service
|
|
|
import (
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
- "log"
|
|
|
"regexp"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -13,6 +12,7 @@ import (
|
|
|
"app.yhyue.com/moapp/jybase/encrypt"
|
|
|
elastic "app.yhyue.com/moapp/jybase/esv1"
|
|
|
"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/entity"
|
|
|
+ "github.com/zeromicro/go-zero/core/logx"
|
|
|
)
|
|
|
|
|
|
//画像
|
|
|
@@ -121,12 +121,11 @@ func (this *PortraitService) List(companyName string, pageSize, pageNum int64, i
|
|
|
//列表查询
|
|
|
if total <= entity.DataExportBatchSearchLimit {
|
|
|
listQuery := fmt.Sprintf(entity.NewMustSearch, strings.Join(mustQueryArr, ","), fmt.Sprintf(entity.ListSearchLimit, fields, "publishtime", start, limit))
|
|
|
- log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
|
|
|
+ logx.Infof("PortraitWinnerProject GetList Sql %s\n", listQuery)
|
|
|
newData := elastic.Get(entity.BiddingIndex, entity.BiddingType, listQuery)
|
|
|
if newData == nil || len(*newData) == 0 {
|
|
|
return nil, 0, errors.New(entity.NO_DATA_ERROR_MSG)
|
|
|
}
|
|
|
- log.Println("newdata:", newData)
|
|
|
for k, v := range *newData {
|
|
|
if len(v) > 0 {
|
|
|
if v["_id"] != nil {
|
|
|
@@ -138,10 +137,6 @@ func (this *PortraitService) List(companyName string, pageSize, pageNum int64, i
|
|
|
title = ObjToString(v["projectname"])
|
|
|
}
|
|
|
(*newData)[k]["title"] = ClearHtml.ReplaceAllString(title, "")
|
|
|
-
|
|
|
- if v["s_winner"] != nil {
|
|
|
- delete((*newData)[k], "s_winner") //删除
|
|
|
- }
|
|
|
}
|
|
|
*list = append(*list, &entity.GetNewMsgList{
|
|
|
Area: ObjToString(v["area"]),
|
WH01243