优化

customerdata/src/task.go

@@ -232,18 +232,24 @@ func (c *Customer) GetData(stype string) {
 											if legal_person := qu.ObjToString(finddata["legal_person"]); legal_person != "" {
 												tmp["legal_person"] = legal_person
 											}
-											//从最新年报中获取 中标单位联系电话、中标单位邮箱
-											if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
-												anreport := Sort_year_report(annual_reports)
-												if len(anreport) > 0 {
-													if email := qu.ObjToString(anreport["company_email"]); email != "" {
-														tmp["company_email"] = email
-													}
-													if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
-														tmp["company_phone"] = phone
-													}
-												}
+											if email := qu.ObjToString(finddata["company_email"]); email != "" {
+												tmp["company_email"] = email
+											}
+											if phone := qu.ObjToString(finddata["company_phone"]); phone != "" {
+												tmp["company_phone"] = phone
 											}
+											//从最新年报中获取 中标单位联系电话、中标单位邮箱
+											// if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
+											// 	anreport := Sort_year_report(annual_reports)
+											// 	if len(anreport) > 0 {
+											// 		if email := qu.ObjToString(anreport["company_email"]); email != "" {
+											// 			tmp["company_email"] = email
+											// 		}
+											// 		if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
+											// 			tmp["company_phone"] = phone
+											// 		}
+											// 	}
+											// }
 										}
 									}
 								}

customerdata/src/util.go

@@ -529,12 +529,15 @@ func SearchEnterpriseInfo(tmp map[string]interface{}) {
 				//}
 			}
 			//注册时间"establish_date" : ISODate("1949-10-01T00:00:00.000+0000")
-			if data["establish_date"] != nil {
-				if establish_date, ok := data["establish_date"].(primitive.DateTime); ok {
-					t := establish_date.Time()
-					tmp["establish_date"] = qu.FormatDate(&t, qu.Date_Short_Layout)
-				}
-			}
+			if establish_date := qu.ObjToString(data["establish_date"]); establish_date != "" {
+				tmp["establish_date"] = establish_date
+			}
+			// if data["establish_date"] != nil {
+			// 	if establish_date, ok := data["establish_date"].(primitive.DateTime); ok {
+			// 		t := establish_date.Time()
+			// 		tmp["establish_date"] = qu.FormatDate(&t, qu.Date_Short_Layout)
+			// 	}
+			// }
 			//经营范围
 			if business_scope := qu.ObjToString(data["business_scope"]); business_scope != "" {
 				tmp["business_scope"] = business_scope
@@ -544,30 +547,39 @@ func SearchEnterpriseInfo(tmp map[string]interface{}) {
 				tmp["winner_credit_no"] = credit_no
 			}
 			//股东名单
-			if partners, ok := data["partners"].(primitive.A); ok && len(partners) > 0 {
-				stock_name_arr := []string{}
-				for _, partner := range partners {
-					p := partner.(map[string]interface{})
-					if stock_name := qu.ObjToString(p["stock_name"]); stock_name != "" {
-						stock_name_arr = append(stock_name_arr, stock_name)
-					}
-				}
-				if len(stock_name_arr) > 0 {
-					tmp["stock_name"] = strings.Join(stock_name_arr, ",")
-				}
+			if stock_name := qu.ObjToString(data["stock_name"]); stock_name != "" {
+				tmp["stock_name"] = stock_name
+			}
+			// if partners, ok := data["partners"].(primitive.A); ok && len(partners) > 0 {
+			// 	stock_name_arr := []string{}
+			// 	for _, partner := range partners {
+			// 		p := partner.(map[string]interface{})
+			// 		if stock_name := qu.ObjToString(p["stock_name"]); stock_name != "" {
+			// 			stock_name_arr = append(stock_name_arr, stock_name)
+			// 		}
+			// 	}
+			// 	if len(stock_name_arr) > 0 {
+			// 		tmp["stock_name"] = strings.Join(stock_name_arr, ",")
+			// 	}
+			// }
+			if email := qu.ObjToString(data["company_email"]); email != "" {
+				tmp["company_email"] = email
+			}
+			if phone := qu.ObjToString(data["company_phone"]); phone != "" {
+				tmp["company_phone"] = phone
 			}
 			//从最新年报中获取 中标单位联系电话、中标单位邮箱
-			if annual_reports, ok := data["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
-				anreport := Sort_year_report(annual_reports)
-				if len(anreport) > 0 {
-					if email := qu.ObjToString(anreport["company_email"]); email != "" {
-						tmp["company_email"] = email
-					}
-					if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
-						tmp["company_phone"] = phone
-					}
-				}
-			}
+			// if annual_reports, ok := data["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
+			// 	anreport := Sort_year_report(annual_reports)
+			// 	if len(anreport) > 0 {
+			// 		if email := qu.ObjToString(anreport["company_email"]); email != "" {
+			// 			tmp["company_email"] = email
+			// 		}
+			// 		if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
+			// 			tmp["company_phone"] = phone
+			// 		}
+			// 	}
+			// }
 		}
 	}
 }

src/history/task.go

@@ -13,7 +13,7 @@ import (
 
 	"gopkg.in/mgo.v2/bson"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	// "go.mongodb.org/mongo-driver/bson/primitive"
 	es "gopkg.in/olivere/elastic.v1"
 )
 
@@ -180,18 +180,24 @@ func (c *Customer) GetData(stype string) {
 											if legal_person := qu.ObjToString(finddata["legal_person"]); legal_person != "" {
 												tmp["legal_person"] = legal_person
 											}
-											//从最新年报中获取 中标单位联系电话、中标单位邮箱
-											if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
-												anreport := Sort_year_report(annual_reports)
-												if len(anreport) > 0 {
-													if email := qu.ObjToString(anreport["company_email"]); email != "" {
-														tmp["company_email"] = email
-													}
-													if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
-														tmp["company_phone"] = phone
-													}
-												}
+											if email := qu.ObjToString(finddata["company_email"]); email != "" {
+												tmp["company_email"] = email
+											}
+											if phone := qu.ObjToString(finddata["company_phone"]); phone != "" {
+												tmp["company_phone"] = phone
 											}
+											//从最新年报中获取 中标单位联系电话、中标单位邮箱
+											// if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
+											// 	anreport := Sort_year_report(annual_reports)
+											// 	if len(anreport) > 0 {
+											// 		if email := qu.ObjToString(anreport["company_email"]); email != "" {
+											// 			tmp["company_email"] = email
+											// 		}
+											// 		if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
+											// 			tmp["company_phone"] = phone
+											// 		}
+											// 	}
+											// }
 										}
 									}
 								}

src/history/util_history.go

@@ -15,7 +15,7 @@ import (
 	"github.com/tealeg/xlsx"
 
 	"github.com/donnie4w/go-logger/logger"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	// "go.mongodb.org/mongo-driver/bson/primitive"
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -545,12 +545,15 @@ func SearchEnterpriseInfo(tmp map[string]interface{}) {
 				//}
 			}
 			//注册时间"establish_date" : ISODate("1949-10-01T00:00:00.000+0000")
-			if data["establish_date"] != nil {
-				if establish_date, ok := data["establish_date"].(primitive.DateTime); ok {
-					t := establish_date.Time()
-					tmp["establish_date"] = qu.FormatDate(&t, qu.Date_Short_Layout)
-				}
+			if establish_date := qu.ObjToString(data["establish_date"]); establish_date != "" {
+				tmp["establish_date"] = establish_date
 			}
+			// if data["establish_date"] != nil {
+			// 	if establish_date, ok := data["establish_date"].(primitive.DateTime); ok {
+			// 		t := establish_date.Time()
+			// 		tmp["establish_date"] = qu.FormatDate(&t, qu.Date_Short_Layout)
+			// 	}
+			// }
 			//经营范围
 			if business_scope := qu.ObjToString(data["business_scope"]); business_scope != "" {
 				tmp["business_scope"] = business_scope
@@ -560,30 +563,39 @@ func SearchEnterpriseInfo(tmp map[string]interface{}) {
 				tmp["winner_credit_no"] = credit_no
 			}
 			//股东名单
-			if partners, ok := data["partners"].(primitive.A); ok && len(partners) > 0 {
-				stock_name_arr := []string{}
-				for _, partner := range partners {
-					p := partner.(map[string]interface{})
-					if stock_name := qu.ObjToString(p["stock_name"]); stock_name != "" {
-						stock_name_arr = append(stock_name_arr, stock_name)
-					}
-				}
-				if len(stock_name_arr) > 0 {
-					tmp["stock_name"] = strings.Join(stock_name_arr, ",")
-				}
+			if stock_name := qu.ObjToString(data["stock_name"]); stock_name != "" {
+				tmp["stock_name"] = stock_name
 			}
-			//从最新年报中获取 中标单位联系电话、中标单位邮箱
-			if annual_reports, ok := data["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
-				anreport := Sort_year_report(annual_reports)
-				if len(anreport) > 0 {
-					if email := qu.ObjToString(anreport["company_email"]); email != "" {
-						tmp["company_email"] = email
-					}
-					if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
-						tmp["company_phone"] = phone
-					}
-				}
+			// if partners, ok := data["partners"].(primitive.A); ok && len(partners) > 0 {
+			// 	stock_name_arr := []string{}
+			// 	for _, partner := range partners {
+			// 		p := partner.(map[string]interface{})
+			// 		if stock_name := qu.ObjToString(p["stock_name"]); stock_name != "" {
+			// 			stock_name_arr = append(stock_name_arr, stock_name)
+			// 		}
+			// 	}
+			// 	if len(stock_name_arr) > 0 {
+			// 		tmp["stock_name"] = strings.Join(stock_name_arr, ",")
+			// 	}
+			// }
+			if email := qu.ObjToString(data["company_email"]); email != "" {
+				tmp["company_email"] = email
 			}
+			if phone := qu.ObjToString(data["company_phone"]); phone != "" {
+				tmp["company_phone"] = phone
+			}
+			//从最新年报中获取 中标单位联系电话、中标单位邮箱
+			// if annual_reports, ok := data["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
+			// 	anreport := Sort_year_report(annual_reports)
+			// 	if len(anreport) > 0 {
+			// 		if email := qu.ObjToString(anreport["company_email"]); email != "" {
+			// 			tmp["company_email"] = email
+			// 		}
+			// 		if phone := qu.ObjToString(anreport["company_phone"]); phone != "" {
+			// 			tmp["company_phone"] = phone
+			// 		}
+			// 	}
+			// }
 		}
 	}
 }

src/service/second_push.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"encoding/json"
-	"github.com/tealeg/xlsx"
 	"history"
 	"log"
 	"os"
@@ -15,29 +14,30 @@ import (
 	"time"
 	. "util"
 
+	"github.com/tealeg/xlsx"
+
 	"github.com/go-xweb/xweb"
 
 	"gopkg.in/mgo.v2/bson"
 )
+
 var projectIdMap = sync.Map{}
 var xlsxArr []map[string]interface{}
 
 type SecondPush struct {
 	*xweb.Action
-	secondPush    xweb.Mapper `xweb:"/service/secondpush/create"`
-	getUserRule    xweb.Mapper `xweb:"/service/secondpush/getrules"`
-	saveSpushRule    xweb.Mapper `xweb:"/service/secondpush/saverule"`
+	secondPush        xweb.Mapper `xweb:"/service/secondpush/create"`
+	getUserRule       xweb.Mapper `xweb:"/service/secondpush/getrules"`
+	saveSpushRule     xweb.Mapper `xweb:"/service/secondpush/saverule"`
 	secondPushTask    xweb.Mapper `xweb:"/service/secondpush/dotask"`
-	addSecondPushRule    xweb.Mapper `xweb:"/service/secondpush/add"`  //保存二次推送规则
+	addSecondPushRule xweb.Mapper `xweb:"/service/secondpush/add"` //保存二次推送规则
 	secondPushList    xweb.Mapper `xweb:"/service/secondpush/list"`
-	secondPushClone    xweb.Mapper `xweb:"/service/secondPushClone/(.*)"`
-	delSecondPushRule       xweb.Mapper `xweb:"/service/customer/secondpush/delrule"`    //删除历史任务规则
+	secondPushClone   xweb.Mapper `xweb:"/service/secondPushClone/(.*)"`
+	delSecondPushRule xweb.Mapper `xweb:"/service/customer/secondpush/delrule"` //删除历史任务规则
 
 }
 
-
-
-func (s *SecondPush)SecondPush(){
+func (s *SecondPush) SecondPush() {
 	defer qu.Catch()
 	id := s.GetString("id")
 	user := s.GetSession("user").(map[string]interface{})
@@ -79,7 +79,7 @@ func (s *SecondPush)SecondPush(){
 	s.Render("private/second_push_create.html", &s.T)
 }
 
-func (s *SecondPush)GetUserRule(){
+func (s *SecondPush) GetUserRule() {
 	customerId := s.GetString("c_id")
 	query := bson.M{
 		"s_userid": customerId,
@@ -91,7 +91,7 @@ func (s *SecondPush)GetUserRule(){
 		for _, m := range *data {
 			history_rule_data := make(map[string]interface{})
 			q := bson.M{
-				"s_departid": qu.BsonIdToSId(m["_id"]),
+				"s_departid": mongoutil.BsonIdToSId(m["_id"]),
 				"b_delete":   false,
 			}
 			history_rule_data["department_isuse"] = m["i_isuse"]
@@ -99,7 +99,7 @@ func (s *SecondPush)GetUserRule(){
 			depart_rule_data, _ := Mgo.Find("euserdepartrule", q, `{"i_createtime":-1}`, `{"s_name":1,"i_updatetime":1,"i_isuse":1,"_id":1}`, false, 0, 0)
 			if depart_rule_data != nil && len(*depart_rule_data) != 0 {
 				for _, j := range *depart_rule_data {
-					j["_id"] = qu.BsonIdToSId(j["_id"])
+					j["_id"] = mongoutil.BsonIdToSId(j["_id"])
 				}
 				history_rule_data["department_rule"] = depart_rule_data
 				history_rule_data["is_slected"] = true
@@ -107,8 +107,8 @@ func (s *SecondPush)GetUserRule(){
 			res = append(res, history_rule_data)
 		}
 		s.ServeJson(map[string]interface{}{
-			"status":    "success",
-			"data":      res,
+			"status": "success",
+			"data":   res,
 		})
 	} else {
 		s.ServeJson(map[string]interface{}{
@@ -220,7 +220,7 @@ func (s *SecondPush) SaveSpushRule() {
 func (s *SecondPush) SecondPushTask() {
 	log.Println("开始二次推送任务...")
 	s_pushid := s.GetString("s_pushid")
-	if s_pushid != ""{
+	if s_pushid != "" {
 		customer, _ := Mgo.Find("second_push", map[string]interface{}{"_id": mongoutil.StringTOBsonId(s_pushid)}, nil, nil, false, -1, -1)
 		if len(*customer) == 1 {
 			c := (*customer)[0]
@@ -228,47 +228,48 @@ func (s *SecondPush) SecondPushTask() {
 			email := qu.ObjToString(c["sendMail"])
 			starttime := qu.Int64All(c["starttime"])
 			endtime := qu.Int64All(c["endtime"])
-			if len(c)!=0&&c != nil{
-				if c["dep_rules"] !=nil&&len(c["dep_rules"].([]interface{}))!=0{
-					for _,m := range c["dep_rules"].([]interface{}){
-						log.Println("ruleid",mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]))
+			if len(c) != 0 && c != nil {
+				if c["dep_rules"] != nil && len(c["dep_rules"].([]interface{})) != 0 {
+					for _, m := range c["dep_rules"].([]interface{}) {
+						log.Println("ruleid", mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]))
 						q := bson.M{
-							"ruleid":mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]),
-							"createtime":bson.M{
-								"$gte":starttime,
-								"$lte":endtime,
+							"ruleid": mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]),
+							"createtime": bson.M{
+								"$gte": starttime,
+								"$lte": endtime,
 							},
 						}
-						d,_:=MgoSecondPush.Find("usermail_0806_01",q,nil,nil,false,0,0)
-						if len(*d)>0&&d !=nil{
-							for _,l := range *d{
-								xlsxArr=append(xlsxArr, l)
+						d, _ := MgoSecondPush.Find("usermail_0806_01", q, nil, nil, false, 0, 0)
+						if len(*d) > 0 && d != nil {
+							for _, l := range *d {
+								xlsxArr = append(xlsxArr, l)
 							}
 						}
 					}
-				}else{
+				} else {
 					q := bson.M{
-						"appid":c["s_appid"] ,
-						"createtime":bson.M{
-							"$gte":starttime,
-							"$lte":endtime,
+						"appid": c["s_appid"],
+						"createtime": bson.M{
+							"$gte": starttime,
+							"$lte": endtime,
 						},
 					}
-					d,_:=MgoSecondPush.Find("usermail_0806_01",q,nil,nil,false,0,0)
-					for _,l := range *d{
-						xlsxArr=append(xlsxArr, l)
+
+					d, _ := MgoSecondPush.Find("usermail", q, nil, nil, false, 0, 0)
+					for _, l := range *d {
+						xlsxArr = append(xlsxArr, l)
 					}
 				}
-				if len(xlsxArr) == 0{
+				if len(xlsxArr) == 0 {
 					log.Println("查询数据为空")
-				}else{
+				} else {
 					log.Println(len(xlsxArr))
 					GetXlsxs(xlsxArr, customer_name, email, s_pushid)
 					go UpdateHistoryState(2, s_pushid, len(xlsxArr))
 					s.ServeJson(map[string]interface{}{
-						"status":true,
+						"status": true,
 					})
-					xlsxArr =[]map[string]interface{}{}
+					xlsxArr = []map[string]interface{}{}
 				}
 			}
 		} else {
@@ -544,7 +545,7 @@ func (s *SecondPush) AddSecondPushRule() {
 					"sendMail":        s.GetString("sendMail"),
 					"i_extfieldstype": i_extfieldstype,
 					"starttime":       s.GetString("starttime"),
-					"endtime":       s.GetString("endtime"),
+					"endtime":         s.GetString("endtime"),
 				},
 			}
 			isupdata := Mgo.UpdateById("second_push", mongoutil.StringTOBsonId(his_id), set)
@@ -608,4 +609,4 @@ func (s *SecondPush) DelSecondPushRule() {
 			}
 		}
 	}
-}
+}

src/util/utiltag.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"models"
 	"qfw/util"
 	"qfw/util/elastic"
@@ -13,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	// "go.mongodb.org/mongo-driver/bson/primitive"
+
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -175,20 +176,24 @@ func UtilEsFind1(tags map[string]interface{}) (error, int64) {
 						if legal_person := util.ObjToString(finddata["legal_person"]); legal_person != "" {
 							item["legal_person"] = legal_person
 						}
-						//从最新年报中获取 中标单位联系电话、中标单位邮箱
-						if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
-							report_year := Sort_year_report(annual_reports)//最新年报
-							 if len(report_year)>0{
-								 if email := util.ObjToString(report_year["company_email"]); email != "" {
-									 item["company_email"] = email
-								 }
-								 if phone := util.ObjToString(report_year["company_phone"]); phone != "" {
-									 item["company_phone"] = phone
-								 }
-							 }
-
-
+						if email := util.ObjToString(finddata["company_email"]); email != "" {
+							item["company_email"] = email
 						}
+						if phone := util.ObjToString(finddata["company_phone"]); phone != "" {
+							item["company_phone"] = phone
+						}
+						//从最新年报中获取 中标单位联系电话、中标单位邮箱
+						// if annual_reports, ok := finddata["annual_reports"].(primitive.A); ok && len(annual_reports) > 0 {
+						// 	report_year := Sort_year_report(annual_reports) //最新年报
+						// 	if len(report_year) > 0 {
+						// 		if email := util.ObjToString(report_year["company_email"]); email != "" {
+						// 			item["company_email"] = email
+						// 		}
+						// 		if phone := util.ObjToString(report_year["company_phone"]); phone != "" {
+						// 			item["company_phone"] = phone
+						// 		}
+						// 	}
+						// }
 						item["qyk"] = finddata
 					}
 				}
@@ -624,5 +629,3 @@ func method3(arr []string) []string {
 	}
 	return sArr
 }
-
-

src/web/templates/private/customer_history.html

@@ -113,8 +113,8 @@
                                                 <div class="col-sm-2">
                                                     <select class="form-control selectpicker" id="extfiledselect">
                                                         <option value="2">高级字段包</option>
-                                                        <option value="1">初级字段包</option>
-                                                        <option value="3">特殊字段包</option>
+                                                        <option value="1">标准字段包</option>
+                                                        <option value="3">深信服字段包</option>
                                                     </select>
                                                     <script>
                                                         $('#extfiledselect').on("change", function () {

src/web/templates/private/historylog_list.html

@@ -35,7 +35,7 @@
                                         <th>状态</th>
                                         <th>数据总量</th>
                                         <th>创建时间</th>
-                                        <th>修改时间</th>
+                                        <th>完成时间</th>
                                         <th>操作</th>
                                     </tr>
                                     </thead>
@@ -160,8 +160,11 @@
                     }
                 },
                 {
-                    "data": "updatetime",
+                    "data": "finishtime",
                     render: function(val) {
+                        if (val === undefined){
+                            return "未执行"
+                        }
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000)
                         return dt.format("yyyy-MM-dd hh:mm:ss")