Commit 646abf40 by 王昆

gsb

parent 2477cef2
......@@ -10,6 +10,7 @@ class InvoiceCtl extends CtlBase {
var params = qobj || {};
params.invoiceType = 1;
try {
this.doTimeCondition(params, ['signBegin', 'signEnd']);
var page = await this.service.pageByCondition(params);
return system.getResult2(page);
} catch (e) {
......
......@@ -50,6 +50,11 @@ class ElectronicContractService extends ServiceBase {
if(params.sign_body){
where.sign_body = params.sign_body;
}
var id_no = this.trim(params.id_no);
if(id_no) {
where.id_no = id_no;
}
this.addWhereTime(where, 'completed_date', params.signBegin, params.signEnd, true);
var orderby = [
["id", 'desc']
......
......@@ -22,6 +22,8 @@ class InvoiceService extends ServiceBase {
where.invoiceType = Number(params.invoiceType);
}
this.addWhereTime(where, 'invoice_time', params.signBegin, params.signEnd);
var orderby = [
["id", 'desc']
];
......
......@@ -12,16 +12,13 @@ class TaxinfoService extends ServiceBase {
var pageSize = Number(params.pageSize || 10);
var where = {};
if (params.id_no) {
where.id_no = {
[this.db.Op.like]: "%" + params.id_no + "%"
};
}
if(params.sign_body){
where.sign_body = params.sign_body;
}
if(params.id_no){
where.id_no = params.id_no
let id_no = this.trim(params.id_no);
if(id_no){
where.id_no = id_no;
}
this.addWhereTime(where, 'tax_time', params.signBegin, params.signEnd, true);
var orderby = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment