Commit a818de69 by 蒋勇

d

parent 168acd02
...@@ -45,7 +45,7 @@ module.exports =(async (wb)=>{ ...@@ -45,7 +45,7 @@ module.exports =(async (wb)=>{
buildRow.rpttypecode="GT"; buildRow.rpttypecode="GT";
buildRow.position=rowNumber+"-"+colPos; buildRow.position=rowNumber+"-"+colPos;
buildRow.desc=rowDesc; buildRow.desc=rowDesc;
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
insertrows.push(buildRow); insertrows.push(buildRow);
rowDesc=cacheStr; rowDesc=cacheStr;
} }
......
...@@ -18,7 +18,7 @@ module.exports = (async (wb) => { ...@@ -18,7 +18,7 @@ module.exports = (async (wb) => {
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITQ"; buildRow.rpttypecode = "ITQ";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc + "/本年累计金额"; buildRow.desc = desc + "/本年累计金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
...@@ -41,7 +41,7 @@ module.exports = (async (wb) => { ...@@ -41,7 +41,7 @@ module.exports = (async (wb) => {
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITQ"; buildRow.rpttypecode = "ITQ";
buildRow.valstr = cell.value; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc + "/本年累计金额"; buildRow.desc = desc + "/本年累计金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
...@@ -65,7 +65,7 @@ module.exports = (async (wb) => { ...@@ -65,7 +65,7 @@ module.exports = (async (wb) => {
if (colNumber == 5) { if (colNumber == 5) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITQ"; buildRow.rpttypecode = "ITQ";
buildRow.valstr = cell.value; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc; buildRow.desc = desc;
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
...@@ -84,7 +84,7 @@ module.exports = (async (wb) => { ...@@ -84,7 +84,7 @@ module.exports = (async (wb) => {
if (colNumber == 11) { if (colNumber == 11) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITQ"; buildRow.rpttypecode = "ITQ";
buildRow.valstr = cell.value; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc; buildRow.desc = desc;
buildRow.position = rowNumber + "-" + 2; buildRow.position = rowNumber + "-" + 2;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -18,7 +18,7 @@ module.exports=(async (wb) => { ...@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
if (colNumber == 4) { if (colNumber == 4) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY"; buildRow.rpttypecode = "ITY";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc + "/金额"; buildRow.desc = desc + "/金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -18,7 +18,7 @@ module.exports=(async (wb) => { ...@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
if (colNumber == 3) { if (colNumber == 3) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY"; buildRow.rpttypecode = "ITY";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc + "/金额"; buildRow.desc = desc + "/金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -18,7 +18,7 @@ module.exports=(async (wb) => { ...@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
if (colNumber == 3) { if (colNumber == 3) {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY_COST"; buildRow.rpttypecode = "ITY_COST";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc + "/金额"; buildRow.desc = desc + "/金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -49,7 +49,7 @@ module.exports=(async (wb) => { ...@@ -49,7 +49,7 @@ module.exports=(async (wb) => {
var colpos=colNumber-3; var colpos=colNumber-3;
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY_COST"; buildRow.rpttypecode = "ITY_COST";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc; buildRow.desc = desc;
buildRow.position = rowNumber + "-" + colpos; buildRow.position = rowNumber + "-" + colpos;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -55,7 +55,7 @@ module.exports=(async (wb) => { ...@@ -55,7 +55,7 @@ module.exports=(async (wb) => {
var colpos=colNumber-2; var colpos=colNumber-2;
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY_FILL_LOST"; buildRow.rpttypecode = "ITY_FILL_LOST";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc; buildRow.desc = desc;
buildRow.position = rowNumber + "-" + colpos; buildRow.position = rowNumber + "-" + colpos;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -19,7 +19,7 @@ module.exports=(async (wb) => { ...@@ -19,7 +19,7 @@ module.exports=(async (wb) => {
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY_INCOME_DESC"; buildRow.rpttypecode = "ITY_INCOME_DESC";
buildRow.timetypecode = "Q"; buildRow.timetypecode = "Q";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc+"/金额"; buildRow.desc = desc+"/金额";
buildRow.position = rowNumber + "-" + 1; buildRow.position = rowNumber + "-" + 1;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -41,7 +41,7 @@ module.exports=(async (wb) => { ...@@ -41,7 +41,7 @@ module.exports=(async (wb) => {
var colpos=colNumber-2; var colpos=colNumber-2;
var buildRow = {}; var buildRow = {};
buildRow.rpttypecode = "ITY_PERIOD"; buildRow.rpttypecode = "ITY_PERIOD";
buildRow.valstr = cell.value?cell.value:"0"; buildRow.valstr = cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
buildRow.desc = desc; buildRow.desc = desc;
buildRow.position = rowNumber + "-" + colpos; buildRow.position = rowNumber + "-" + colpos;
insertrows.push(buildRow); insertrows.push(buildRow);
......
...@@ -11,7 +11,7 @@ module.exports=(async (wb)=>{ ...@@ -11,7 +11,7 @@ module.exports=(async (wb)=>{
if(desc!="资产/"){ if(desc!="资产/"){
var buildRow={}; var buildRow={};
buildRow.rpttypecode="NA"; buildRow.rpttypecode="NA";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==3){ if(colNumber==3){
buildRow.desc=desc+"/期末余额"; buildRow.desc=desc+"/期末余额";
buildRow.position=rowNumber+"-"+1; buildRow.position=rowNumber+"-"+1;
...@@ -29,7 +29,7 @@ module.exports=(async (wb)=>{ ...@@ -29,7 +29,7 @@ module.exports=(async (wb)=>{
if(desc!="负债和所有者权益/"){ if(desc!="负债和所有者权益/"){
buildRow={}; buildRow={};
buildRow.rpttypecode="NA"; buildRow.rpttypecode="NA";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==7){ if(colNumber==7){
buildRow.desc=desc+"/期末余额"; buildRow.desc=desc+"/期末余额";
buildRow.position=rowNumber+"-"+3; buildRow.position=rowNumber+"-"+3;
......
...@@ -19,7 +19,7 @@ module.exports=(async (wb)=>{ ...@@ -19,7 +19,7 @@ module.exports=(async (wb)=>{
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
var buildRow={}; var buildRow={};
buildRow.rpttypecode="NP"; buildRow.rpttypecode="NP";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==3){ if(colNumber==3){
buildRow.desc=desc+"/本期金额"; buildRow.desc=desc+"/本期金额";
buildRow.position=rowNumber+"-"+1; buildRow.position=rowNumber+"-"+1;
......
...@@ -16,7 +16,7 @@ module.exports=(async (wb)=>{ ...@@ -16,7 +16,7 @@ module.exports=(async (wb)=>{
if(desc!="资产/"){ if(desc!="资产/"){
var buildRow={}; var buildRow={};
buildRow.rpttypecode="SA"; buildRow.rpttypecode="SA";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==3){ if(colNumber==3){
buildRow.desc=desc+"/期末余额"; buildRow.desc=desc+"/期末余额";
buildRow.position=rowNumber+"-"+1; buildRow.position=rowNumber+"-"+1;
...@@ -34,7 +34,7 @@ module.exports=(async (wb)=>{ ...@@ -34,7 +34,7 @@ module.exports=(async (wb)=>{
if(desc!="负债和所有者权益/"){ if(desc!="负债和所有者权益/"){
buildRow={}; buildRow={};
buildRow.rpttypecode="SA"; buildRow.rpttypecode="SA";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==7){ if(colNumber==7){
buildRow.desc=desc+"/期末余额"; buildRow.desc=desc+"/期末余额";
buildRow.position=rowNumber+"-"+3; buildRow.position=rowNumber+"-"+3;
......
...@@ -18,7 +18,7 @@ module.exports=(async (wb)=>{ ...@@ -18,7 +18,7 @@ module.exports=(async (wb)=>{
if(colNumber==3 || colNumber==4){ if(colNumber==3 || colNumber==4){
var buildRow={}; var buildRow={};
buildRow.rpttypecode="SP"; buildRow.rpttypecode="SP";
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
if(colNumber==3){ if(colNumber==3){
buildRow.desc=desc+"/本年累计金额"; buildRow.desc=desc+"/本年累计金额";
buildRow.position=rowNumber+"-"+1; buildRow.position=rowNumber+"-"+1;
......
...@@ -45,7 +45,7 @@ module.exports=(async (wb)=>{ ...@@ -45,7 +45,7 @@ module.exports=(async (wb)=>{
} }
buildRow.position=rowNumber+"-"+colPos; buildRow.position=rowNumber+"-"+colPos;
buildRow.desc=rowDesc; buildRow.desc=rowDesc;
buildRow.valstr=cell.value?cell.value:"0"; buildRow.valstr=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
insertrows.push(buildRow); insertrows.push(buildRow);
rowDesc=cacheStr; rowDesc=cacheStr;
} }
......
var RC=require("./redisClient.js"); var excel = require('exceljs');
var client=new RC(); async function readxls(path) {
var promise = new Promise((resv, rej) => {
var workbook = new excel.Workbook();
workbook.properties.date1904 = true;
workbook.xlsx.readFile(path)
.then(function () {
return resv(workbook);
}).catch(function (e) {
return rej(e);
});
});
return promise;
}
(async ()=>{ (async ()=>{
// var tohandleurls=pv.split("~"); var wb= await readxls("./GT.xlsx");
// var rptDate=tohandleurls[0]; var sheet = wb.getWorksheet(1);
// var rptCode=tohandleurls[1]; sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
// var urldownload=tohandleurls[2]; if(rowNumber>=10 && rowNumber<=10){
// var mm="1~2019~GT~https://gsb-zc.oss-cn-beijing.aliyuncs.com/GT.xlsx"; row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
// await client.notifyConsume("k8stask","docurls", if(colNumber==28){
var sval=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
await client.rpush("riskmq",JSON.stringify({ console.log(sval);
key:new Date().toLocaleString(), }
content:59+"" });
})); }
});
})()
})()
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment