d

fi-taxctl/app/base/api/api.base.js

@@ -13,7 +13,8 @@ class APIBase extends DocBase {
         var fullname = gname + "." + methodname;
         var fullname = gname + "." + methodname;
         var lst = [
         var lst = [
              "rpt.saveRptHistory",
              "rpt.saveRptHistory",
-             "rpt.saveRpt"
+             "rpt.saveRpt",
+             "rpt.queryStatus"
         ];
         ];
         var x = lst.indexOf(fullname);
         var x = lst.indexOf(fullname);
         return x >= 0;
         return x >= 0;

fi-taxctl/app/base/api/impl/rpt/rptApi.js

@@ -70,6 +70,11 @@ class RptAPI extends APIBase{
         var x=await this.rptService.saveRptHistory(pobj);
         var x=await this.rptService.saveRptHistory(pobj);
         return system.getResult(x);
         return system.getResult(x);
    }
    }
+   async queryStatus(pobj,query){
+	console.log(JSON.stringify(pobj));
+    var x=await this.rptService.queryStatus(pobj);
+    return system.getResult(x);
+   }
    exam(){
    exam(){
     return "xxx";
     return "xxx";
    }
    }

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

@@ -41,10 +41,20 @@ class RptTypeService extends ServiceBase{
                 content:batchid+""
                 content:batchid+""
           }));
           }));
           self.redisClient.delete("batch"+batchid);
           self.redisClient.delete("batch"+batchid);
+          //改变批的状态为解析完毕
+          batch.batchstatuscode="calc";
+          batch.save();
         }
         }
         return {};
         return {};
     });
     });
   }
   }
+  async queryStatus(bs){
+     return this.db.models.uploadbatch.findAll({where:{
+          id:{
+            [this.db.Op.in]: bs
+          }
+      }});
+  }
   async saveRpt(upinfo){
   async saveRpt(upinfo){
     return this.db.transaction(async t=>{
     return this.db.transaction(async t=>{
          //构建批量对象
          //构建批量对象