Bläddra i källkod

1.数据库端口
2.企业库增删改查
3.项目名称抽取优化

fengweiqiang 5 år sedan
förälder
incheckning
2d2a4abc72

+ 1 - 1
src/config.json

@@ -1,6 +1,6 @@
 {
     "port": "9090",
-    "mgodb": "192.168.3.207:27082",
+    "mgodb": "192.168.3.207:27092",
     "dbsize": 10,
     "dbname": "extract_kf",
     "redis": "buyer=127.0.0.1:6379,winner=127.0.0.1:6379,agency=127.0.0.1:6379",

+ 149 - 0
src/jy/admin/audit/qiyeku.go

@@ -0,0 +1,149 @@
+package audit
+
+import (
+	"github.com/gin-gonic/gin"
+	"gopkg.in/mgo.v2/bson"
+	. "jy/admin"
+	"jy/clear"
+	. "jy/mongodbutil"
+	"strconv"
+	"strings"
+	"time"
+)
+
+/**
+企业库
+ */
+func init() {
+	//页面
+	Admin.GET("/audit/qiyeku_info", func(c *gin.Context) {
+		c.HTML(200, "qiyekuinfo.html", gin.H{})
+	})
+	//save
+	Admin.POST("/audit/qiyeku_info/save", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		company_name := c.PostForm("company_name")
+		alias := c.PostForm("alias")
+		province := c.PostForm("province")
+		city := c.PostForm("city")
+		district := c.PostForm("district")
+		capital := c.PostForm("capital")
+		company_address := c.PostForm("company_address")
+		if strings.TrimSpace(company_name) == "" {
+			c.JSON(200, gin.H{"rep": 400})
+			return
+		}
+		e := make(map[string]interface{})
+		e["company_name"] = company_name
+		e["alias"] = alias
+		e["province"] = province
+		e["city"] = city
+		e["district"] = district
+		e["capital"] = clear.ObjToMoney([]interface{}{capital, ""})[0]
+		e["company_address"] = company_address
+		var sid string
+		if strings.TrimSpace(_id) != "" && bson.IsObjectIdHex(_id) {
+			sid = _id
+			Mgo.Update("enterprise_qyxy", bson.M{"_id": bson.ObjectIdHex(_id)}, bson.M{"$set": bson.M{
+				"company_name":    company_name,
+				"alias":           alias,
+				"province":        province,
+				"city":            city,
+				"district":        district,
+				"capital":         capital,
+				"company_address": company_address,
+			}}, false, false)
+		} else {
+			sid = Mgo.Save("enterprise_qyxy", e)
+		}
+		c.JSON(200, gin.H{"rep": 200, "saveid": sid})
+	})
+	//列表查询
+	Admin.POST("/audit/query_qyk/list", func(c *gin.Context) {
+		search, _ := c.GetPostForm("search[value]")
+		startstr, _ := c.GetPostForm("start")
+		limitstr, _ := c.GetPostForm("length")
+		start, _ := strconv.Atoi(startstr)
+		limit, _ := strconv.Atoi(limitstr)
+		if search == "" {
+			c.JSON(200, gin.H{"data": []map[string]interface{}{}, "recordsFiltered": 0, "recordsTotal": 0})
+		} else {
+			count := Mgo.Count("enterprise_qyxy", bson.M{"company_name": bson.M{"$regex": bson.RegEx{search, "i"}}})
+			data, _ := Mgo.Find("enterprise_qyxy", bson.M{"company_name": bson.M{"$regex": bson.RegEx{search, "i"}}}, `{"_id":-1}`, nil, false, start, limit)
+			c.JSON(200, gin.H{"data": data, "recordsFiltered": count, "recordsTotal": count})
+		}
+	})
+	//delete
+	Admin.POST("/audit/qiyeku_info/deleteQyk", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		if bson.IsObjectIdHex(_id) {
+			delisok := Mgo.Del("enterprise_qyxy", bson.M{"_id": bson.ObjectIdHex(_id)})
+			c.JSON(200, gin.H{"rep": 200, "data": delisok})
+		} else {
+			c.JSON(200, gin.H{"rep": 400})
+		}
+	})
+	//queryById
+	Admin.POST("/audit/query_qyk/ById", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		q_field := c.PostForm("q_field")
+		if bson.IsObjectIdHex(_id) && strings.TrimSpace(q_field) != "" {
+			data, _ := Mgo.FindById("enterprise_qyxy", _id, bson.M{q_field: 1})
+			c.JSON(200, gin.H{"rep": 200, "data": data})
+		} else {
+			c.JSON(200, gin.H{"rep": 400})
+		}
+	})
+	//updateIndustrys
+	Admin.POST("/audit/query_qyk/UpdateIndustrys", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		industrys := c.PostFormArray("industry")
+		//log.Println(_id,industrys)
+		if bson.IsObjectIdHex(_id) {
+			b := Mgo.Update("enterprise_qyxy", bson.M{"_id": bson.ObjectIdHex(_id)}, bson.M{"$set": bson.M{"industry": industrys}}, false, false)
+			c.JSON(200, gin.H{"rep": 200, "data": b})
+		} else {
+			c.JSON(200, gin.H{"rep": 400})
+		}
+	})
+	//updateTels
+	Admin.POST("/audit/query_qyk/UpdateTels", func(c *gin.Context) {
+		_id := c.PostForm("_id")
+		//log.Println(_id)
+		contact_persons := c.PostFormArray("contact_persons")
+		contact_types := c.PostFormArray("contact_types")
+		phones := c.PostFormArray("phones")
+		topscopeclasss := c.PostFormArray("topscopeclasss")
+		if bson.IsObjectIdHex(_id) && len(contact_persons) == len(contact_types) && len(phones) == len(topscopeclasss) && len(phones) == len(contact_persons) {
+			contacts := make([]map[string]interface{}, 0)
+			for _, v := range contact_persons {
+				tmp := make(map[string]interface{})
+				tmp["contact_person"] = v
+				contacts = append(contacts, tmp)
+			}
+			for i, v := range contact_types {
+				contacts[i]["contact_type"] = v
+			}
+			for i,v := range phones{
+				contacts[i]["phone"] = v
+			}
+			for i,v := range topscopeclasss{
+				contacts[i]["topscopeclass"] = v
+				contacts[i]["updatetime"] = time.Now().Unix()
+			}
+			//for k,v := range contacts{
+			//	log.Println(k,v)
+			//}
+			b := Mgo.Update("enterprise_qyxy", bson.M{"_id": bson.ObjectIdHex(_id)}, bson.M{"$set": bson.M{"contact": contacts}}, false, false)
+			c.JSON(200, gin.H{"rep": 200, "data": b})
+		} else {
+			c.JSON(200, gin.H{"rep": 400})
+		}
+		//if bson.IsObjectIdHex(_id) {
+		//	b := Mgo.Update("enterprise_qyxy", bson.M{"_id": bson.ObjectIdHex(_id)}, bson.M{"$set": bson.M{"industry": industrys}}, false, false)
+		//	c.JSON(200, gin.H{"rep": 200, "data": b})
+		//} else {
+		//	c.JSON(200, gin.H{"rep": 400})
+		//}
+	})
+}

+ 1 - 1
src/jy/extract/extract.go

@@ -290,7 +290,7 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
 		subtype = "all"
 	}
 	toMap := qu.ObjToMap(doc["jsondata"])
-	if toMap != nil {
+	if (*toMap) != nil {
 		if (*toMap)["extweight"] == nil {
 			(*toMap)["extweight"] = ju.Config["jsondata_extweight"]
 		}

+ 3 - 0
src/jy/pretreated/colonkv.go

@@ -709,6 +709,7 @@ func HasOrderContactType(text string) []string {
 //from 1--全文 2--table td 3--table td解析采购单位联系人 4--分包
 func GetKVAll(content, title string, contactFormat *ContactFormat, from int,isSite bool,codeSite string) *JobKv {
 	content = formatText(content, "kv")
+	//log.Println(content)
 	m1Kvs, _ := colonkvEntity.entrance(content, title, contactFormat, from,isSite,codeSite)
 	//	for _, kvs := range m1Kvs {
 	//		qutil.Debug(kvs.Key, kvs.Value)
@@ -833,6 +834,8 @@ func GetKvTags(findkvs []*Kv, title string, tagdbs []string,isSite bool,codeSite
 						nextval += GetMoneyUnit(k, nextval)
 					}
 					kvTags[tk.Value] = append(kvTags[tk.Value], &Tag{Key: k, Value: nextval, Weight: tk.Weight})
+				}else if tk.Value == "项目名称" && nextval != ""{
+					kvTags[tk.Value] = append(kvTags[tk.Value], &Tag{Key: k, Value: nextval, Weight: tk.Weight})
 				}
 			}
 		} else {

+ 474 - 0
src/web/templates/admin/qiyekuinfo.html

@@ -0,0 +1,474 @@
+{{template "inc"}}
+<!-- Main Header -->
+{{template "header"}}
+<!-- Left side column. 权限菜单 -->
+{{template "memu"}}
+<link href="/res/other/css/other.css" rel="stylesheet" type="text/css">
+<style>
+    #dataTable_filter div {
+        padding: 0px 10px;
+    }
+
+    .operate a {
+        padding: 5px 10px;
+    }
+</style>
+<div class="content-wrapper">
+    <section class="content-header" style="padding: 49px 15px 0 15px;">
+        <h1>
+            <small><a class="btn btn-primary opraaa" opraaa="newqyk">新增企业库信息</a></small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="#"><i class="fa fa-dashboard"></i> 企业库增删改查</a></li>
+        </ol>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="box">
+                    <div class="box-body">
+                        <table id="dataTable" class="table table-bordered table-hover">
+                            <thead>
+                            <tr>
+                                <th>企业名称</th>
+                                <th>别名</th>
+                                <th>省份</th>
+                                <th>城市</th>
+                                <th>区县</th>
+                                <th>注册资本</th>
+                                <th>企业地址</th>
+                                <th>操作</th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                    <!-- /.box-body -->
+                </div>
+                <!-- /.box -->
+            </div>
+        </div>
+    </section>
+
+</div>
+<div class="modal fade" id="info_data">
+    <div class="modal-dialog">
+        <form id="update-dataform" class="form-horizontal" role="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="info_title"></h4>
+                </div>
+                <div class="modal-body" id="infos">
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </form>
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+{{template "dialog"}}
+{{template "footer"}}
+<script>
+    menuActive("qiyeku_info")
+    var ttable = {}
+    $(function () {
+        ttable = $('#dataTable').DataTable({
+            "paging": true,
+            "lengthChange": false,
+            "searching": true,
+            "ordering": false,
+            "info": true,
+            "autoWidth": false,
+            "serverSide": true,
+            "ajax": {
+                "url": "/admin/audit/query_qyk/list",
+                "type": "post",
+            },
+            "language": {
+                "url": "/res/dist/js/dataTables.chinese.lang"
+            },
+            "columns": [
+                {
+                    "data": "company_name", "width": "18%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "alias", "width": "11%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "province", "width": "4%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "city", "width": "4%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "district", "width": "4%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "capital", "width": "6%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "company_address", "width": "17%", render: function (val, a, row) {
+                        if (val == null) {
+                            return ""
+                        }
+                        return val
+                    }
+                },
+                {
+                    "data": "_id", "width": "24%", render: function (val, a, row) {
+                        var valueStr = JSON.stringify(row);
+                        return "<div class='operate'>" +
+                            "<a class='btn btn-primary' onclick='editdata(" + valueStr + ")'>编辑</a>&nbsp;" +
+                            "<a class='btn btn-default' onclick='showHylxs(\"" + val + "\")'>详细行业类型</a>&nbsp;" +
+                            "<a class='btn btn-sm btn-warning' onclick='showTels(\"" + val + "\")'>详细联系方式</a>&nbsp;" +
+                            "<a class='btn btn-sm btn-danger' onclick='deleteQyk(\"" + val + "\")'>删除</a>&nbsp;" +
+                            "</div>"
+                    }
+                }
+            ]
+        });
+        /*新增企业库*/
+        ttable.on('init.dt', function () {
+            $(".opraaa").click(function () {
+                var n = $(this).attr("opraaa");
+                var _tit = "", htmlObj = {}, obj, tag = [];
+                switch (n) {
+                    case "newqyk":
+                        tag = [
+                            {label: "企业名称:", s_label: "s_company_name", must: true},
+                            {label: "别名:", s_label: "s_alias"},
+                            {label: "省份:", s_label: "s_province"},
+                            {label: "城市:", s_label: "s_city"},
+                            {label: "区县:", s_label: "s_district"},
+                            {label: "注册资本:", s_label: "s_capital", placeholder: "示例:45678.98元;456.78万元;1234.25;"},
+                            {label: "企业地址:", s_label: "s_company_address"},
+                        ];
+                        //新增企业库按钮
+                        htmlObj = {
+                            title: "新增企业库信息",
+                            tag: tag,
+                            bts: [
+                                {
+                                    label: "Save", class: "btn-danger",
+                                    fun: function () {
+                                        var company_name = $("#s_company_name").val();
+                                        var alias = $("#s_alias").val();
+                                        var province = $("#s_province").val();
+                                        var city = $("#s_city").val();
+                                        var district = $("#s_district").val();
+                                        var capital = $("#s_capital").val();
+                                        var company_address = $("#s_company_address").val();
+                                        if (company_name === "") {
+                                            alert("红色标签的表单不能为空!");
+                                            return
+                                        }
+                                        //新增企业库api
+                                        $.post("/admin/audit/qiyeku_info/save", {
+                                            "company_name": company_name,
+                                            "alias": alias,
+                                            "province": province,
+                                            "city": city,
+                                            "district": district,
+                                            "capital": capital,
+                                            "company_address": company_address,
+                                        }, function (data) {
+                                            if (data && data.rep) {
+                                                $("#myModal").modal("hide");
+                                                alert("保存成功");
+                                                ttable.search(company_name).draw();
+                                            } else {
+                                                alert("内部错误");
+                                            }
+                                        }, 'json')
+                                    }
+                                }
+                            ]
+                        };
+                        OpenDialog(htmlObj, obj);
+                        break;
+                }
+            });
+        })
+    });
+
+    //详细行业类型
+    function showHylxs(_id) {
+        $("#infos").html("");
+        $("#info_title").html("详细行业类型");
+        $.post("/admin/audit/query_qyk/ById", {
+            "_id": _id,
+            "q_field": "industry",
+        }, function (data) {
+            if (data && data.rep) {
+                // console.log(data);
+                var tmp = "<div class='row'>";
+                for (var i in data.data.industry) {
+                    tmp = tmp +
+                        "<div class=\"col-lg-10\">\n" +
+                        "<div class=\"input-group\">\n" +
+                        "   <input type='text' class='form-control' name='industry'  placeholder=\"请填写行业类型\" value='" + data.data.industry[i] + "'>" +
+                        "   <span class=\"input-group-btn\">" +
+                        '       <button class="btn btn-info " type="button" data-toggle="tooltip" title="删除" id="delCenterIpGrp"><span class="glyphicon glyphicon-minus"></span></button>' +
+                        "   </span> " +
+                        "  </div>" +
+                        "</div>";
+                    // console.log(i, data.data.industry[i]);
+                }
+                tmp = tmp +
+                    "<div class=\"col-lg-10\">\n" +
+                    "<button class='btn btn-info col-md-3' type='button'  id='addCenterIpGrpBtn' onclick='addCenterIpGrp(this)' >新增行业类型</button> " +
+                    "<button type='button' class='btn btn-sm btn-default col-md-offset-5 col-md-2'  data-dismiss='modal' aria-label='Close'>取消</button>" +
+                    "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='updateIndustrys(\"" + _id + "\")'>保存</button>" +
+                    "</div>" +
+                    "</div>";
+                $("#infos").html(tmp);
+
+
+            } else {
+                alert("内部错误");
+            }
+        }, 'json');
+        //展示详细行业类型
+        $("#info_data").modal("show");
+    }
+
+    //添加行业详情
+    function addCenterIpGrp(obj) {
+        html = '<div class="input-group centerIp">' +
+            '<input type="text" name="industry" class="form-control" id="ipInput" placeholder="请填写行业类型">' +
+            '<span class="input-group-btn">' +
+            '<button class="btn btn-info" type="button" data-toggle="tooltip" title="删除" id="delCenterIpGrp"><span class="glyphicon glyphicon-minus"></span></button>' +
+            '</span>' +
+            '</div>'
+        obj.insertAdjacentHTML('beforebegin', html);
+    }
+
+    //更新行业详情
+    function updateIndustrys(_id) {
+        if (_id === "") {
+            alert("参数id不存在");
+            return
+        }
+        var params = $("#update-dataform").serialize();
+        // console.log(_id, params);
+        $.ajax({
+            type: "POST",
+            url: "/admin/audit/query_qyk/UpdateIndustrys",
+            data: params + "&_id=" + _id,
+            success: function (msg) {
+                $("#info_data").modal("hide");
+                if (msg.data) {
+                    alert("success");
+                } else {
+                    alert("更新失败");
+                }
+            }
+        });
+    }
+
+    $(document).on('click', '#delCenterIpGrp', function () {
+        var el = this.parentNode.parentNode;
+        if (confirm('您确定要删除选中的命令?')) {
+            el.parentNode.removeChild(el);
+        }
+    });
+
+    //详细联系方式
+    function showTels(_id) {
+        $("#infos").html("");
+        $("#info_title").html("详细联系方式");
+        $.post("/admin/audit/query_qyk/ById", {
+            "_id": _id,
+            "q_field": "contact",
+        }, function (data) {
+            if (data && data.rep) {
+                // console.log(data);
+                // var tmp = "<div class='row'>";
+                var tmp = "";
+                for (var i in data.data.contact) {
+                    tmp += "<div class='row'>" +
+                        "<div class=\"col-lg-10\">" +
+                        '<h1><div class="input-group centerIp">' +
+                        '<input type="text" name="contact_persons" class="form-control" id="ipInput" placeholder="请填写联系人" value=' + data.data.contact[i].contact_person + '>' +
+                        '<select class="form-control" name="contact_types" value=' + data.data.contact[i].contact_type + '><option value ="法定代表人">法定代表人</option><option value ="项目联系人">项目联系人</option></select>' +
+                        '<input type="text" name="phones" class="form-control" id="ipInput" placeholder="请填写联系电话" value=' + data.data.contact[i].phone + '>' +
+                        '<select class="form-control" name="topscopeclasss" value=' + data.data.contact[i].topscopeclass + '><option value ="企业公示">企业公示</option><option value ="剑鱼标讯">剑鱼标讯</option></select>' +
+                        '<span class="input-group-btn">' +
+                        '<button class="btn btn-info" type="button" data-toggle="tooltip" title="删除" id="delCenterIpGrp"><span class="glyphicon glyphicon-minus"></span></button>' +
+                        '</span>' +
+                        '</div><h1>' +
+                        '</div></div>';
+                    // console.log(i, data.data.contact[i]);
+                }
+                tmp = tmp +
+                    "<div class='row'>" +
+                    "<div class=\"col-lg-10\">" +
+                    "<button class='btn btn-info col-md-3' type='button'  id='addCenterIpGrpBtn' onclick='addCenterIpGrpTels(this)' >新增联系方式</button> " +
+                    "<button type='button' class='btn btn-sm btn-default col-md-offset-5 col-md-2'  data-dismiss='modal' aria-label='Close'>取消</button>" +
+                    "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='updateTels(\"" + _id + "\")'>保存</button>" +
+                    "</div>" +
+                    "</div>";
+                $("#infos").html(tmp);
+            } else {
+                alert("内部错误");
+            }
+        }, 'json');
+        $("#info_data").modal("show");
+    }
+
+    //添加联系方式
+    function addCenterIpGrpTels(obj) {
+        html = '<h1><div class="input-group centerIp">' +
+            '<input type="text" name="contact_persons" class="form-control" id="ipInput" placeholder="请填写联系人">' +
+            '<select class="form-control" name="contact_types"><option value ="法定代表人">法定代表人</option><option value ="项目联系人">项目联系人</option></select>' +
+            '<input type="text" name="phones" class="form-control" id="ipInput" placeholder="请填写联系电话">' +
+            '<select class="form-control" name="topscopeclasss"><option value ="企业公示">企业公示</option><option value ="剑鱼标讯">剑鱼标讯</option></select>' +
+            '<span class="input-group-btn">' +
+            '<button class="btn btn-info" type="button" data-toggle="tooltip" title="删除" id="delCenterIpGrp"><span class="glyphicon glyphicon-minus"></span></button>' +
+            '</span>' +
+            '</div><h1>'
+        obj.insertAdjacentHTML('beforebegin', html);
+    }
+
+    //更新联系方式
+    function updateTels(_id) {
+        if (_id === "") {
+            alert("参数id不存在");
+            return
+        }
+        var params = $("#update-dataform").serialize();
+        console.log(params)
+        $.ajax({
+            type: "POST",
+            url: "/admin/audit/query_qyk/UpdateTels",
+            data: params + "&_id=" + _id,
+            // contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            traditional: true,
+            success: function (msg) {
+                $("#info_data").modal("hide");
+                if (msg.data) {
+                    alert("success");
+                } else {
+                    alert("更新失败");
+                }
+            }
+        });
+    }
+
+    //删除
+    function deleteQyk(_id) {
+        if (_id === "") {
+            alert("参数id为空");
+            return
+        }
+        if (confirm("您确认要提交此操作?")) {
+            $.post("/admin/audit/qiyeku_info/deleteQyk", {
+                "_id": _id,
+            }, function (data) {
+                if (data && data.rep) {
+                    alert("删除成功");
+                } else {
+                    alert("内部错误");
+                }
+            }, 'json');
+            ttable.draw();
+        }
+    }
+
+    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_company_name\" must=\"true\" value=" + _obj.company_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_alias\" value=" + _obj.alias + "></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_province\" value=" + _obj.province + "></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_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=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_capital\" value=" + _obj.capital + "  placeholder=\"示例:45678.98元;456.78万元;1234.25;\"></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_company_address\" value=" + _obj.company_address + "></div>" +
+            "</div></div>" +
+            "<div class=\"row form-group\">" +
+            "<button type='button' class='btn btn-sm btn-default col-md-offset-5 col-md-2'  data-dismiss='modal' aria-label='Close'>取消</button>" +
+            "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='updatedate(\"" + _obj._id + "\")'>更新</button></div>";
+        $("#infos").html(com);
+        $("#info_data").modal("show");
+    }
+
+    function updatedate(_id) {
+        if (_id === "") {
+            alert("id不存在!");
+            return
+        }
+        var company_name = $("#s_company_name").val();
+        var alias = $("#s_alias").val();
+        var province = $("#s_province").val();
+        var city = $("#s_city").val();
+        var district = $("#s_district").val();
+        var capital = $("#s_capital").val();
+        var company_address = $("#s_company_address").val();
+        if (company_name === "") {
+            alert("红色标签的表单不能为空!");
+            return
+        }
+        //新增企业库api
+        $.post("/admin/audit/qiyeku_info/save", {
+            "_id": _id,
+            "company_name": company_name,
+            "alias": alias,
+            "province": province,
+            "city": city,
+            "district": district,
+            "capital": capital,
+            "company_address": company_address,
+        }, function (data) {
+            if (data && data.rep) {
+                alert("更新成功");
+                ttable.search(company_name).draw();
+                $("#info_data").modal("hide");
+            } else {
+                alert("内部错误");
+            }
+        }, 'json')
+    }
+</script>

+ 5 - 1
udp_ocr_conter/crondata/main6.go

@@ -46,8 +46,12 @@ func main() {
 			if sid.IsZero() {
 				sid = tmp["_id"]
 			} else {
-				if !eid.IsZero(){
+				if !eid.IsZero() && eid != sid{
 					sid = eid
+				}else {
+					log.Println(sid,eid,"为空或者id一致")
+					timer.Reset(time.Minute)
+					continue
 				}
 			}
 			result2 := client.Database("qfw").Collection("bidding").FindOne(ctx, primitive.M{}, options.FindOne().SetSort(primitive.M{"_id": -1}).SetProjection(primitive.M{"_id": 1}))