gsb

bpo-admin/app/base/api/impl/ecompanyApi.js

@@ -5,6 +5,8 @@ const moment = require("moment");
 class EcompanyApi {
 class EcompanyApi {
   constructor() {
   constructor() {
     this.ecompanySve = system.getObject("service.ecompanySve");
     this.ecompanySve = system.getObject("service.ecompanySve");
+    this.esettleSve = system.getObject("service.esettleSve");
+
   }
   }
 
 
   async merchantNameSuggest(queryobj, qobj, req) {
   async merchantNameSuggest(queryobj, qobj, req) {
@@ -16,6 +18,16 @@ class EcompanyApi {
     return system.getResult2(list);
     return system.getResult2(list);
   }
   }
 
 
+  async settleMerchantNameSuggest(queryobj, qobj, req) {
+    var name = this.trim(queryobj.name);
+    if(!name) {
+      return system.getResult2([])
+    }
+    var list = await this.esettleSve.suggest2(name);
+    return system.getResult2(list);
+  }
+
+
   trim(o) {
   trim(o) {
     if (!o) {
     if (!o) {
       return "";
       return "";

bpo-admin/app/base/service/impl/esettleSve.js

@@ -801,6 +801,19 @@ class EsettleService extends ServiceBase {
     return list;
     return list;
   }
   }
 
 
+  async suggest2(name) {
+    if (!name) {
+      return [];
+    }
+    var sql = "SELECT id, company_name AS name FROM `tbl_busi` WHERE company_name LIKE :queryLike ORDER BY id ASC LIMIT 50";
+    var list = await this.settledb.query(sql, { replacements: { queryLike: "%" + name + "%" } });
+    if (list && list.length > 0) {
+      list = list[0, 0] || [];
+
+    }
+    return list;
+  }
+
   async findcompanyid(id) {
   async findcompanyid(id) {
     if (!id) {
     if (!id) {
       return [];
       return [];

release-note.txt

@@ -22,25 +22,7 @@
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 
 
 项目版本号段分配
 项目版本号段分配
-0、bigdata  release-v0.x.x
-1、igirl-web   release-v1.x.x
-2、igirl-zcapi release-v2.x.x
-3、igirl-channel-web release-v3.x.x
-4、igirl-channel release-v4.x.x
-5、scratch-web release-v5.x.x
-6、ipself-web release-v6.x.x
-7.  ipop-web release-v7.x.x
-8.  bpo-web  release-v8.x.x
 9.  bpo-admin  release-v9.x.x
 9.  bpo-admin  release-v9.x.x
-10. laowubao  release-v10.x.x
-11. xggsve-common  release-v11.x.x
-12. xggsve-merchant  release-v12.x.x
-13. xggsve-order  release-v13.x.x
-14. xggsve-invoice  release-v14.x.x
-15. xggpc  release-v15.x.x
-16. xggadmin  release-v16.x.x
-17. xggweb  release-v17.x.x
-18. projectmanage release-v28.x.x
 
 
 后续号端请继续补充
 后续号端请继续补充
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】