d

fi-taxctl/app/base/service/impl/rpt/rpttypeSve.js

@@ -96,6 +96,19 @@ class RptTypeService extends ServiceBase{
      }
   
   }
+  buildRpt(rpt,upinfo,comp,batchtemp){
+    var rptupload={
+      companyname:upinfo.companyName,
+      companycode:upinfo.companyTaxNum,
+      rpttypecode:rpt.code,
+      timetypecode:upinfo.dateType,
+      urlpath:rpt.url,
+      rptdate:rpt.date?rpt.date:'toparse',
+      company_id:comp.id,
+      uploadbatch_id:batchtemp.id,
+    }
+    return rptupload;
+  }
   async saveRpt(upinfo){
     return this.db.transaction(async t=>{
          //构建批量对象
@@ -117,6 +130,7 @@ class RptTypeService extends ServiceBase{
             timetypecode:upinfo.dateType,
             accountstandardcode:upinfo.accountingType,
             company_id:comp.id,
+          //  userkey:null
           }
           //保存批量
           var batchtemp=await this.db.models.uploadbatch.create(batchobj,{transaction:t});
@@ -125,20 +139,16 @@ class RptTypeService extends ServiceBase{
               {
                 if(k.indexOf("Report")>=0){
                   var rpts=upinfo[k];
-                  rpts.forEach(rpt=>{
-                      var rptupload={
-                        companyname:upinfo.companyName,
-                        companycode:upinfo.companyTaxNum,
-                        rpttypecode:rpt.code,
-                        timetypecode:upinfo.dateType,
-                        urlpath:rpt.url,
-                        rptdate:rpt.date,
-                        company_id:comp.id,
-                        uploadbatch_id:batchtemp.id,
-                      }
-                      rptresult.push(rptupload);
-                      
+                  var esrpts=rpts["essential"];
+                  var unesrpts=rpts["unessential"];
+                  esrpts.forEach(rpt=>{
+                      var tmprpt=this.buildRpt(rpt,upinfo,comp,batchtemp);
+                      rptresult.push(tmprpt);       
                   });
+                  unesrpts.forEach(rpt=>{
+                    var tmprpt=this.buildRpt(rpt,upinfo,comp,batchtemp);
+                    rptresult.push(tmprpt);       
+                   });
                 }
              }
           });