Browse Source

fix 在职筛选

master
巴林闲侠 2 years ago
parent
commit
753f55c216
  1. 2
      api/app/lib/schedule/attendance.js
  2. 5
      api/app/lib/utils/member.js

2
api/app/lib/schedule/attendance.js

@ -6,7 +6,7 @@ module.exports = function (app, opts) {
// 妥妥流水账 (*^▽^*) // 妥妥流水账 (*^▽^*)
{ {
// interval: '34 21 4 * * *', // interval: '34 21 4 * * *',
interval: '34 21 */1 * * *', interval: '34 */15 * * * *',
// immediate: true, // immediate: true,
// proRun: true, // proRun: true,
}, },

5
api/app/lib/utils/member.js

@ -111,8 +111,8 @@ module.exports = function (app, opts) {
AND department.name LIKE '%${keyword}%' AND department.name LIKE '%${keyword}%'
) )
` : ''} ` : ''}
${state == 'dimission' ? `AND member.dimission_date != '1970-01-01 00:00:00.000000'` : ''} ${state == 'dimission' ? `AND member.dimission_date IS NOT null` : ''}
${state == 'onJob' ? `AND member.dimission_date = '1970-01-01 00:00:00.000000'` : ''} ${state == 'onJob' ? `AND member.dimission_date IS null` : ''}
${whereFromSelectOption.length ? `AND ${whereFromSelectOption.join('AND')}` : ''} ${whereFromSelectOption.length ? `AND ${whereFromSelectOption.join('AND')}` : ''}
` `
@ -121,6 +121,7 @@ module.exports = function (app, opts) {
hrMember."member.pep_user_id" AS pepUserId, hrMember."member.pep_user_id" AS pepUserId,
hrMember.*, hrMember.*,
user.name AS userName, user.name AS userName,
user.people_code AS userCode,
role.name AS roleName, role.name AS roleName,
role.id AS roleId, role.id AS roleId,
department.name AS depName, department.name AS depName,

Loading…
Cancel
Save