d

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

@@ -66,9 +66,10 @@ class RptAPI extends APIBase{
       return system.getResult(x);
       return system.getResult(x);
    }
    }
    async saveRptHistory(pobj,query){
    async saveRptHistory(pobj,query){
-	     console.log(JSON.stringify(pobj));
-        var x=await this.rptService.saveRptHistory(pobj);
-        return system.getResult(x);
+		  pobj.forEach(async (hs)=>{
+			   await this.rptService.saveRptHistory(hs);
+		  });
+        return system.getResult({});
    }
    }
    async queryStatus(pobj,query){
    async queryStatus(pobj,query){
 	console.log(JSON.stringify(pobj));
 	console.log(JSON.stringify(pobj));

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

@@ -5,6 +5,7 @@ class RptTypeService extends ServiceBase{
   constructor(){
   constructor(){
      super("rpt",ServiceBase.getDaoName(RptTypeService));
      super("rpt",ServiceBase.getDaoName(RptTypeService));
      this.redisClient=system.getObject("util.redisClient");
      this.redisClient=system.getObject("util.redisClient");
+     this.cacheBatchId={};
   }
   }
   async saveRptHistory(hs){
   async saveRptHistory(hs){
     var self=this;
     var self=this;
@@ -12,7 +13,13 @@ class RptTypeService extends ServiceBase{
         var hisarray=[];
         var hisarray=[];
         var rptid=hs.rptid;
         var rptid=hs.rptid;
         var batchid=hs.batchid;
         var batchid=hs.batchid;
-        var batch=await this.db.models.uploadbatch.findById(batchid);
+        var batch=null;
+        if(!this.cacheBatchId[batchid]){
+           batch=await this.db.models.uploadbatch.findOne({where:{id:batchid},transaction:t});
+           this.cacheBatchId[batchid]=batch;
+        }else{
+          batch=this.cacheBatchId[batchid];
+        }
         var hisdata=hs.hisdata;
         var hisdata=hs.hisdata;
         var rptdate=hs.rptdate;
         var rptdate=hs.rptdate;
         var rptcode=hs.rptcode;
         var rptcode=hs.rptcode;
@@ -51,7 +58,7 @@ class RptTypeService extends ServiceBase{
           self.redisClient.delete("batch"+batchid);
           self.redisClient.delete("batch"+batchid);
           //改变批的状态为解析完毕
           //改变批的状态为解析完毕
           batch.batchstatuscode="calc";
           batch.batchstatuscode="calc";
-          batch.save();
+          await batch.save({transaction:t});
         }
         }
         return {};
         return {};
     });
     });

fi-taxctl/app/config/localsettings.js

@@ -3,7 +3,7 @@ var settings={
     host: "43.247.184.32",
     host: "43.247.184.32",
     port: 8967,
     port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
-    db: 2,
+    db: 15,
   },
   },
   database: {
   database: {
     dbname: "fktaxctl",
     dbname: "fktaxctl",
@@ -21,10 +21,8 @@ var settings={
         idle: 1000000
         idle: 1000000
       },
       },
       debug: false,
       debug: false,
-      dialectOptions: {
-        requestTimeout: 999999,
-        // instanceName:'DEV'
-      }  //设置MSSQL超时时间
+      logging:false
+
     }
     }
   },
   },
  reqEsDevUrl:"http://192.168.4.249:9200/",
  reqEsDevUrl:"http://192.168.4.249:9200/",