Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
4c0f2799
Commit
4c0f2799
authored
Mar 09, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
a842e683
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
18 deletions
+25
-18
bpo-admin/app/base/api/impl/ecompanyApi.js
+12
-0
bpo-admin/app/base/service/impl/esettleSve.js
+13
-0
release-note.txt
+0
-18
No files found.
bpo-admin/app/base/api/impl/ecompanyApi.js
View file @
4c0f2799
...
...
@@ -5,6 +5,8 @@ const moment = require("moment");
class
EcompanyApi
{
constructor
()
{
this
.
ecompanySve
=
system
.
getObject
(
"service.ecompanySve"
);
this
.
esettleSve
=
system
.
getObject
(
"service.esettleSve"
);
}
async
merchantNameSuggest
(
queryobj
,
qobj
,
req
)
{
...
...
@@ -16,6 +18,16 @@ class EcompanyApi {
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
)
{
if
(
!
o
)
{
return
""
;
...
...
bpo-admin/app/base/service/impl/esettleSve.js
View file @
4c0f2799
...
...
@@ -801,6 +801,19 @@ class EsettleService extends ServiceBase {
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
)
{
if
(
!
id
)
{
return
[];
...
...
release-note.txt
View file @
4c0f2799
...
...
@@ -22,25 +22,7 @@
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
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【号段前缀】
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment