d

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

@@ -187,32 +187,30 @@ class RptTypeService extends ServiceBase{
   }
    //返回
    async resultJson(batchid){
-    // var batch=await this.db.models.uploadbatch.findByPk(batchid);
-    //  var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"]});
-    //  console.log(rs);
-    //  var tmp={};
-    //  var arrayfi=[];
-    //  rs.forEach((item=>{
-    //    if(item.biztype=="ri"){
-    //     tmp[item.indexName]=Number(item.status);
-    //    }else{
-    //     var tmp2={};
-    //     tmp2[item.indexName]=escape(item.status);
-    //     arrayfi.push(tmp2);
-    //    }
-    //  }));
+    var batch=await this.db.models.uploadbatch.findByPk(batchid);
+     var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"]});
+     console.log(rs);
+     var tmp={};
+     var arrayfi=[];
+     rs.forEach((item=>{
+       if(item.biztype=="ri"){
+        tmp[item.indexName]=Number(item.status);
+       }else{
+        var tmp2={};
+        tmp2[item.indexName]=escape(item.status);
+        arrayfi.push(tmp2);
+       }
+     }));
+
      var paramto={
-      Detectionzone:"xxxxx"
-    };
-    //  var paramto={
-    //   "Detectionzone":batch.batchdate,
-    //   //"CreatTime":batch.updated_at,
-    //   "companyname":batch.companyname,
-    //   "TaskNum":batch.id,
-    //   // "fi":arrayfi,
-    //   // "ri":tmp,
-    //  }
-    //  console.log(paramto);
+      "Detectionzone":batch.batchdate,
+      "CreatTime":batch.updated_at,
+      "companyname":batch.companyname,
+      "TaskNum":batch.id,
+      "fi":arrayfi,
+      "ri":tmp,
+     }
+     console.log(paramto);
      //修改
      return paramto;
   }