d

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

@@ -188,7 +188,7 @@ class RptTypeService extends ServiceBase{
    //返回
    //返回
    async resultJson(batchid){
    async resultJson(batchid){
     var batch=await this.db.models.uploadbatch.findByPk(batchid);
     var batch=await this.db.models.uploadbatch.findByPk(batchid);
-     var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"]});
+     var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status","biztype"]});
      console.log(rs);
      console.log(rs);
      var tmp={};
      var tmp={};
      var arrayfi=[];
      var arrayfi=[];
@@ -217,7 +217,7 @@ class RptTypeService extends ServiceBase{
   //让黄静调用一下
   //让黄静调用一下
   async buildWordReport(batchid){
   async buildWordReport(batchid){
     var batch=await this.db.models.uploadbatch.findByPk(batchid);
     var batch=await this.db.models.uploadbatch.findByPk(batchid);
-     var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"]});
+     var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status","biztype"]});
      var tmp={};
      var tmp={};
      var arrayfi=[];
      var arrayfi=[];
      rs.forEach((item=>{
      rs.forEach((item=>{