xg

exportData/main.go

@@ -118,7 +118,8 @@ func main() {
 			row := sheet.AddRow()
 			for _, v := range FieldsArr {
 				if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-					v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+					v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+					v == "bidendtime" {
 					str := ""
 					if baseInfo[v] != nil {
 						dd := common.Int64All(baseInfo[v])
@@ -161,7 +162,8 @@ func main() {
 										}
 									}
 								} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-									v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+									v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+									v == "bidendtime" {
 									str := ""
 									if baseInfo[v] != nil {
 										dd := common.Int64All(baseInfo[v])
@@ -185,7 +187,8 @@ func main() {
 						row := sheet.AddRow()
 						for _, v := range FieldsArr {
 							if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-								v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+								v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+								v == "bidendtime" {
 								str := ""
 								if baseInfo[v] != nil {
 									dd := common.Int64All(baseInfo[v])
@@ -209,7 +212,8 @@ func main() {
 					row := sheet.AddRow()
 					for _, v := range FieldsArr {
 						if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+							v == "bidendtime" {
 							str := ""
 							if baseInfo[v] != nil {
 								dd := common.Int64All(baseInfo[v])
@@ -250,7 +254,8 @@ func main() {
 									}
 								}
 							} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-								v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+								v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+								v == "bidendtime" {
 								str := ""
 								if baseInfo[v] != nil {
 									dd := common.Int64All(baseInfo[v])
@@ -274,7 +279,8 @@ func main() {
 					row := sheet.AddRow()
 					for _, v := range FieldsArr {
 						if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+							v == "bidendtime" {
 							str := ""
 							if baseInfo[v] != nil {
 								dd := common.Int64All(baseInfo[v])
@@ -326,7 +332,8 @@ func main() {
 						} else if v == "winnerperson" || v == "winnertel" {
 							row.AddCell().SetValue("")
 						} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+							v == "bidendtime" {
 							str := ""
 							if baseInfo[v] != nil {
 								dd := common.Int64All(baseInfo[v])
@@ -350,7 +357,8 @@ func main() {
 				row := sheet.AddRow()
 				for _, v := range FieldsArr {
 					if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-						v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+						v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+						v == "bidendtime" {
 						str := ""
 						if baseInfo[v] != nil {
 							dd := common.Int64All(baseInfo[v])
@@ -385,7 +393,8 @@ func main() {
 							row.AddCell().SetValue(p1[v1])
 							m[v] = p1[v1]
 						} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+							v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+							v == "bidendtime" {
 							str := ""
 							if baseInfo[v] != nil {
 								dd := common.Int64All(baseInfo[v])
@@ -415,7 +424,8 @@ func main() {
 				m := make(map[string]interface{})
 				for _, v := range FiedlsPurchase {
 					if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
-						v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" {
+						v == "signaturedate" || v == "comeintime" || v == "createtime" || v == "signendtime" || v == "docendtime" ||
+						v == "bidendtime" {
 						str := ""
 						if baseInfo[v] != nil {
 							dd := common.Int64All(baseInfo[v])

src/front/group.go

@@ -377,6 +377,31 @@ func syncJyData(source, tid, pid string) int {
 			tmp = make(map[string]interface{})
 		}
 		wg.Wait()
+	} else if pid == "6507ea53c88c29b90aeb5156" || pid == "6657d06edadb2b5c64ce57c8" {
+		q = bson.M{"s_grouptaskid": tid}
+		query := sess.DB(util.Mgo.DbName).C(source).Find(q).Select(nil).Iter()
+		for tmp := make(map[string]interface{}); query.Next(&tmp); count++ {
+			ch <- true
+			wg.Add(1)
+			go func(tmp map[string]interface{}) {
+				defer func() {
+					<-ch
+					wg.Done()
+				}()
+				info := tmp["v_baseinfo"].(map[string]interface{})
+				info["createtime"] = time.Now().Unix()
+				if qu.ObjToString(info["id"]) == "" {
+					info["id"] = tmp["id"]
+				}
+				info["ispanchong"] = 1
+				info["appid"] = "jyGQ1XQQsEAwNeSENOFR9D"
+				util.MgoJy.Save(util.JYPushColl, info)
+				util.Mgo.UpdateById(source, tmp["_id"], bson.M{"$set": bson.M{"sendflag": true}})
+
+			}(tmp)
+			tmp = make(map[string]interface{})
+		}
+		wg.Wait()
 	} else {
 		q = bson.M{"s_grouptaskid": tid, "sendflag": nil}
 		query := sess.DB(util.Mgo.DbName).C(source).Find(q).Select(nil).Iter()

src/front/remark.go

@@ -2446,9 +2446,11 @@ func MarkPackage(content []interface{}, tagSet, baseSet, baseUnset map[string]in
 	if len(pkgs)+delpkgson == len(content) {
 		if len(pkgs) > 0 {
 			baseSet["package"] = pkgs
+			baseSet["multipackage"] = 1
 			baseSet["s_winner"] = strings.Join(sw, ",")
 			delete(baseUnset, "s_winner")
-			baseSet["bidamount"] = math.Round(total)
+			pow := math.Pow(10, float64(4))
+			baseSet["bidamount"] = math.Round(total*pow) / pow
 			delete(baseUnset, "bidamount")
 		} else if len(content) == 0 { //只有删除
 			baseUnset["package"] = ""