wip:项目明细返回值调整

jyBXCore/rpc/bxcore.proto

@@ -497,6 +497,10 @@ message ProjectStatisticsDataRes{
   string err_msg = 2;
   repeated ProjectStatisticsData data = 3;
 }
+message StageValue{
+  string Status =1;
+  string Date =2;
+}
 message ProjectDetailData {
   string  ProjectName =1;// 项目名称
   string  Source = 2; // 标讯/项目来源 '来源；1：个人订阅 2：企业自动分发 3：企业手动分发
@@ -509,7 +513,7 @@ message ProjectDetailData {
   string  ParticipateDate = 9;//参标时间
   string  StopParticipateDate = 12;//参标时间
   int64   BidWay = 10;//投标类型
-  map<string, string> stage =11;// 阶段相关信息  <阶段名称,勾选时间>
+  map<string, StageValue> stage =11;// 阶段相关信息  <阶段名称,勾选时间>
 }
 message DetailData{
   repeated ProjectDetailData list = 1;

jyBXCore/rpc/bxcore/bxcore.go

@@ -62,6 +62,7 @@ type (
 	SearchReturn             = bxcore.SearchReturn
 	ShowInfo                 = bxcore.ShowInfo
 	SourceItem               = bxcore.SourceItem
+	StageValue               = bxcore.StageValue
 	StatisticsListReq        = bxcore.StatisticsListReq
 	TipInfo                  = bxcore.TipInfo
 	UpdateBidStatusReq       = bxcore.UpdateBidStatusReq

jyBXCore/rpc/service/participateStatistics.go

@@ -538,7 +538,7 @@ func (in *ParticipateStatistics) ProjectDetails(entUserIdArr []string, detailReq
 	if dataList == nil && len(*dataList) == 0 {
 		return
 	}
-	// 处理数据 补充项目名称、推送表字段 格式化数据
+	// 处理数据 补充项目名称、推送表字段 、格式化数据
 	rs := ProjectDetailHandle(*dataList, in.EntId)
 	result = bxcore.DetailData{
 		List:  rs,
@@ -571,7 +571,7 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 			query2 = append(query2, fmt.Sprintf(" FIND_IN_SET('%s', b.position_id) ", personArrStr))
 			query3 = append(query3, fmt.Sprintf(" FIND_IN_SET('%s', b.position_id) ", personArrStr))
 		}
-		q := `SELECT A.project_id, B.stage，B.is_participate,B.bid_way
+		q := `SELECT A.project_id, B.stage
 				FROM
 				(SELECT DISTINCT(project_id)
 				FROM
@@ -629,7 +629,7 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 		if req.IsParticipate != -1 {
 			query = append(query, fmt.Sprintf("a.isparticipate = %d", req.IsParticipate))
 		}
-		q = "select distinct(a.project_id),b.stage,b.is_participate,b.bid_way   from participate_push_statistics a left join participate_stage_statistics b on(b.project_id=a.project_id ) %s"
+		q = "select distinct(a.project_id),b.stage   from participate_push_statistics a left join participate_stage_statistics b on(b.project_id=a.project_id ) %s"
 		qCount = "select count(distinct(a.project_id),b.stage)   from participate_push_statistics a left join participate_stage_statistics b on(b.project_id=a.project_id ) %s"
 	} else if queryType == 2 {
 		if isAdmin {
@@ -653,7 +653,7 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 		if req.IsParticipate == 1 {
 			query = append(query, fmt.Sprintf("b.isparticipate = %d", req.IsParticipate))
 		}
-		q = "select distinct(b.project_id),b.stage,b.is_participate,b.bid_way    from  participate_stage_statistics b   %s"
+		q = "select distinct(b.project_id),b.stage   from  participate_stage_statistics b   %s"
 		qCount = "select count(distinct(b.project_id),b.stage)   from  participate_stage_statistics b  %s"
 	} else {
 		if isAdmin {
@@ -695,7 +695,7 @@ func GetDetailQuery(isAdmin bool, personArrStr string, req *bxcore.ProjectDetail
 		if req.BidUpdateEndTime != "" {
 			query = append(query, fmt.Sprintf("b.update_date > %s", req.BidUpdateStartTime))
 		}
-		q = "select distinct(a.project_id),b.stage,b.is_participate,b.bid_way    from participate_push_statistics a inner join  participate_stage_statistics b on(b.project_id=a.project_id ) %s"
+		q = "select distinct(a.project_id),b.stage   from participate_push_statistics a inner join  participate_stage_statistics b on(b.project_id=a.project_id ) %s"
 		qCount = "select count(distinct(a.project_id),b.stage)   from participate_push_statistics a inner join participate_stage_statistics b on(b.project_id=a.project_id ) %s"
 	}
 	if len(query) > 0 {
@@ -719,12 +719,11 @@ type PushInfoStruct struct {
 }
 
 func ProjectDetailHandle(dataList []map[string]interface{}, entId int64) []*bxcore.ProjectDetailData {
-	//dataList 里面包含 项目id、各阶段勾选时间、
+	//dataList 里面包含 项目id、各阶段信息
 	// 处理项目名称
 	projectIdList := []string{}
 	for i := 0; i < len(dataList); i++ {
 		projectIdList = append(projectIdList, common.ObjToString(dataList[i]["project_id"]))
-
 	}
 	// 项目名称处理成map用于后续使用
 	projectNameMap := map[string]string{}
@@ -738,7 +737,6 @@ func ProjectDetailHandle(dataList []map[string]interface{}, entId int64) []*bxco
 	}
 	// 获取推送最新状态
 	newPushInfo := getNewPushInfo(projectIdList, int(entId))
-
 	newPushInfoMap := map[string]PushInfoStruct{}
 	// 处理推送最新状态
 	if newPushInfo != nil && len(*newPushInfo) > 0 {
@@ -767,18 +765,15 @@ func ProjectDetailHandle(dataList []map[string]interface{}, entId int64) []*bxco
 			tmp.IsDistribute = int64(pushInfo_.IsDistribute)
 			tmp.DisDate = pushInfo_.DisDate
 		} //
-		// 处理阶段勾选信息和参标、终止参标信息  todo
-		stageInfo := map[string]string{}
-		err := json.Unmarshal(dataList[i]["stage"].([]byte), &stageInfo)
-		if err != nil {
-			tmp.ParticipateDate = common.ObjToString(stageInfo["参标"])
-			tmp.StopParticipateDate = stageInfo["终止参标"]
-			delete(stageInfo, "参标")
-			delete(stageInfo, "终止参标")
-			tmp.Stage = stageInfo
-		}
-		tmp.IsParticipate = common.Int64All(dataList[i]["is_participate"])
-		tmp.BidWay = common.Int64All(dataList[i]["bid_way"])
+		// 处理阶段勾选信息和参标、终止参标信息
+		if dataList[i]["stage"] != nil {
+			if stage_, err := json.Marshal(dataList[i]["stage"]); err == nil {
+				err := json.Unmarshal(stage_, &tmp.Stage)
+				if err != nil {
+					log.Println("stage 反序列失败", err)
+				}
+			}
+		}
 		results = append(results, &tmp)
 	}
 	return results