Merge branch 'dev3.4' of http://39.105.157.10:10080/qmx/jy-data-extract into dev3.4

src/jy/admin/audit/agencyinfo.go

@@ -9,6 +9,7 @@ import (
 	"jy/util"
 	"log"
 	"qfw/util/elastic"
+	"qfw/util/redis"
 	"strconv"
 	"strings"
 	"time"
@@ -111,13 +112,21 @@ func init() {
 				return
 			}else {
 				delete(e, "_id")
-				qykredis := util.QykRedisPool.Conn()
+				qykredis := redis.RedisPool[util.QYK_RedisName].Get()
 				defer qykredis.Close()
-				if saveRedis:=qykredis.Set(agency_name,sid,0);saveRedis.Err()!= nil{
-					log.Println("保存redis 错误",saveRedis.Err())
-					c.JSON(200, gin.H{"rep": 500,"err":"保存reids出错"})
+				if _,err := qykredis.Do("SELECT",util.AgencyDB);err != nil{
+					log.Println("保存redis 错误", err)
+					c.JSON(200, gin.H{"rep": 500, "err": "select reids出错"})
 					return
+				}else {
+					if _,saveRedisErr := qykredis.Do("SET",agency_name, sid); saveRedisErr != nil {
+						log.Println("保存redis 错误", saveRedisErr)
+						c.JSON(200, gin.H{"rep": 500, "err": "保存reids出错"})
+						return
+					}
 				}
+
+
 				escon := elastic.GetEsConn()
 				defer elastic.DestoryEsConn(escon)
 				_, err := escon.Index().Index(util.ElasticClientAgencyIndex).Type(util.ElasticClientAgencyType).Id(sid).BodyJson(e).Refresh(true).Do()
@@ -188,17 +197,25 @@ func init() {
 		agency_name := c.PostForm("agency_name")
 		if bson.IsObjectIdHex(_id) {
 			delisok := Mgo.Del(util.ElasticClientAgencyDB, bson.M{"_id": bson.ObjectIdHex(_id)})
-			if !delisok{
-				c.JSON(200, gin.H{"rep": 500,"err":"删除mongo错误"})
+			if !delisok {
+				c.JSON(200, gin.H{"rep": 500, "err": "删除mongo错误"})
 				return
 			}
-			qykredis := util.QykRedisPool.Conn()
+			qykredis := redis.RedisPool[util.QYK_RedisName].Get()
 			defer qykredis.Close()
-			if del := qykredis.Del(agency_name);del.Err()!=nil{
-				log.Println("delete agency err:", del.Err(),agency_name)
-				c.JSON(200, gin.H{"rep": 500,"err":"删除redis错误"})
+			if _,err :=qykredis.Do("SELECT",util.AgencyDB);err!=nil{
+				log.Println("delete agency err:", err, agency_name)
+				c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
 				return
+			}else {
+				if _,delErr := qykredis.Do("DEL",agency_name); delErr != nil {
+					log.Println("delete agency err:", delErr, agency_name)
+					c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
+					return
+				}
 			}
+
+
 			escon := elastic.GetEsConn()
 			defer elastic.DestoryEsConn(escon)
 			_, err := escon.Delete().Index(util.ElasticClientAgencyIndex).Type(util.ElasticClientAgencyType).Id(_id).Refresh(true).Do()

src/jy/admin/audit/buyerinfo.go

@@ -9,6 +9,7 @@ import (
 	"jy/util"
 	"log"
 	"qfw/util/elastic"
+	"qfw/util/redis"
 	"strconv"
 	"strings"
 	"time"
@@ -113,13 +114,24 @@ func init() {
 				return
 			}else {
 				delete(e, "_id")
-				qykredis := util.QykRedisPool.Conn()
+				qykredis := redis.RedisPool[util.QYK_RedisName].Get()
 				defer qykredis.Close()
-				if saveRedis:=qykredis.Set(buyer_name,sid,0);saveRedis.Err()!= nil{
-					log.Println("保存redis 错误",saveRedis.Err())
-					c.JSON(200, gin.H{"rep": 500,"err":"保存reids出错"})
+				if _,err := qykredis.Do("SELECT",util.BuyerDB);err != nil{
+					log.Println("保存redis 错误", err)
+					c.JSON(200, gin.H{"rep": 500, "err": "select reids出错"})
 					return
+				}else {
+					if _,saveRedisErr := qykredis.Do("SET",buyer_name, sid); saveRedisErr != nil {
+						log.Println("保存redis 错误", saveRedisErr)
+						c.JSON(200, gin.H{"rep": 500, "err": "保存reids出错"})
+						return
+					}
 				}
+
+
+
+
+
 				escon := elastic.GetEsConn()
 				defer elastic.DestoryEsConn(escon)
 				_, err := escon.Index().Index(util.ElasticClientBuyerIndex).Type(util.ElasticClientBuyerType).Id(sid).BodyJson(e).Refresh(true).Do()
@@ -189,17 +201,25 @@ func init() {
 		buyer_name := c.PostForm("buyer_name")
 		if bson.IsObjectIdHex(_id) {
 			delisok := Mgo.Del(util.ElasticClientBuyerDB, bson.M{"_id": bson.ObjectIdHex(_id)})
-			if !delisok{
-				c.JSON(200, gin.H{"rep": 500,"err":"删除mongo错误"})
+			if !delisok {
+				c.JSON(200, gin.H{"rep": 500, "err": "删除mongo错误"})
 				return
 			}
-			qykredis := util.QykRedisPool.Conn()
+			qykredis := redis.RedisPool[util.QYK_RedisName].Get()
 			defer qykredis.Close()
-			if del := qykredis.Del(buyer_name);del.Err()!=nil{
-				log.Println("delete buyer err:", del.Err(),buyer_name)
-				c.JSON(200, gin.H{"rep": 500,"err":"删除redis错误"})
+			if _,err :=qykredis.Do("SELECT",util.BuyerDB);err!=nil{
+				log.Println("delete buyer err:", err, )
+				c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
 				return
+			}else {
+				if _,delErr := qykredis.Do("DEL",buyer_name); delErr != nil {
+					log.Println("delete buyer err:", delErr, buyer_name)
+					c.JSON(200, gin.H{"rep": 500, "err": "删除redis错误"})
+					return
+				}
 			}
+
+
 			escon := elastic.GetEsConn()
 			defer elastic.DestoryEsConn(escon)
 			_, err := escon.Delete().Index(util.ElasticClientBuyerIndex).Type(util.ElasticClientBuyerType).Id(_id).Refresh(true).Do()

src/web/templates/admin/agencyinfo.html

@@ -162,11 +162,11 @@
     function AddAgencyHTML() {
         $("#infos").html("");
         $("#info_title").html("新增代理机构信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">代理机构名称：</label>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">机构名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\"></div></div>" +
@@ -178,9 +178,9 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">机构地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -233,7 +233,6 @@
             return
         }
 
-        return
         //新增代理机构api
         $.post("/admin/audit/agency_info/save", {
             "agency_name": agency_name,
@@ -293,11 +292,11 @@
     function editdata(_obj) {
         $("#infos").html("");
         $("#info_title").html("编辑采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
-            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\" value='" + _obj.agency_name + "'></div></div>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">机构名称：</label>" +
+            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\" readonly=\"true\" value='" + _obj.agency_name + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\"  value='" + _obj.area_code + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\" value='" + _obj.type + "'></div></div>" +
@@ -309,9 +308,9 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\" value='" + _obj.city + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\" value='" + _obj.district + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">机构地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\" value='" + _obj.address + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='" + _obj.website + "'></div></div>" +
@@ -344,8 +343,7 @@
         var address = $("#s_address").val();                    //代理机构地址
         var wechat_accounts = $("#s_wechat_accounts").val();    //微信公众号
         var website = $("#s_website").val();                    //网址
-        var contact = editor_add.getText();                     //联系人
-        var contact = editor_update.getText();//联系人
+        var contact = editor_update.getText();                  //联系人
         if (typeof contact == 'string') {
             try {
                 var obj=JSON.parse(contact);
@@ -364,8 +362,6 @@
             alert("红色标签的表单不能为空！");
             return
         }
-        return
-
 
 
         //新增企业库api
@@ -382,6 +378,7 @@
             "address": address,
             "wechat_accounts": wechat_accounts,
             "website": website,
+            "contact":contact,
 
         }, function (data) {
             if (data && data.rep) {

src/web/templates/admin/buyerinfo.html

@@ -162,11 +162,11 @@
     function AddBuyerHTML() {
         $("#infos").html("");
         $("#info_title").html("新增采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">单位名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\"></div></div>" +
@@ -178,11 +178,11 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位类型：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyerclass\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -236,7 +236,6 @@
             return
         }
 
-        return
         //新增采购单位api
         $.post("/admin/audit/buyer_info/save", {
             "buyer_name": buyer_name,
@@ -297,11 +296,11 @@
     function editdata(_obj) {
         $("#infos").html("");
         $("#info_title").html("编辑采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
-            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\" value='" + _obj.buyer_name + "'></div></div>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">单位名称：</label>" +
+            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\" readonly=\"true\" value='" + _obj.buyer_name + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\"  value='" + _obj.area_code + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\" value='" + _obj.type + "'></div></div>" +
@@ -313,11 +312,11 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\" value='" + _obj.city + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\" value='" + _obj.district + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位类型：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyerclass\" value='" + _obj.buyerclass + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\" value='" + _obj.address + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='" + _obj.website + "'></div></div>" +
@@ -339,7 +338,7 @@
             alert("id不存在！");
             return
         }
-        var buyer_name = $("#s_buyer_name").val();          //采购单位名称
+        var buyer_name = $("#s_buyer_name").val();              //采购单位名称
         var history_name = $("#s_history_name").val();          //历史名称
         var area_code = $("#s_area_code").val();                //行政区划代码
         var type = $("#s_type").val();                          //单位类型
@@ -351,7 +350,7 @@
         var address = $("#s_address").val();                    //采购单位地址
         var wechat_accounts = $("#s_wechat_accounts").val();    //微信公众号
         var website = $("#s_website").val();                    //网址
-        var contact = editor_update.getText();//联系人
+        var contact = editor_update.getText();                  //联系人
         if (typeof contact == 'string') {
             try {
                 var obj=JSON.parse(contact);
@@ -371,8 +370,6 @@
             return
         }
 
-        return
-
         //新增企业库api
         $.post("/admin/audit/buyer_info/save", {
             "_id": _id,
@@ -388,6 +385,7 @@
             "address": address,
             "wechat_accounts": wechat_accounts,
             "website": website,
+            "contact":contact,
 
         }, function (data) {
             if (data && data.rep) {

src/web/templates/admin/qiyekuinfo.html

@@ -254,7 +254,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_alias\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\" ></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">省份：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_province\"></div></div>" +
@@ -268,7 +268,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_address\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">经营范围：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_business_scope\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">公众号：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">网址：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -550,7 +550,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_alias\" value='" + _obj.alias + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" value='"+_obj.area_code+"' ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">省份：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_province\" value='" + _obj.province + "'></div></div>" +
@@ -564,7 +564,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_address\" value='" + _obj.company_address + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">经营范围：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_business_scope\" value='"+_obj.business_scope+"'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">公众号：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">网址：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='"+_obj.website+"'></div></div>" +

udp_winner/timedTaskAgency.go

@@ -338,7 +338,7 @@ func TimedTaskAgency() {
 			if !iter.Next(&tmpLast) {
 				//临时表无数据
 				log.Println("临时表无数据:")
-				t2.Reset(time.Minute * 5)
+				t2.Reset(time.Second * 15)
 				FClient.DestoryMongoConn(Fcconn)
 				continue
 			} else {

udp_winner/timedTaskBuyer.go

@@ -375,7 +375,7 @@ func TimedTaskBuyer() {
 			if !iter.Next(&tmpLast) {
 				//临时表无数据
 				log.Println("临时表无数据:")
-				t2.Reset(time.Minute * 5)
+				t2.Reset(time.Second * 15)
 				FClient.DestoryMongoConn(Fcconn)
 				continue
 			} else {
@@ -388,7 +388,7 @@ func TimedTaskBuyer() {
 				}).Sort("_id").Iter()
 				if cursor == nil {
 					log.Println("查询失败")
-					t2.Reset(time.Second * 5)
+					t2.Reset(time.Second * 15)
 					FClient.DestoryMongoConn(fconn)
 					continue
 				}

udpcreateindex/src/projectindex.go

@@ -54,7 +54,18 @@ func projectTask(data []byte, mapInfo map[string]interface{}) {
 					}
 				}
 			}
+		} else {
+			winner := util.ObjToString(tmp["winner"])
+			bidamount := util.Float64All(tmp["bidamount"])
+			if len(winner) > 4 && bidamount > 0 {
+				p := map[string]interface{}{
+					"winner":    winner,
+					"bidamount": bidamount,
+				}
+				pp[winner] = p
+			}
 		}
+
 		pk1 := []map[string]interface{}{}
 		for _, v := range pp {
 			pk1 = append(pk1, v)