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
b8ec3d77
Commit
b8ec3d77
authored
Dec 27, 2019
by
赵庆
Browse files
Options
Browse Files
Download
Plain Diff
gsb
parents
448c86e5
ef0d5e57
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletions
+23
-1
Dockerfile
+1
-1
bpo-admin/app/base/controller/impl/dkcontractCtl.js
+14
-0
bpo-admin/app/base/controller/impl/econtractCtl.js
+8
-0
No files found.
Dockerfile
View file @
b8ec3d77
#!/bin/bash
#!/bin/bash
FROM
registry.cn-beijing.aliyuncs.com/hantang/node105:v2
FROM
registry.cn-beijing.aliyuncs.com/hantang
2
/node105:v2
MAINTAINER
jy "jiangyong@gongsibao.com"
MAINTAINER
jy "jiangyong@gongsibao.com"
ADD
bpo-admin /apps/bpo-admin/
ADD
bpo-admin /apps/bpo-admin/
WORKDIR
/apps/bpo-admin/
WORKDIR
/apps/bpo-admin/
...
...
bpo-admin/app/base/controller/impl/dkcontractCtl.js
View file @
b8ec3d77
...
@@ -374,6 +374,13 @@ class DKcontractCtl extends CtlBase {
...
@@ -374,6 +374,13 @@ class DKcontractCtl extends CtlBase {
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
save
();
contract
.
save
();
}
else
{
}
else
{
await
this
.
utilesignbaoSve
.
archiveProcess
({
flowId
:
contract
.
eflowid
},
"econtractCtl"
);
fileRs
=
await
this
.
utilesignbaoSve
.
downloadUserContractFile
(
contract
.
eflowid
,
"econtractCtl"
);
if
(
fileRs
.
code
==
1
&&
fileRs
.
data
.
selfossUrl
)
{
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
save
();
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
}
return
{
return
{
code
:
0
,
code
:
0
,
msg
:
"您的网络繁忙,请稍后重试"
msg
:
"您的网络繁忙,请稍后重试"
...
@@ -437,6 +444,13 @@ class DKcontractCtl extends CtlBase {
...
@@ -437,6 +444,13 @@ class DKcontractCtl extends CtlBase {
contract
.
save
();
contract
.
save
();
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
}
else
{
}
else
{
await
this
.
utilesignbaoSve
.
archiveProcess
({
flowId
:
contract
.
eflowid
},
"econtractCtl"
);
fileRs
=
await
this
.
utilesignbaoSve
.
downloadUserContractFile
(
contract
.
eflowid
,
"econtractCtl"
);
if
(
fileRs
.
code
==
1
&&
fileRs
.
data
.
selfossUrl
)
{
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
save
();
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
}
return
system
.
getErrResult2
(
"网络繁忙,获取合同失败,请稍后重试"
);
return
system
.
getErrResult2
(
"网络繁忙,获取合同失败,请稍后重试"
);
}
}
}
}
...
...
bpo-admin/app/base/controller/impl/econtractCtl.js
View file @
b8ec3d77
...
@@ -467,6 +467,14 @@ class EcontractCtl extends CtlBase {
...
@@ -467,6 +467,14 @@ class EcontractCtl extends CtlBase {
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
save
();
contract
.
save
();
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
}
else
{
await
this
.
utilesignbaoSve
.
archiveProcess
({
flowId
:
contract
.
eflowid
},
"econtractCtl"
);
fileRs
=
await
this
.
utilesignbaoSve
.
downloadUserContractFile
(
contract
.
eflowid
,
"econtractCtl"
);
if
(
fileRs
.
code
==
1
&&
fileRs
.
data
.
selfossUrl
)
{
contract
.
fileurl
=
fileRs
.
data
.
selfossUrl
;
contract
.
save
();
return
system
.
getResult2
(
fileRs
.
data
.
selfossUrl
);
}
}
}
return
system
.
getErrResult2
(
"网络繁忙,获取合同失败,请稍后重试"
);
return
system
.
getErrResult2
(
"网络繁忙,获取合同失败,请稍后重试"
);
}
}
...
...
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