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

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

@@ -18,6 +18,7 @@ class APIBase extends DocBase {
              "rpt.queryStatus2",
              "rpt.queryReport",
              "rpt.buildWordReport",
+             "rpt.resultJson",
              "rpt.queryPosMap",
              "rpt.updateTaskRptUrl"
         ];

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

@@ -94,6 +94,14 @@ class RptAPI extends APIBase{
 			return system.getResult(null);
 		}
 	}
+	async resultJson(pobj,query){
+		if(pobj){
+			var x=await this.rptService.resultJson(pobj.batchid);
+			return system.getResult(x);
+		}else{
+			return system.getResult(null);
+		}
+	}
 	async buildWordReport(pobj,query){
 		if(pobj){
 			var x=await this.rptService.buildWordReport(pobj.batchid);
@@ -152,4 +160,11 @@ class RptAPI extends APIBase{
      ];
    }
 }
-module.exports=RptAPI;
\ No newline at end of file
+module.exports=RptAPI;
+// (async ()=>{
+// 	var x=new RptAPI();
+// 	var m=await x.resultJson({batchid:226});
+// 	var xx=JSON.stringify(m);
+// 	console.log(xx);
+//   })()
+  
\ No newline at end of file

fi-taxctl/app/base/test2.js

+
+var str=new Date("2020-02-21T14:18:33.000Z").toLocaleDateString();
+console.log(str);
+
+
+
+const system=require("../../../system");
+const settings=require("../../../../config/settings");
+const uiconfig=system.getUiConfig2(settings.appKey);
+module.exports = (db, DataTypes) => {
+  return db.define("uploadbatch", {
+    userid://用户ID,
+    companyname://公司名称,
+    name://任务名称,
+    batchstatuscode:任务状态编码,
+    batchstatusname://任务状态,
+    taxtypecode:{//公司类型--S/G,
+    taxtypename:{//公司类型--S/G,
+    timetypecode: //时间类型编码,
+     timetypename//时间类型名称,
+     batchdate://检测的月度
+    accountstandardcode://会计准则
+    accountstandardname://会计准则,
+    wordrpturl://报告地址
+    
+  },{
+     paranoid: true,//假的删除
+     underscored: true,
+     version: true,
+     freezeTableName: true,
+     //freezeTableName: true,
+     // define the table's name
+     tableName: 'upload_batch',
+     validate: {
+
+     },
+     indexes:[
+       // Create a unique index on email
+        //  {
+        //    unique: true,
+        //    fields: ['email']
+        //  },
+         //
+        //  // Creates a gin index on data with the jsonb_path_ops operator
+        //  {
+        //    fields: ['data'],
+        //    using: 'gin',
+        //    operator: 'jsonb_path_ops'
+        //  },
+         //
+        //  // By default index name will be [table]_[fields]
+        //  // Creates a multi column partial index
+        //  {
+        //    name: 'public_by_author',
+        //    fields: ['author', 'status'],
+        //    where: {
+        //      status: 'public'
+        //    }
+        //  },
+         //
+        //  // A BTREE index with a ordered field
+        //  {
+        //    name: 'title_index',
+        //    method: 'BTREE',
+        //    fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
+        //  }
+     ]
+  });
+}
+
+
 // var x=isNaN("2")
 // console.log(x);
 
-var x={}
-x[1]=[1,2]
-console.log(x[1].indexOf(5))
-delete x[1]
-console.log(x[1].indexOf(5))
+// var x={}
+// x[1]=[1,2]
+// console.log(x[1].indexOf(5))
+// delete x[1]
+// console.log(x[1].indexOf(5))
 
 
 

fi-taxctl/app/config/localsettings.js

@@ -25,6 +25,26 @@ var settings={
 
     }
   },
+  // database: {
+  //   dbname: "fktaxctl",
+  //   user     : "caishui",
+  //   password : "jvmfTVDuG5YE(*Z",
+  //   config   : {
+  //     host: '47.105.186.2',
+  //     port:3307,
+  //     dialect: 'mysql',
+  //     operatorsAliases: false,
+  //     pool: {
+  //       max: 5,
+  //       min: 0,
+  //       acquire: 90000000,
+  //       idle: 1000000
+  //     },
+  //     debug: false,
+  //     logging:false
+
+  //   }
+  // },
  reqEsDevUrl:"http://192.168.4.249:9200/",
  reqHomePageDevUrl:"http://sj.app.com:3002/",
  reqAuthUrl:"http://sj.app.com:3002/auth"

fi-taxctl/app/config/routes/api.js

@@ -50,7 +50,16 @@ module.exports = function (app) {
 			p = invokeObj["doexec"].apply(invokeObj, params);
 		}
 		p.then(r => {
-			res.end(JSON.stringify(r));
+			var rs=JSON.stringify(r)
+			.replace(/%5C/g,'%5C%5C')
+                      .replace(/%22/g,"%5C%22")
+                      .replace(/%2F/g,'%5C%2F')
+                      .replace(/%08/g,'%5Cb')
+                      .replace(/%0C/g,'%5Cf')
+                      .replace(/%0A/g,'%5Cn')
+                      .replace(/%0D/g,'%5Cr')
+                      .replace(/%09/g,'%5Ct');
+			res.end(rs);
 		});
 	});
 };