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
027abf0f
Commit
027abf0f
authored
Jan 10, 2020
by
蒋勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
db48f873
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
fi-taxctl/app/base/api/impl/rpt/rptApi.js
+4
-3
fi-taxctl/app/base/service/impl/rpt/rpttypeSve.js
+9
-2
fi-taxctl/app/config/localsettings.js
+3
-5
No files found.
fi-taxctl/app/base/api/impl/rpt/rptApi.js
View file @
027abf0f
...
...
@@ -66,9 +66,10 @@ class RptAPI extends APIBase{
return
system
.
getResult
(
x
);
}
async
saveRptHistory
(
pobj
,
query
){
console
.
log
(
JSON
.
stringify
(
pobj
));
var
x
=
await
this
.
rptService
.
saveRptHistory
(
pobj
);
return
system
.
getResult
(
x
);
pobj
.
forEach
(
async
(
hs
)
=>
{
await
this
.
rptService
.
saveRptHistory
(
hs
);
});
return
system
.
getResult
({});
}
async
queryStatus
(
pobj
,
query
){
console
.
log
(
JSON
.
stringify
(
pobj
));
...
...
fi-taxctl/app/base/service/impl/rpt/rpttypeSve.js
View file @
027abf0f
...
...
@@ -5,6 +5,7 @@ class RptTypeService extends ServiceBase{
constructor
(){
super
(
"rpt"
,
ServiceBase
.
getDaoName
(
RptTypeService
));
this
.
redisClient
=
system
.
getObject
(
"util.redisClient"
);
this
.
cacheBatchId
=
{};
}
async
saveRptHistory
(
hs
){
var
self
=
this
;
...
...
@@ -12,7 +13,13 @@ class RptTypeService extends ServiceBase{
var
hisarray
=
[];
var
rptid
=
hs
.
rptid
;
var
batchid
=
hs
.
batchid
;
var
batch
=
await
this
.
db
.
models
.
uploadbatch
.
findById
(
batchid
);
var
batch
=
null
;
if
(
!
this
.
cacheBatchId
[
batchid
]){
batch
=
await
this
.
db
.
models
.
uploadbatch
.
findOne
({
where
:{
id
:
batchid
},
transaction
:
t
});
this
.
cacheBatchId
[
batchid
]
=
batch
;
}
else
{
batch
=
this
.
cacheBatchId
[
batchid
];
}
var
hisdata
=
hs
.
hisdata
;
var
rptdate
=
hs
.
rptdate
;
var
rptcode
=
hs
.
rptcode
;
...
...
@@ -51,7 +58,7 @@ class RptTypeService extends ServiceBase{
self
.
redisClient
.
delete
(
"batch"
+
batchid
);
//改变批的状态为解析完毕
batch
.
batchstatuscode
=
"calc"
;
batch
.
save
(
);
await
batch
.
save
({
transaction
:
t
}
);
}
return
{};
});
...
...
fi-taxctl/app/config/localsettings.js
View file @
027abf0f
...
...
@@ -3,7 +3,7 @@ var settings={
host
:
"43.247.184.32"
,
port
:
8967
,
password
:
"Gongsibao2018"
,
db
:
2
,
db
:
15
,
},
database
:
{
dbname
:
"fktaxctl"
,
...
...
@@ -21,10 +21,8 @@ var settings={
idle
:
1000000
},
debug
:
false
,
dialectOptions
:
{
requestTimeout
:
999999
,
// instanceName:'DEV'
}
//设置MSSQL超时时间
logging
:
false
}
},
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
...
...
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