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
7e4cdb34
Commit
7e4cdb34
authored
Jan 19, 2020
by
蒋勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
fd811d46
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
86 additions
and
71 deletions
+86
-71
taskexecutor/app/base/db/task/rpt/parseRptTask.js
+1
-1
taskexecutor/app/base/db/task/rpt/rptHandler/GT.js
+2
-2
taskexecutor/app/base/db/task/rpt/rptHandler/ITQ.js
+2
-2
taskexecutor/app/base/db/task/rpt/rptHandler/NA.js
+5
-2
taskexecutor/app/base/db/task/rpt/rptHandler/NP.js
+7
-4
taskexecutor/app/base/db/task/rpt/rptHandler/SA.js
+2
-2
taskexecutor/app/base/db/task/rpt/rptHandler/SP.js
+4
-4
taskexecutor/app/base/db/task/rpt/rptHandler/ST.js
+5
-5
taskexecutor/app/base/db/task/rpt/rptHandler/getMonth.js
+10
-1
taskexecutor/app/base/db/task/rpt/test.js
+48
-48
taskexecutor/app/base/db/task/rpt/tmpl/fi/.~NA3.xlsx
+0
-0
taskexecutor/app/base/db/task/rpt/tmpl/fi/NA3.xlsx
+0
-0
taskexecutor/app/base/db/task/rpt/tmpl/t/.~ST.xlsx
+0
-0
No files found.
taskexecutor/app/base/db/task/rpt/parseRptTask.js
View file @
7e4cdb34
...
...
@@ -57,7 +57,7 @@ async readxls(path) {
var
wb
=
await
this
.
readxls
(
localpath
);
//是否解析excell中的报表
var
toparsedate
=
{
isparsedate
:
false
,
rptDate
:
'notparse'
};
var
toparsedate
=
{
isparsedate
:
false
,
rptDate
:
'notparse'
,
fp
:
urldownload
};
var
ind
=
rptCode
.
lastIndexOf
(
"_"
);
var
parsefunc
=
rptCode
;
if
(
ind
>=
0
){
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/GT.js
View file @
7e4cdb34
...
...
@@ -6,8 +6,8 @@ module.exports =(async (wb,toparsedate)=>{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
4
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt
=
cell
.
value
.
richText
[
0
].
text
;
var
rptDate
=
getMonth
(
"GT"
,
tt
);
//
var tt=cell.value.richText[0].text;
var
rptDate
=
getMonth
(
"GT"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/ITQ.js
View file @
7e4cdb34
...
...
@@ -6,8 +6,8 @@ module.exports = (async (wb,toparsedate) => {
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
2
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt
=
cell
.
value
.
richText
[
0
].
text
;
var
rptDate
=
getMonth
(
"ITQ"
,
tt
);
//
var tt=cell.value.richText[0].text;
var
rptDate
=
getMonth
(
"ITQ"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/NA.js
View file @
7e4cdb34
...
...
@@ -6,8 +6,11 @@ module.exports=(async (wb,toparsedate)=>{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
3
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt
=
cell
.
value
.
richText
[
1
].
text
;
var
rptDate
=
getMonth
(
"NA"
,
tt
);
console
.
log
(
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
);
console
.
log
(
toparsedate
.
fp
);
console
.
log
(
cell
.
value
);
// var tt=cell.value.richText[1].text;
var
rptDate
=
getMonth
(
"NA"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/NP.js
View file @
7e4cdb34
...
...
@@ -4,12 +4,15 @@ module.exports=(async (wb,toparsedate)=>{
var
insertrows
=
[];
sheet
.
eachRow
({
includeEmpty
:
true
},
function
(
row
,
rowNumber
)
{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
3
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt1
=
cell
.
value
.
richText
[
1
].
text
;
var
tt2
=
cell
.
value
.
richText
[
2
].
text
;
var
tt
=
tt1
+
tt2
;
var
rptDate
=
getMonth
(
"NP"
,
tt
);
console
.
log
(
toparsedate
.
fp
,
"================="
);
console
.
log
(
cell
.
value
);
// var tt1=cell.value.richText[1].text;
// var tt2=cell.value.richText[2].text;
// var tt=tt1+tt2;
var
rptDate
=
getMonth
(
"NP"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/SA.js
View file @
7e4cdb34
...
...
@@ -9,8 +9,8 @@ module.exports=(async (wb,toparsedate)=>{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
3
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt
=
cell
.
value
.
richText
[
0
].
text
;
var
rptDate
=
getMonth
(
"SA"
,
tt
);
//
var tt=cell.value.richText[0].text;
var
rptDate
=
getMonth
(
"SA"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/SP.js
View file @
7e4cdb34
...
...
@@ -6,10 +6,10 @@ module.exports=(async (wb,toparsedate)=>{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
3
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt1
=
cell
.
value
.
richText
[
1
].
text
;
var
tt2
=
cell
.
value
.
richText
[
2
].
text
;
var
tt
=
tt1
+
tt2
;
var
rptDate
=
getMonth
(
"SP"
,
tt
);
//
var tt1=cell.value.richText[1].text;
//
var tt2=cell.value.richText[2].text;
//
var tt=tt1+tt2;
var
rptDate
=
getMonth
(
"SP"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/ST.js
View file @
7e4cdb34
...
...
@@ -6,11 +6,11 @@ module.exports=(async (wb,toparsedate)=>{
if
(
toparsedate
.
isparsedate
&&
rowNumber
==
5
){
row
.
eachCell
({
includeEmpty
:
true
},
function
(
cell
,
colNumber
)
{
if
(
colNumber
==
1
){
var
tt0
=
cell
.
value
.
richText
[
0
].
text
;
var
tt1
=
cell
.
value
.
richText
[
1
].
text
;
var
tt2
=
cell
.
value
.
richText
[
2
].
text
;
var
tt
=
tt0
+
tt1
+
tt2
;
var
rptDate
=
getMonth
(
"ST"
,
tt
);
//
var tt0=cell.value.richText[0].text;
//
var tt1=cell.value.richText[1].text;
//
var tt2=cell.value.richText[2].text;
//
var tt=tt0+tt1+tt2;
var
rptDate
=
getMonth
(
"ST"
,
cell
);
toparsedate
.
rptDate
=
rptDate
;
}
});
...
...
taskexecutor/app/base/db/task/rpt/rptHandler/getMonth.js
View file @
7e4cdb34
function
getMonth
(
type
,
text
){
function
getMonth
(
type
,
cell
){
var
text
=
""
;
if
(
cell
.
value
){
cell
.
value
.
richText
.
forEach
(
tmmobj
=>
{
text
+=
tmmobj
.
text
;
});
}
else
{
console
.
log
(
cell
);
}
var
qs
=
[
"一"
,
"二"
,
"三"
,
"四"
];
var
qmap
=
{
"一"
:
"03"
,
"二"
:
"06"
,
"三"
:
"09"
,
"四"
:
"12"
...
...
taskexecutor/app/base/db/task/rpt/test.js
View file @
7e4cdb34
...
...
@@ -79,58 +79,58 @@ async function readxls(path) {
toparsedate
.
isparsedate
=
true
;
var
parserByCode
=
null
;
// NA
var
wb
=
await
readxls
(
"./tmpl/fi/NA.xlsx"
);
var
wb
=
await
readxls
(
"./tmpl/fi/NA
3
.xlsx"
);
parserByCode
=
require
(
"./rptHandler/NA.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
// NP
wb
=
await
readxls
(
"./tmpl/fi/NP.xlsx"
);
parserByCode
=
require
(
"./rptHandler/NP.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
// NPQ
wb
=
await
readxls
(
"./tmpl/fi/NPQ.xlsx"
);
parserByCode
=
require
(
"./rptHandler/NP.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
// SA
wb
=
await
readxls
(
"./tmpl/fi/SA.xlsx"
);
parserByCode
=
require
(
"./rptHandler/SA.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
// SP
wb
=
await
readxls
(
"./tmpl/fi/SP.xlsx"
);
parserByCode
=
require
(
"./rptHandler/SP.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
// SPQ
wb
=
await
readxls
(
"./tmpl/fi/SPQ.xlsx"
);
parserByCode
=
require
(
"./rptHandler/SP.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
//ITQ
wb
=
await
readxls
(
"./tmpl/it/q/ITQ.xlsx"
);
parserByCode
=
require
(
"./rptHandler/ITQ.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
//GT
wb
=
await
readxls
(
"./tmpl/t/GT.xlsx"
);
parserByCode
=
require
(
"./rptHandler/GT.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
//ST
wb
=
await
readxls
(
"./tmpl/t/ST.xlsx"
);
parserByCode
=
require
(
"./rptHandler/ST.js"
);
var
rows
=
await
parserByCode
(
wb
,
toparsedate
);
console
.
log
(
toparsedate
.
rptDate
);
//
//
NP
//
wb=await readxls("./tmpl/fi/NP.xlsx");
//
parserByCode=require("./rptHandler/NP.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
// NPQ
//
wb=await readxls("./tmpl/fi/NPQ.xlsx");
//
parserByCode=require("./rptHandler/NP.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
// SA
//
wb=await readxls("./tmpl/fi/SA.xlsx");
//
parserByCode=require("./rptHandler/SA.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
// SP
//
wb=await readxls("./tmpl/fi/SP.xlsx");
//
parserByCode=require("./rptHandler/SP.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
// SPQ
//
wb=await readxls("./tmpl/fi/SPQ.xlsx");
//
parserByCode=require("./rptHandler/SP.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
//ITQ
//
wb=await readxls("./tmpl/it/q/ITQ.xlsx");
//
parserByCode=require("./rptHandler/ITQ.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
//GT
//
wb=await readxls("./tmpl/t/GT.xlsx");
//
parserByCode=require("./rptHandler/GT.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
//
//ST
//
wb=await readxls("./tmpl/t/ST.xlsx");
//
parserByCode=require("./rptHandler/ST.js");
//
var rows=await parserByCode(wb,toparsedate);
//
console.log(toparsedate.rptDate);
})()
...
...
taskexecutor/app/base/db/task/rpt/tmpl/
t/.~GT
.xlsx
→
taskexecutor/app/base/db/task/rpt/tmpl/
fi/.~NA3
.xlsx
View file @
7e4cdb34
File moved
taskexecutor/app/base/db/task/rpt/tmpl/fi/NA3.xlsx
0 → 100644
View file @
7e4cdb34
File added
taskexecutor/app/base/db/task/rpt/tmpl/t/.~ST.xlsx
deleted
100644 → 0
View file @
fd811d46
File deleted
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