wip:项目明细查询条件调整

jyBXCore/rpc/service/participateStatistics.go

@@ -589,8 +589,8 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 		// 空搜索调整
 		query1, query2 := []string{}, []string{}
 		query3 := ""
-		//没有传时间，默认时间处理
-		var start = time.Now().AddDate(0, 0, -30)
+		//没有传时间，默认时间处理 todo
+		var start = time.Now().AddDate(0, 0, -10)
 		query1 = append(query1, fmt.Sprintf(" a.ymd >= %s ", start.Local().Format("20060102")))
 		query2 = append(query2, fmt.Sprintf(" b.update_date >= '%s' ", start.Local().Format(date.Date_Full_Layout)))
 		if isAdmin {
@@ -661,16 +661,16 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 				joinStr = "and a.ent_id = b.ent_id"
 			}
 		}
-		//if req.StartTime == 0 && req.EndTime == 0 {
-		//	//没有传时间，默认时间处理
-		//	var start = time.Now().AddDate(0, 0, -30)
-		//	query = append(query, fmt.Sprintf(" a.ymd >= %s ", start.Local().Format("20060102")))
-		//}
+		if req.StartTime == 0 && req.EndTime == 0 {
+			//没有传时间，默认时间处理
+			var start = time.Now().AddDate(0, 0, -30)
+			query = append(query, fmt.Sprintf(" a.ymd >= %s ", start.Local().Format("20060102")))
+		}
 		if req.StartTime != 0 {
 			query = append(query, fmt.Sprintf(" a.ymd >= %d ", req.StartTime))
 		}
 		if req.EndTime != 0 {
-			query = append(query, fmt.Sprintf(" a.ymd < %d ", req.EndTime))
+			query = append(query, fmt.Sprintf(" a.ymd <= %d ", req.EndTime))
 		}
 		// 标讯/项目来源
 		if len(req.Source) > 0 {
@@ -712,10 +712,10 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 			query = append(query, fmt.Sprintf(" FIND_IN_SET('%s', b.position_ids)", personArrStr))
 		}
 		//// 无默认时间时
-		//if req.BidUpdateStartTime == 0 && req.BidUpdateEndTime == 0 {
-		//	var start = time.Now().AddDate(0, 0, -30)
-		//	query = append(query, fmt.Sprintf(" b.update_date >= '%s' ", start.Local().Format(date.Date_Full_Layout)))
-		//}
+		if req.BidUpdateStartTime == 0 && req.BidUpdateEndTime == 0 {
+			var start = time.Now().AddDate(0, 0, -30)
+			query = append(query, fmt.Sprintf(" b.update_date >= '%s' ", start.Local().Format(date.Date_Full_Layout)))
+		}
 
 		// 参标状态更新时间
 		if req.BidUpdateStartTime != 0 {
@@ -728,13 +728,13 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 			query = append(query, fmt.Sprintf("b.update_date >= '%s'", bidStart))
 		}
 		if req.BidUpdateEndTime != 0 {
-			bidEnd_, err := time.ParseInLocation(date.Date_yyyyMMdd, fmt.Sprintf("%d", req.BidUpdateEndTime), time.Local)
+			bidEnd_, err := time.ParseInLocation("20060102 15:04:05", fmt.Sprintf("%d 23:59:59", req.BidUpdateEndTime), time.Local)
 			if err != nil {
 				bidEnd_ = time.Now().AddDate(0, 0, -30)
 				log.Println("时间转换失败,使用默认值：", err)
 			}
 			bidEnd := date.FormatDate(&bidEnd_, date.Date_Full_Layout)
-			query = append(query, fmt.Sprintf("b.update_date < '%s'", bidEnd))
+			query = append(query, fmt.Sprintf("b.update_date <= '%s'", bidEnd))
 		}
 		if req.BidWay != 0 {
 			query = append(query, fmt.Sprintf("b.bid_way = %d", req.BidWay))
@@ -761,11 +761,15 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 				joinStr = "and a.ent_id = b.ent_id"
 			}
 		}
+		if req.StartTime != 0 && req.EndTime == 0 && req.BidUpdateStartTime == 0 && req.BidUpdateEndTime == 0 {
+			var start = time.Now().AddDate(0, 0, -30)
+			query = append(query, fmt.Sprintf(" a.ymd >= %s ", start.Local().Format("20060102")))
+		}
 		if req.StartTime != 0 {
 			query = append(query, fmt.Sprintf(" a.ymd >= %d ", req.StartTime))
 		}
 		if req.EndTime != 0 {
-			query = append(query, fmt.Sprintf(" a.ymd < %d ", req.EndTime))
+			query = append(query, fmt.Sprintf(" a.ymd <= %d ", req.EndTime))
 		}
 		if len(req.Source) > 0 {
 			sourceArr := []string{}
@@ -798,13 +802,13 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 			query = append(query, fmt.Sprintf("b.update_date >= '%s'", bidStart))
 		}
 		if req.BidUpdateEndTime != 0 {
-			bidEnd_, err := time.ParseInLocation(date.Date_yyyyMMdd, fmt.Sprintf("%d", req.BidUpdateEndTime), time.Local)
+			bidEnd_, err := time.ParseInLocation("20060102 15:04:05", fmt.Sprintf("%d 23:59:59", req.BidUpdateEndTime), time.Local)
 			if err != nil {
 				bidEnd_ = time.Now().AddDate(0, 0, -30)
 				log.Println("时间转换失败,使用默认值：", err)
 			}
 			bidEnd := date.FormatDate(&bidEnd_, date.Date_Full_Layout)
-			query = append(query, fmt.Sprintf("b.update_date < '%s'", bidEnd))
+			query = append(query, fmt.Sprintf("b.update_date <= '%s'", bidEnd))
 		}
 		q = "select distinct(a.project_id),b.stage,a.ymd,b.update_date   from participate_push_statistics a inner join  participate_stage_statistics b on(b.project_id=a.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 inner join participate_stage_statistics b on(b.project_id=a.project_id %s) where %s"