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
3021284c
Commit
3021284c
authored
Jul 25, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 年报处理逻辑
parent
c320002c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
2 deletions
+16
-2
icp-deliver/app/base/service/impl/delivery/deliverSve.js
+16
-2
No files found.
icp-deliver/app/base/service/impl/delivery/deliverSve.js
View file @
3021284c
...
...
@@ -85,6 +85,20 @@ class DeliverService extends ServiceBase {
if
(
!
result
)
{
throw
new
Error
(
"交付单不可查看"
);
}
result
=
JSON
.
parse
(
JSON
.
stringify
(
result
));
if
(
result
.
master_source_number
)
{
let
annualReportData
=
await
this
.
dao
.
findOne
({
master_source_number
:
result
.
master_source_number
,
id
:
{
$ne
:
result
.
id
}
});
if
(
annualReportData
)
{
result
.
delivery_info
.
annualReport
=
true
;
}
else
{
result
.
delivery_info
.
annualReport
=
false
;
}
}
return
result
;
}
...
...
@@ -177,7 +191,7 @@ class DeliverService extends ServiceBase {
let
annualReportArry
=
[];
// 年报逻辑
if
(
deliverData
.
master_source_number
&&
deliverData
.
delivery_info
&&
deliverData
.
delivery_info
.
annualReport
)
{
if
(
deliverData
.
master_source_number
)
{
annualReportData
=
await
this
.
dao
.
findOne
({
master_source_number
:
deliverData
.
master_source_number
,
id
:
{
...
...
@@ -248,7 +262,7 @@ class DeliverService extends ServiceBase {
await
pushTx
.
returnPremium
(
deliverData
.
delivery_code
);
// 年报逻辑
let
annualReportData
;
if
(
deliverData
.
master_source_number
&&
deliverData
.
delivery_info
&&
deliverData
.
delivery_info
.
annualReport
)
{
if
(
deliverData
.
master_source_number
)
{
annualReportData
=
await
this
.
dao
.
findOne
({
master_source_number
:
deliverData
.
master_source_number
,
id
:
{
...
...
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