Jianghan hace 1 año
padre
commit
eb24532f9c
Se han modificado 6 ficheros con 24 adiciones y 8 borrados
  1. 2 2
      exportData/config.json
  2. 1 1
      exportData/main.go
  3. 8 0
      isrepeat/config.json
  4. 10 4
      isrepeat/main.go
  5. 2 1
      isrepeat/task.go
  6. 1 0
      src/front/remark.go

+ 2 - 2
exportData/config.json

@@ -3,9 +3,9 @@
   "mgoDbName": "wjh",
   "mgoColl": "bidding",
   "mgoSize": 10,
-  "exportType": 2,
+  "exportType": 0,
   "isMark": 1,
-  "search": {},
+  "search": {"repeat": false, "createtime": {"$gte": 1712046000}},
   "fieldsSort": ["matchkey", "area", "city", "title", "subtype", "detail", "publishtime", "href", "jybxhref", "projectname",
     "projectcode", "projectscope", "budget", "bidamount", "bidopentime", "buyer", "buyerperson", "buyertel", "agency", "s_winner",
     "winnerperson", "winnertel", "company_phone", "company_email", "id"],

+ 1 - 1
exportData/main.go

@@ -115,7 +115,7 @@ 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 == "signaturedate" || v == "comeintime" || v == "createtime" || v == "bidendtime" {
 					str := ""
 					if baseInfo[v] != nil {
 						date := util.Int64All(baseInfo[v])

+ 8 - 0
isrepeat/config.json

@@ -0,0 +1,8 @@
+{
+  "addr": "192.168.3.166:27082",
+  "db": "hnyd_yiqingxi",
+  "coll": "2024Hnyd_zhao",
+  "size": 10,
+  "username": "",
+  "password": ""
+}

+ 10 - 4
isrepeat/main.go

@@ -14,16 +14,22 @@ import (
 )
 
 var (
-	Mgo *mgo.MongodbSim
+	Sysconfig map[string]interface{}
+	Mgo       *mgo.MongodbSim
 )
 
 func init() {
+	qu.ReadConfig(&Sysconfig)
+	//qu.ReadConfig("./tools.json", &Sysconfig)
 	Mgo = &mgo.MongodbSim{
-		MongodbAddr: "127.0.0.1:27086", // 127.0.0.1:27084
-		Size:        5,
-		DbName:      "jyqykhfw",
+		MongodbAddr: qu.ObjToString(Sysconfig["addr"]),
+		Size:        qu.IntAll(Sysconfig["size"]),
+		DbName:      qu.ObjToString(Sysconfig["db"]),
+		UserName:    qu.ObjToString(Sysconfig["username"]),
+		Password:    qu.ObjToString(Sysconfig["password"]),
 	}
 	Mgo.InitPool()
+	qu.Debug(Sysconfig)
 }
 
 func ShowTable() {

+ 2 - 1
isrepeat/task.go

@@ -41,7 +41,8 @@ func task4(coll, startTime, endTime, sortType string) {
 	log.Println(query, sort)
 	sess := Mgo.GetMgoConn()
 	defer Mgo.DestoryMongoConn(sess)
-	it := sess.DB(Mgo.DbName).C(coll).Find(query).Sort(sort).Iter()
+	f := bson.M{"details": 0, "detail": 0, "filetext": 0}
+	it := sess.DB(Mgo.DbName).C(coll).Find(query).Select(f).Sort(sort).Iter()
 	index := 0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); index++ {
 		d := &dataSource{

+ 1 - 0
src/front/remark.go

@@ -2375,6 +2375,7 @@ func MarkPackage(content []interface{}, tagSet, baseSet, baseUnset map[string]in
 			baseSet["bidamount"] = total
 		} else if len(content) == 0 { //只有删除
 			baseUnset["package"] = ""
+			baseSet["multipackage"] = 0
 		}
 		tagSet["package"] = status
 	} else {