zhangjinkun преди 5 години
родител
ревизия
ceb6e71303
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      versioncomparison/main.go
  2. BIN
      versioncomparison/template.xlsx

+ 5 - 2
versioncomparison/main.go

@@ -162,7 +162,7 @@ func createXlsx() {
 func getVersionData() {
 	query := bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(Sid), "$lte": bson.ObjectIdHex(Eid)}}
 	log.Println(qu.ObjToString(SysConfig["prec"]), query)
-	list1, _ := Premgo.Find(qu.ObjToString(SysConfig["prec"]), query, nil, `{`+FieldsQuery+`}`, false, -1, -1)
+	list1, _ := Premgo.Find(qu.ObjToString(SysConfig["prec"]), query, nil, `{`+FieldsQuery+`,}`, false, -1, -1)
 	for _, v := range *list1 {
 		for _, key := range Fields {
 			rd := FieldData[key]
@@ -181,10 +181,13 @@ func getVersionData() {
 	}
 	log.Println("pre version 加载完成")
 
-	list2, _ := Newmgo.Find(qu.ObjToString(SysConfig["newc"]), query, nil, `{`+FieldsQuery+`}`, false, -1, -1)
+	list2, _ := Newmgo.Find(qu.ObjToString(SysConfig["newc"]), query, nil, `{`+FieldsQuery+`,"s_winner":1}`, false, -1, -1)
 	for _, v := range *list2 {
 		for _, field := range Fields {
 			rd := FieldData[field]
+			if field == "winner" {
+				field = "s_winner"
+			}
 			if rd == nil {
 				rd = map[string]*Data{}
 			}

BIN
versioncomparison/template.xlsx