合同到期时间新增

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -297,13 +297,14 @@ func (this *Analysis) ForPList() {
 }
 
 type ForecastInfo struct {
-	Buyer      string   `json:"buyer"`
-	Id         string   `json:"id"`
-	Purchasing []string `json:"purchasing"`
-	Title      string   `json:"title"`
-	Createtime int64    `json:"createtime"`
-	Keys       string   `json:"keys"`
-	Jyhref     string   `json:"jyhref"`
+	Buyer       string   `json:"buyer"`
+	Id          string   `json:"id"`
+	Purchasing  []string `json:"purchasing"`
+	Title       string   `json:"title"`
+	Createtime  int64    `json:"createtime"`
+	Keys        string   `json:"keys"`
+	Jyhref      string   `json:"jyhref"`
+	Yuceendtime int64    `json:"yuceendtime"`
 }
 
 // 合并去重
@@ -316,12 +317,13 @@ func forecastMerge(r, f []map[string]interface{}) []*ForecastInfo {
 		for _, rv := range r {
 			idMap[qutil.ObjToString(rv["id"])] = true
 			res = append(res, &ForecastInfo{
-				Buyer:      qutil.ObjToString(rv["buyer"]),
-				Id:         util.EncodeId(qutil.ObjToString(rv["id"])),
-				Purchasing: rv["results"].([]string),
-				Title:      qutil.ObjToString(rv["title"]),
-				Createtime: qutil.Int64All(rv["createtime"]),
-				Keys:       "",
+				Buyer:       qutil.ObjToString(rv["buyer"]),
+				Id:          util.EncodeId(qutil.ObjToString(rv["id"])),
+				Purchasing:  rv["results"].([]string),
+				Title:       qutil.ObjToString(rv["title"]),
+				Createtime:  qutil.Int64All(rv["createtime"]),
+				Keys:        "",
+				Yuceendtime: qutil.Int64All(rv["yuceendtime"]),
 			})
 		}
 	}
@@ -332,13 +334,14 @@ func forecastMerge(r, f []map[string]interface{}) []*ForecastInfo {
 				continue
 			}
 			res = append(res, &ForecastInfo{
-				Buyer:      qutil.ObjToString(fv["buyer"]),
-				Id:         util.EncodeId(qutil.ObjToString(fv["id"])),
-				Purchasing: fv["results"].([]string),
-				Title:      qutil.ObjToString(fv["title"]),
-				Createtime: qutil.Int64All(fv["yucetime"]),
-				Jyhref:     qutil.ObjToString(fv["jyhref"]),
-				Keys:       "",
+				Buyer:       qutil.ObjToString(fv["buyer"]),
+				Id:          util.EncodeId(qutil.ObjToString(fv["id"])),
+				Purchasing:  fv["results"].([]string),
+				Title:       qutil.ObjToString(fv["title"]),
+				Createtime:  qutil.Int64All(fv["yucetime"]),
+				Jyhref:      qutil.ObjToString(fv["jyhref"]),
+				Keys:        "",
+				Yuceendtime: qutil.Int64All(fv["yuceendtime"]),
 			})
 		}
 	}