verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

7806_devToTest_2332 #2801

Merged
alexm merged 126 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:09 +00:00
Conversation 0 Commits 126 Files Changed 120 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e66d138091 - Show all commits

6
modules/client/back/methods/defaulter/filter.js
View File

@ -72,7 +72,9 @@ module.exports = Self => {
cn.name country, cn.name country,
c.countryFk, c.countryFk,
pm.name payMethod, pm.name payMethod,
r.finished IS NULL hasRecovery r.finished IS NULL hasRecovery,
dp.id departmentFk,
dp.name departmentName
FROM defaulter d FROM defaulter d
JOIN client c ON c.id = d.clientFk JOIN client c ON c.id = d.clientFk
JOIN country cn ON cn.id = c.countryFk JOIN country cn ON cn.id = c.countryFk
@ -84,6 +86,8 @@ module.exports = Self => {
SELECT MAX(started), clientFk, finished SELECT MAX(started), clientFk, finished
FROM recovery FROM recovery
) r ON r.clientFk = c.id ) r ON r.clientFk = c.id
LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
JOIN department dp ON dp.id = wd.departmentFk
WHERE WHERE
d.created = ? d.created = ?
AND d.amount > 0 AND d.amount > 0