|
|
@@ -753,13 +753,9 @@ func GetDetailQuery(isEnt bool, personArrStr string, req *bxcore.ProjectDetailsR
|
|
|
}
|
|
|
query = append(query, fmt.Sprintf(" (%s) ", strings.Join(sourceArr, " or ")))
|
|
|
}
|
|
|
- // 投标类型 投标方式；1：直接投标 2：渠道投标',
|
|
|
- if req.BidWay != 0 {
|
|
|
- query = append(query, fmt.Sprintf("a.bid_way = %d", req.BidWay))
|
|
|
- }
|
|
|
//参标状态：-1全部，0未参标、1已参标
|
|
|
if req.IsParticipate != -1 {
|
|
|
- query = append(query, fmt.Sprintf("a.isparticipate = %d", req.IsParticipate))
|
|
|
+ query = append(query, " (b.project_id is null or b.is_participate=0)")
|
|
|
}
|
|
|
q = "select distinct(a.project_id),b.stage,a.ymd,b.update_date from participate_push_statistics a left join participate_stage_statistics b on(a.project_id=b.project_id %s ) where %s order by a.ymd desc,b.update_date desc"
|
|
|
qCount = "select count(distinct(a.project_id)) from participate_push_statistics a left join participate_stage_statistics b on(a.project_id=b.project_id %s) where %s"
|
|
|
@@ -1004,7 +1000,7 @@ func GetQueryType(in *bxcore.ProjectDetailsReq) int {
|
|
|
in.BidUpdateEndTime = 0
|
|
|
return 1
|
|
|
}
|
|
|
- if (in.StartTime != 0 || in.EndTime != 0 || len(in.Source) > 0) && (in.BidUpdateStartTime == 0 && in.BidUpdateEndTime == 0 && in.IsParticipate != 2) {
|
|
|
+ if (in.StartTime != 0 || in.EndTime != 0 || len(in.Source) > 0) && (in.BidUpdateStartTime == 0 && in.BidUpdateEndTime == 0 && in.IsParticipate != 2 && in.BidWay == 0) {
|
|
|
return 1
|
|
|
}
|
|
|
if (in.StartTime == 0 && in.EndTime == 0 && len(in.Source) == 0) && (in.BidUpdateStartTime != 0 || in.BidUpdateEndTime == 0 || in.IsParticipate == 2 || in.BidWay != 0) {
|
