d

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

@@ -61,13 +61,21 @@ class RptTypeService extends ServiceBase{
       }});
       }});
   }
   }
   async queryReport(batchid){
   async queryReport(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});
      var tmp={};
      var tmp={};
      rs.forEach((item=>{
      rs.forEach((item=>{
          tmp[item.indexName]=Number(item.status);
          tmp[item.indexName]=Number(item.status);
      }));
      }));
      var rptdata=await this.apiCallWithoutAk("http://fkrptresult-service/gsb/api/report",tmp);
      var rptdata=await this.apiCallWithoutAk("http://fkrptresult-service/gsb/api/report",tmp);
-     return rptdata;
+     var rtn={
+          batchdate:batch.batchdate,
+          rptdate:batch.updated_at,
+          companyName:batch.companyname,
+          taxCode:batch.companycode,
+          results:rptdata,
+     };
+     return rtn;
   }
   }
   async saveRpt(upinfo){
   async saveRpt(upinfo){
     return this.db.transaction(async t=>{
     return this.db.transaction(async t=>{

fi-taxctl/app/base/utils/redisClient.js

@@ -228,15 +228,12 @@ class RedisClient {
 
 
 }
 }
 module.exports = RedisClient;
 module.exports = RedisClient;
-var client=new RedisClient();
-(async ()=>{
-  await client.rpush("riskmq",JSON.stringify({
-    key:"riskmq",
-    content:"mmffddfd"
-  }));
-  
-  console.log("end");
-})()
+// var client=new RedisClient();
+// (async ()=>{
+//   var x=await client.rpop("riskmq");
+//   var m=JSON.parse(x);
+//   console.log(m);
+// })()
 
 
 // client.keys('*').then(s=>{
 // client.keys('*').then(s=>{
 //   console.log(s);
 //   console.log(s);

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: 15,
+    db: 2,
   },
   },
   database: {
   database: {
     dbname: "fktaxctl",
     dbname: "fktaxctl",