verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-02-01 08:34:14 +01:00
parent 2528b2d3ad
commit 00ffc82f8d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/route/back/methods/route/updateWorkCenter.js
View File

@ -33,13 +33,12 @@ module.exports = Self => {
} }
try { try {
const date = Date.vnNew();
const [result] = await Self.rawSql(` const [result] = await Self.rawSql(`
SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter
FROM vn.routeConfig r FROM vn.routeConfig r
LEFT JOIN vn.workerLabour wl ON wl.workerFk = ? LEFT JOIN vn.workerLabour wl ON wl.workerFk = ?
AND ? BETWEEN wl.started AND IFNULL(wl.ended, ?); AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE());
`, [userId, date, date], myOptions); `, [userId], myOptions);
const route = await models.Route.findById(id, null, myOptions); const route = await models.Route.findById(id, null, myOptions);
await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions); await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);