d

taskexecutor/app/base/db/task/rpt/rptHandler/GT.js

@@ -45,7 +45,7 @@ module.exports =(async (wb)=>{
                   buildRow.rpttypecode="GT";
                   buildRow.position=rowNumber+"-"+colPos;
                   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);
                   rowDesc=cacheStr;
               }

taskexecutor/app/base/db/task/rpt/rptHandler/ITQ.js

@@ -18,7 +18,7 @@ module.exports = (async (wb) => {
                 if (colNumber == 11) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);
@@ -41,7 +41,7 @@ module.exports = (async (wb) => {
                 if (colNumber == 11) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);
@@ -65,7 +65,7 @@ module.exports = (async (wb) => {
                 if (colNumber == 5) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);
@@ -84,7 +84,7 @@ module.exports = (async (wb) => {
                 if (colNumber == 11) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 2;
                     insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY.js

@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
                 if (colNumber == 4) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_ADV.js

@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
                 if (colNumber == 3) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_COST.js

@@ -18,7 +18,7 @@ module.exports=(async (wb) => {
                 if (colNumber == 3) {
                     var buildRow = {};
                     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.position = rowNumber + "-" + 1;
                     insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_DISCOUNT_ADJUST.js

@@ -49,7 +49,7 @@ module.exports=(async (wb) => {
                     var colpos=colNumber-3;
                     var buildRow = {};
                     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.position = rowNumber + "-" + colpos;
                     insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_FILL_LOST.js

@@ -55,7 +55,7 @@ module.exports=(async (wb) => {
                         var colpos=colNumber-2;
                         var buildRow = {};
                         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.position = rowNumber + "-" + colpos;
                         insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_INCOME_DESC.js

@@ -19,7 +19,7 @@ module.exports=(async (wb) => {
                         var buildRow = {};
                         buildRow.rpttypecode = "ITY_INCOME_DESC";
                         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.position = rowNumber + "-" + 1;
                         insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/ITY_PERIOD.js

@@ -41,7 +41,7 @@ module.exports=(async (wb) => {
                         var colpos=colNumber-2;
                         var buildRow = {};
                         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.position = rowNumber + "-" + colpos;
                         insertrows.push(buildRow);

taskexecutor/app/base/db/task/rpt/rptHandler/NA.js

@@ -11,7 +11,7 @@ module.exports=(async (wb)=>{
                      if(desc!="资产/"){
                           var buildRow={};
                           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){
                               buildRow.desc=desc+"/期末余额";
                               buildRow.position=rowNumber+"-"+1;
@@ -29,7 +29,7 @@ module.exports=(async (wb)=>{
                   if(desc!="负债和所有者权益/"){
                        buildRow={};
                        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){
                           buildRow.desc=desc+"/期末余额";
                            buildRow.position=rowNumber+"-"+3;

taskexecutor/app/base/db/task/rpt/rptHandler/NP.js

@@ -19,7 +19,7 @@ module.exports=(async (wb)=>{
                  if(colNumber==3 || colNumber==4){
                           var buildRow={};
                           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){
                               buildRow.desc=desc+"/本期金额";
                               buildRow.position=rowNumber+"-"+1;

taskexecutor/app/base/db/task/rpt/rptHandler/SA.js

@@ -16,7 +16,7 @@ module.exports=(async (wb)=>{
                      if(desc!="资产/"){
                           var buildRow={};
                           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){
                               buildRow.desc=desc+"/期末余额";
                               buildRow.position=rowNumber+"-"+1;
@@ -34,7 +34,7 @@ module.exports=(async (wb)=>{
                   if(desc!="负债和所有者权益/"){
                        buildRow={};
                        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){
                           buildRow.desc=desc+"/期末余额";
                            buildRow.position=rowNumber+"-"+3;

taskexecutor/app/base/db/task/rpt/rptHandler/SP.js

@@ -18,7 +18,7 @@ module.exports=(async (wb)=>{
                  if(colNumber==3 || colNumber==4){
                           var buildRow={};
                           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){
                               buildRow.desc=desc+"/本年累计金额";
                               buildRow.position=rowNumber+"-"+1;

taskexecutor/app/base/db/task/rpt/rptHandler/ST.js

@@ -45,7 +45,7 @@ module.exports=(async (wb)=>{
                   }
                   buildRow.position=rowNumber+"-"+colPos;
                   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);
                   rowDesc=cacheStr;
               }

taskexecutor/app/base/utils/test.js

-var RC=require("./redisClient.js");
-var client=new RC();
+var excel = require('exceljs');
+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 ()=>{
-      // var tohandleurls=pv.split("~");
-      // var rptDate=tohandleurls[0];
-      // var rptCode=tohandleurls[1];
-      // var urldownload=tohandleurls[2];
-    // var mm="1~2019~GT~https://gsb-zc.oss-cn-beijing.aliyuncs.com/GT.xlsx";
-    // await client.notifyConsume("k8stask","docurls",
-
-   await client.rpush("riskmq",JSON.stringify({
-    key:new Date().toLocaleString(),
-    content:59+""
-    }));
-
-  
-})()
\ No newline at end of file
+  var wb= await readxls("./GT.xlsx");
+  var sheet = wb.getWorksheet(1);
+  sheet.eachRow({ includeEmpty: true }, function(row, rowNumber) {
+    if(rowNumber>=10 && rowNumber<=10){
+      row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
+        if(colNumber==28){
+          var sval=cell.value?(typeof cell.value=="object"?cell.value.result:cell.value):"0";
+          console.log(sval);
+        }
+      });
+    }
+  });
+})()