diff --git a/app/controller/project.js b/app/controller/project.js index 497798a..58ad832 100644 --- a/app/controller/project.js +++ b/app/controller/project.js @@ -41,8 +41,10 @@ class ProjectController extends Controller { } async analysis() { const ctx = this.ctx; + const param = qs.parse(this.ctx.query); + const date = param.date; try { - const result = await ctx.service.project.analysis(); + const result = await ctx.service.project.analysis(date); this.ctx.body = { result, success: true, diff --git a/app/service/project.js b/app/service/project.js index 408a000..93811a8 100644 --- a/app/service/project.js +++ b/app/service/project.js @@ -5,7 +5,7 @@ const objExclude = require('../util/common').objExclude; const moment = require('moment'); class ProjectService extends Service { - async analysis() { + async analysis(date) { // const sql = ` // select // project.number, @@ -23,16 +23,17 @@ class ProjectService extends Service { select a.*,b.p_value, b.p_other_expenses,b.p_invoice from ( select - project.number, project.name, contract.value as s_value, contract.other_expenses as s_other_expenses, contract.invoice as s_invoice + project.number, project.name, project.create_time, contract.value as s_value, contract.other_expenses as s_other_expenses, contract.invoice as s_invoice from project, contract where project.sale_contract_id = contract.id ) a left join ( select - project.number, project.name, contract.value as p_value, contract.other_expenses as p_other_expenses, contract.invoice as p_invoice + project.number, project.name, project.create_time, contract.value as p_value, contract.other_expenses as p_other_expenses, contract.invoice as p_invoice from project, contract where project.purchase_contract_id = contract.id ) b on a.number = b.number + ${date !== undefined && date !== null ? ` where a.create_time like '%${date}%'` : ''} `; const result = await this.app.mysql.query(sql); return result; -- libgit2 0.21.0