Merge branch 'fi-taxctl' of gitlab.gongsibao.com:jiangyong/zhichan into fi-taxctl

fi-taxctl/app/base/db/models/rpt/uploadbatch.js

@@ -3,6 +3,10 @@ const settings=require("../../../../config/settings");
 const uiconfig=system.getUiConfig2(settings.appKey);
 const uiconfig=system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
 module.exports = (db, DataTypes) => {
   return db.define("uploadbatch", {
   return db.define("uploadbatch", {
+    userid:{
+      type:DataTypes.STRING,
+      allowNull: false,
+    },
     companycode:{
     companycode:{
       type:DataTypes.STRING,
       type:DataTypes.STRING,
       allowNull: false,
       allowNull: false,

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

@@ -75,6 +75,9 @@ class RptTypeService extends ServiceBase{
           }
           }
       }});
       }});
   }
   }
+  async queryStatus(u){
+    return this.db.models.uploadbatch.findAll({where:{userid:u.userid}});
+ }
   async queryReport(batchid){
   async queryReport(batchid){
     var batch=await this.db.models.uploadbatch.findById(batchid);
     var batch=await this.db.models.uploadbatch.findById(batchid);
      var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"],raw:true});
      var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"],raw:true});