verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

feat: refs#8624 addWorkerActions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Sergio De la torre 2025-02-24 11:07:31 +01:00
parent 532b430d2b
commit 119ae0819b
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
back/methods/workerActivity/add.js
View File

@ -13,6 +13,11 @@ module.exports = Self => {
type: 'string',
description: 'Origin model from insert'
},
{
arg: 'description',
type: 'string',
description: 'Action description'
},
],
http: {
@ -21,7 +26,7 @@ module.exports = Self => {
}
});
Self.add = async(ctx, code, model, options) => {
Self.add = async(ctx, code, model, description, options) => {
const userId = ctx.req.accessToken.userId;
const myOptions = {};
@ -29,8 +34,8 @@ module.exports = Self => {
Object.assign(myOptions, options);
return await Self.rawSql(`
INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
SELECT ?, ?, ?
INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description)
SELECT ?, ?, ?, ?
FROM workerTimeControlConfig wtcc
LEFT JOIN (
SELECT wa.workerFk,
@ -43,8 +48,8 @@ module.exports = Self => {
LIMIT 1
) sub ON TRUE
WHERE sub.workerFk IS NULL
OR sub.code <> ?
OR sub.code <> ?
OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
, [userId, code, model, userId, code], myOptions);
, [userId, code, model, description, userId, code], myOptions);
};
};

9
db/versions/11455-orangeTulip/00-firstScript.sql Normal file
View File

@ -0,0 +1,9 @@
USE vn;
INSERT INTO vn.workerActivityType (code, description)
VALUES('SHELVING_CLEAN_START', 'SE INICIA LIMPIEZA CARRO'),
('SHELVING_CLEAN_STOP', 'SE FINALIZA LIMPIEZA CARRO');