d

taskexecutor/app/base/db/task/rpt/parseRptTask.js

@@ -49,6 +49,11 @@ async  readxls(path) {
       var rptDate=tohandleurls[2];
       var rptCode=tohandleurls[3];
       var urldownload=tohandleurls[4];
+      //如果是pdf,那么就调用pdf 解析接口
+      if(urldownload.indexOf(".pdf")>=0){
+        
+        return;
+      }
       //下载文件
       var keyindex=urldownload.lastIndexOf("/");
       var keystr=urldownload.substring(keyindex+1);

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

@@ -53,7 +53,7 @@ module.exports =(async (wb,toparsedate)=>{
                   }
                   buildRow.rpttypecode="GT";
                   buildRow.position=rowNumber+"-"+colPos;
-                  buildRow.desc=rowDesc;
+                  buildRow.desc=rowDesc.trim();
                   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/NA.js

@@ -18,7 +18,13 @@ module.exports=(async (wb,toparsedate)=>{
         if(rowNumber>=5 && rowNumber<=45){
           row.eachCell({ includeEmpty: true }, function(cell, colNumber) {
                  if(colNumber==1){
-                      desc="资产/"+cell.value.replace(" ","");
+                      console.log(">>>>><<<<<",cell.value);
+                      if(cell.value){
+                        desc="资产/"+cell.value.replace(" ","");
+                      }else{
+                        desc="资产/"+cell.value;
+                      }
+                  
                  }
                  if(colNumber==3 || colNumber==4){
                      if(desc!="资产/"){

taskexecutor/app/base/db/task/rpt/test.js

-// var http = require('http');
+var http = require('http');
 // var server = http.createServer((req,res) => {
 //   //设置 HTTP 头部，状态码是 200，文件类型是 html，字符集是 utf-8
 //     res.writeHead(200,{"Content-Type":"text/html;charset='utf-8'"});
@@ -20,69 +20,69 @@
 //   }
 
 // }
-var excel = require('exceljs');
-function getMonth(type,text){
-  var qs=["一","二","三","四"];
-  var qmap={
-    "一":"03","二":"06","三":"09","四":"12"
-  };
-  //ITQ
-  if(type=="ITQ" || type=="ST" || type=="GT"){
-    var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm;
-    var ms=text.match(p1);
-    var lstDate=ms[1];
-    var ds=lstDate.split("-");
-    var rtnDate=ds[0]+ds[1];
-    return rtnDate;
-  }else{
-    var testbool=false;
-    var p2=/(\d{4})|([一|二|三|四])/gm;
-    var ms=text.match(p2);
-    console.log(ms);
-    for(var q of qs){
-      var jstr=ms.join(",");
-      var re = new RegExp(q);
-      if(re.test(jstr)){
-        console.log("======");
-        testbool=true;
-        break;
-      }
-    }
-    if(!testbool){//如果不是季
-      var p3=/\d{4}[-|-]\d{2}/gm;
-      var ms=text.match(p3);
-        return ms[0].split("-").join("");
-    }else{//如果是季
-        var qstr=ms[1];
-        var rtndate=ms[0]+qmap[qstr];
-        return rtndate;
-    }
-  }
-}
-
-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;
-}
+// var excel = require('exceljs');
+// function getMonth(type,text){
+//   var qs=["一","二","三","四"];
+//   var qmap={
+//     "一":"03","二":"06","三":"09","四":"12"
+//   };
+//   //ITQ
+//   if(type=="ITQ" || type=="ST" || type=="GT"){
+//     var p1=/\d{4}[-|-]\d{2}[-|-]\d{2}/gm;
+//     var ms=text.match(p1);
+//     var lstDate=ms[1];
+//     var ds=lstDate.split("-");
+//     var rtnDate=ds[0]+ds[1];
+//     return rtnDate;
+//   }else{
+//     var testbool=false;
+//     var p2=/(\d{4})|([一|二|三|四])/gm;
+//     var ms=text.match(p2);
+//     console.log(ms);
+//     for(var q of qs){
+//       var jstr=ms.join(",");
+//       var re = new RegExp(q);
+//       if(re.test(jstr)){
+//         console.log("======");
+//         testbool=true;
+//         break;
+//       }
+//     }
+//     if(!testbool){//如果不是季
+//       var p3=/\d{4}[-|-]\d{2}/gm;
+//       var ms=text.match(p3);
+//         return ms[0].split("-").join("");
+//     }else{//如果是季
+//         var qstr=ms[1];
+//         var rtndate=ms[0]+qmap[qstr];
+//         return rtndate;
+//     }
+//   }
+// }
+
+// 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 toparsedate={isparsedate:false,rptDate:'notparse'};
-  toparsedate.isparsedate=true;
-  var parserByCode=null;
-  // NA
-  var wb=await readxls("./tmpl/fi/NA3.xlsx");
-  parserByCode=require("./rptHandler/NA.js");
-  var rows=await parserByCode(wb,toparsedate);
-  console.log(toparsedate.rptDate);
+  // var toparsedate={isparsedate:false,rptDate:'notparse'};
+  // toparsedate.isparsedate=true;
+  // var parserByCode=null;
+  // // NA
+  // var wb=await readxls("./tmpl/fi/NA3.xlsx");
+  // parserByCode=require("./rptHandler/NA.js");
+  // var rows=await parserByCode(wb,toparsedate);
+  // console.log(toparsedate.rptDate);
 
   // // NP
   // wb=await readxls("./tmpl/fi/NP.xlsx");
@@ -163,4 +163,9 @@ async function  readxls(path) {
 // console.log(g);
 
 
+var s="   dddd  ";
+var d="dddd";
+console.log(s==d);
+s=s.trim()
+console.log(s==d);
 

taskexecutor/main.js

@@ -6,6 +6,7 @@ const fs=require("fs");
 var taskName = process.env.TASK_NAME;
 var params= process.env.TASK_PARAM?process.env.TASK_PARAM:"";
 var port=process.env.TASK_PORT;
+console.log(taskName);
 if(taskName){
     var task=system.getObject("task."+taskName);
     (async()=>{