d

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

@@ -16,7 +16,9 @@ class APIBase extends DocBase {
              "rpt.saveRpt",
              "rpt.queryStatus",
              "rpt.queryReport",
-             "rpt.queryPosMap"
+             "rpt.buildWordReport",
+             "rpt.queryPosMap",
+             "rpt.updateTaskRptUrl"
         ];
         var x = lst.indexOf(fullname);
         return x >= 0;

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

@@ -79,7 +79,24 @@ class RptAPI extends APIBase{
 	console.log(JSON.stringify(pobj));
     var x=await this.rptService.queryStatus(pobj);
     return system.getResult(x);
-   }
+	}
+	//{batchid:xxx,rptUrl:xxxx}
+	async updateTaskRptUrl(pobj,query){
+		if(pobj){
+			var x=await this.rptService.updateTaskRptUrl(pobj);
+			return system.getResult(x);
+		}else{
+			return system.getResult(null);
+		}
+	}
+	async buildWordReport(pobj,query){
+		if(pobj){
+			var x=await this.rptService.buildWordReport(pobj.batchid);
+			return system.getResult(x);
+		}else{
+			return system.getResult(null);
+		}
+	}
    async queryReport(pobj,query){
 	   console.log(JSON.stringify(pobj));
 		if(pobj){

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

@@ -12,9 +12,13 @@ module.exports = (db, DataTypes) => {
       allowNull: false,
     },
     status: {
-      type:DataTypes.INTEGER,
+      type:DataTypes.STRING,
       allowNull: false,
-    }
+    },
+    biztype: {
+      type:DataTypes.STRING,
+      allowNull: true,
+    },
   },{
      paranoid: false,//假的删除
      underscored: true,

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

@@ -76,6 +76,10 @@ module.exports = (db, DataTypes) => {
     accountstandardname:{
         type:DataTypes.STRING,
         allowNull: false,
+    },
+    wordrpturl:{
+      type:DataTypes.STRING,
+      allowNull: true,
     }
   },{
      paranoid: true,//假的删除

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

@@ -163,7 +163,9 @@ class RptTypeService extends ServiceBase{
      var rs=await this.db.models.result.findAll({where:{"BatchNo":batchid},attributes:["indexName","status"],raw:true});
      var tmp={};
      rs.forEach((item=>{
-         tmp[item.indexName]=Number(item.status);
+      if(item.biztype=="ri"){
+        tmp[item.indexName]=Number(item.status);
+       }
      }));
      var rptdata=await this.apiCallWithoutAk("http://fkrptresult-service/gsb/api/report",tmp);
      if(rptdata){
@@ -178,7 +180,36 @@ class RptTypeService extends ServiceBase{
      }else{
          return null;
      }
-  
+  }
+  async updateTaskRptUrl(upinfo){
+    await this.db.models.uploadbatch.update({"wordrpturl":upinfo.rptUrl},{ where: { id: upinfo.batchid }});
+    return {};
+  }
+  //让黄静调用一下
+  async buildWordReport(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 tmp={};
+     var arrayfi=[];
+     rs.forEach((item=>{
+       if(item.biztype=="ri"){
+        tmp[item.indexName]=Number(item.status);
+       }else{
+        arrayfi.push({item[indexName]:item.status});
+       }
+     }));
+
+     var paramto={
+      "Detection_zone":batch.batchdate
+      "CreatTime":batch.updated_at,
+      "company_name":batch.companyname,
+      "Task_Num":batch.id,
+      "fi":arrayfi,
+      "ri":tmp,
+     }
+     var rptdata=await this.apiCallWithoutAk("http://fkrptresult-service/gsb/api/report2",paramto);
+     //修改
+     return {};
   }
   buildRpt(rpt,upinfo,comp,batchtemp){
     var rptupload={