free-sun
/
HumanResource
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitea.anxinyun.cn/gao.zhiyuan/HumanResource

master
deartibers 3 years ago
parent
a722262e4e 88cdfb8089
commit
993ba4294a
4 changed files with 215 additions and 257 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 190
      api/app/lib/controllers/attendance/index.js
  2. 128
      api/app/lib/controllers/member/index.js
  3. 68
      api/app/lib/utils/attendance.js
  4. 82
      api/app/lib/utils/member.js

190
api/app/lib/controllers/attendance/index.js
View File

@ -5,7 +5,7 @@ async function overtimeStatistic (ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
const { judgeHoliday, memberList } = ctx.app.fs.utils const { memberList, packageUserData, overtimeStatisticListDayType } = ctx.app.fs.utils
const { const {
keywordTarget, keyword, limit, page, orderBy, orderDirection, keywordTarget, keyword, limit, page, orderBy, orderDirection,
startDate, endDate, startDate, endDate,
@ -21,87 +21,69 @@ async function overtimeStatistic (ctx) {
overtimeCountStatisticendDate: endDate, overtimeCountStatisticendDate: endDate,
}) })
let returnD = [] let { packageUser: returnD, pepUserIds } = await packageUserData(userRes)
let pepUserIds = []
userRes.rows.forEach(u => { const sumRes = await overtimeStatisticListDayType({
let existUser = returnD.find(r => r.pepUserId == u.pepUserId) startDate, endDate, pepUserIds
if (existUser) {
if (u.depId && !existUser.departmrnt.some(d => d.id == u.depId)) {
existUser.departmrnt.push({
id: u.depId,
name: u.depName
}) })
}
if (u.roleId && !existUser.role.some(r => r.id == u.roleId)) { returnD.forEach(u => {
existUser.role.push({ u.overtimeStatistic = sumRes.filter(s => s.pepUserId == u.pepUserId)
id: u.roleId,
name: u.roleName
}) })
ctx.status = 200;
ctx.body = {
count: userRes.count,
rows: returnD
} }
} else { } catch (error) {
let obj = {} ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
for (let k in u) { ctx.status = 400;
let nextKey = k.replace('hrMember.', '') ctx.body = {
.replace('member.', '') message: typeof error == 'string' ? error : undefined
if (nextKey.includes('_')) {
nextKey = nextKey.toLowerCase()
.replace(
/(_)[a-z]/g,
(L) => L.toUpperCase()
)
.replace(/_/g, '')
} }
obj[nextKey] = u[k]
} }
pepUserIds.push(u.pepUserId)
returnD.push({
...obj,
departmrnt: u.depId ? [{
id: u.depId,
name: u.depName
}] : [],
role: u.roleId ? [{
id: u.roleId,
name: u.roleName
}] : [],
del: undefined,
pepuserid: undefined,
})
} }
async function exportOvertimeStatistic (ctx) {
try {
const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs
const { memberList, packageUserData, overtimeStatisticListDayType } = ctx.app.fs.utils
const {
keywordTarget, keyword, limit, page, orderBy, orderDirection,
startDate, endDate,
} = ctx.query
const userRes = await memberList({
keywordTarget, keyword, limit, page,
orderBy, orderDirection,
overtimeDayStatisticStartDate: startDate,
overtimeDayStatisticendDate: endDate,
overtimeCountStatistic: true,
overtimeCountStatisticStartDate: startDate,
overtimeCountStatisticendDate: endDate,
}) })
const sumRes = await clickHouse.hr.query(` let { packageUser: returnD, pepUserIds } = await packageUserData(userRes)
SELECT
overtime.pep_user_id AS pepUserId, const sumRes = await overtimeStatisticListDayType({
holiday.type AS dayType, startDate, endDate, pepUserIds
overtime.compensate AS compensate, })
sum(overtime_day.duration) AS duration
FROM overtime_day
INNER JOIN overtime
ON overtime.id = overtime_day.overtime_id
AND overtime.pep_user_id IN (${pepUserIds.join(',')})
LEFT JOIN holiday
ON holiday.day = overtime_day.day
WHERE overtime.pep_user_id IN (${pepUserIds.join(',')})
${startDate ? `
AND overtime_day.day >= '${moment(startDate).format('YYYY-MM-DD')}'
`: ''}
${endDate ? `
AND overtime_day.day <= '${moment(endDate).format('YYYY-MM-DD')}'
` : ''}
GROUP BY holiday.type, overtime.compensate, overtime.pep_user_id
`).toPromise()
returnD.forEach(u => { returnD.forEach(u => {
u.overtimeStatistic = sumRes.filter(s => s.pepUserId == u.pepUserId) u.overtimeStatistic = sumRes.filter(s => s.pepUserId == u.pepUserId)
}) })
const fileName = `人员信息_${moment().format('YYYYMMDDHHmmss')}` + '.csv'
const filePath = await simpleExcelDown({ data: exportD, header, fileName: fileName })
const fileData = fs.readFileSync(filePath);
ctx.status = 200; ctx.status = 200;
ctx.body = { ctx.set('Content-Type', 'application/x-xls');
count: userRes.count, ctx.set('Content-disposition', 'attachment; filename=' + encodeURI(fileName));
rows: returnD ctx.body = fileData;
}
} catch (error) { } catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.fs.logger.error(`path: ${ctx.path}, error: error`);
ctx.status = 400; ctx.status = 400;
ctx.body = { ctx.body = {
message: typeof error == 'string' ? error : undefined message: typeof error == 'string' ? error : undefined
@ -113,7 +95,7 @@ async function vacateStatistic (ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
const { judgeHoliday, memberList } = ctx.app.fs.utils const { judgeHoliday, memberList, packageUserData, vacateStatisticListDayType } = ctx.app.fs.utils
const { const {
keywordTarget, keyword, limit, page, orderBy, orderDirection, keywordTarget, keyword, limit, page, orderBy, orderDirection,
startDate, endDate, startDate, endDate,
@ -130,73 +112,11 @@ async function vacateStatistic (ctx) {
vacateCountStatisticendDate: endDate, vacateCountStatisticendDate: endDate,
}) })
let returnD = [] let { packageUser: returnD, pepUserIds } = await packageUserData(userRes)
let pepUserIds = []
userRes.rows.forEach(u => {
let existUser = returnD.find(r => r.pepUserId == u.pepUserId)
if (existUser) {
if (u.depId && !existUser.departmrnt.some(d => d.id == u.depId)) {
existUser.departmrnt.push({
id: u.depId,
name: u.depName
})
}
if (u.roleId && !existUser.role.some(r => r.id == u.roleId)) {
existUser.role.push({
id: u.roleId,
name: u.roleName
})
}
} else {
let obj = {}
for (let k in u) {
let nextKey = k.replace('hrMember.', '')
.replace('member.', '')
if (nextKey.includes('_')) {
nextKey = nextKey.toLowerCase()
.replace(
/(_)[a-z]/g,
(L) => L.toUpperCase()
)
.replace(/_/g, '')
}
obj[nextKey] = u[k]
}
pepUserIds.push(u.pepUserId)
returnD.push({
...obj,
departmrnt: u.depId ? [{
id: u.depId,
name: u.depName
}] : [],
role: u.roleId ? [{
id: u.roleId,
name: u.roleName
}] : [],
del: undefined,
pepuserid: undefined,
})
}
})
const sumRes = await clickHouse.hr.query(` const sumRes = await vacateStatisticListDayType({
SELECT startDate, endDate, pepUserIds
vacate.pep_user_id AS pepUserId, })
vacate.type AS type,
sum(vacate_day.duration) AS duration
FROM vacate_day
INNER JOIN vacate
ON vacate.id = vacate_day.vacate_id
AND vacate.pep_user_id IN (${pepUserIds.join(',')})
WHERE vacate.pep_user_id IN (${pepUserIds.join(',')})
${startDate ? `
AND vacate_day.day >= '${moment(startDate).format('YYYY-MM-DD')}'
`: ''}
${endDate ? `
AND vacate_day.day <= '${moment(endDate).format('YYYY-MM-DD')}'
` : ''}
GROUP BY vacate.type, vacate.pep_user_id
`).toPromise()
returnD.forEach(u => { returnD.forEach(u => {
u.vacateStatistic = sumRes.filter(s => s.pepUserId == u.pepUserId) u.vacateStatistic = sumRes.filter(s => s.pepUserId == u.pepUserId)

128
api/app/lib/controllers/member/index.js
View File

@ -267,84 +267,21 @@ async function maritalList (ctx) {
async function list (ctx) { async function list (ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { judgeHoliday, memberList } = ctx.app.fs.utils const { judgeHoliday, memberList, packageUserData } = ctx.app.fs.utils
const { const {
keywordTarget, keyword, limit, page, state, keywordTarget, keyword, limit, page, state,
hiredateStart, hiredateEnd, marital, native, workPlace, hiredateStart, hiredateEnd, marital, native, workPlace,
orderBy, orderDirection, orderBy, orderDirection,
} = ctx.query } = ctx.query
const curDay = moment().format('YYYY-MM-DD')
const nowTime = moment()
const holidayJudge = await judgeHoliday(curDay)
let workTime = false
let dayoffTime = false
if (holidayJudge) {
if (
holidayJudge.workday
&& nowTime.isAfter(moment(curDay + ' 08:30'))
&& nowTime.isBefore(moment(curDay + ' 17:30'))
) {
workTime = true
} else if (holidayJudge.dayoff || holidayJudge.festivals) {
dayoffTime = true
}
}
const userRes = await memberList({ const userRes = await memberList({
keywordTarget, keyword, limit, page, state, keywordTarget, keyword, limit, page, state,
hiredateStart, hiredateEnd, marital, native, workPlace, hiredateStart, hiredateEnd, marital, native, workPlace,
orderBy, orderDirection, nowAttendanceTime: true orderBy, orderDirection, nowAttendanceTime: true
}) })
let returnD = [] let { packageUser: returnD, pepUserIds } = await packageUserData(userRes, {
userRes.rows.forEach(u => { state: true,
let existUser = returnD.find(r => r.pepUserId == u.pepUserId)
if (existUser) {
if (u.depId && !existUser.departmrnt.some(d => d.id == u.depId)) {
existUser.departmrnt.push({
id: u.depId,
name: u.depName
})
}
if (u.roleId && !existUser.role.some(r => r.id == u.roleId)) {
existUser.role.push({
id: u.roleId,
name: u.roleName
})
}
} else {
let obj = {}
for (let k in u) {
let nextKey = k.replace('hrMember.', '')
.replace('member.', '')
if (nextKey.includes('_')) {
nextKey = nextKey.toLowerCase()
.replace(
/(_)[a-z]/g,
(L) => L.toUpperCase()
)
.replace(/_/g, '')
}
obj[nextKey] = u[k] == '1970-01-01 00:00:00.000000' ? null : u[k]
}
returnD.push({
...obj,
departmrnt: u.depId ? [{
id: u.depId,
name: u.depName
}] : [],
role: u.roleId ? [{
id: u.roleId,
name: u.roleName
}] : [],
state: obj['dimissionDate'] ? 'dimission' :
obj['vacateStartTime'] ? 'vacate' :
workTime ? 'inOffice' :
dayoffTime ? 'dayoff' : 'rest',
del: undefined,
pepuserid: undefined,
})
}
}) })
ctx.status = 200; ctx.status = 200;
@ -371,8 +308,8 @@ async function overTimeStatistics (ctx) {
const timeOption = [] const timeOption = []
if (startDate && endDate) { if (startDate && endDate) {
timeOption.push( timeOption.push(
`wpStory.create_at <= '${moment(endDate).format('YYYY-MM-DD HH:mm:ss')}' `wpStory.create_at <= '${moment(endDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'
AND wpStory.create_at > '${moment(startDate).format('YYYY-MM-DD HH:mm:ss')}'` AND wpStory.create_at >= '${moment(startDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
) )
} }
const dataRes = await clickHouse.hr.query(` const dataRes = await clickHouse.hr.query(`
@ -460,12 +397,12 @@ async function vacateStatistics (ctx) {
const timeOption = [] const timeOption = []
if (startDate) { if (startDate) {
timeOption.push( timeOption.push(
`wpStory.create_at > '${moment(startDate).format('YYYY-MM-DD HH:mm:ss')}'` `wpStory.create_at > '${moment(startDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
) )
} }
if (endDate) { if (endDate) {
timeOption.push( timeOption.push(
`wpStory.create_at <= '${moment(endDate).format('YYYY-MM-DD HH:mm:ss')}'` `wpStory.create_at <= '${moment(endDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
) )
} }
const dataRes = await clickHouse.hr.query(` const dataRes = await clickHouse.hr.query(`
@ -534,7 +471,7 @@ async function exportData (ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse, opts: { qiniu } } = ctx.app.fs const { clickHouse, opts: { qiniu } } = ctx.app.fs
const { simpleExcelDown, memberList } = ctx.app.fs.utils const { simpleExcelDown, memberList, packageUserData } = ctx.app.fs.utils
const { keywordTarget, keyword, limit, page, state, keys = '' } = ctx.query const { keywordTarget, keyword, limit, page, state, keys = '' } = ctx.query
const userRes = await memberList({ keywordTarget, keyword, limit, page, state, nowAttendanceTime: true }) const userRes = await memberList({ keywordTarget, keyword, limit, page, state, nowAttendanceTime: true })
@ -542,54 +479,7 @@ async function exportData (ctx) {
const tableAttributes = models['Member'].tableAttributes const tableAttributes = models['Member'].tableAttributes
const optionKeys = keys.split(',') const optionKeys = keys.split(',')
let exportD = [] let { packageUser: exportD, pepUserIds } = await packageUserData(userRes)
let pepUserIds = []
userRes.rows.forEach(u => {
let existUser = exportD.find(r => r.pepUserId == u.pepUserId)
if (existUser) {
if (u.depId && !existUser.departmrnt.some(d => d.id == u.depId)) {
existUser.departmrnt.push({
id: u.depId,
name: u.depName
})
}
if (u.roleId && !existUser.role.some(r => r.id == u.roleId)) {
existUser.role.push({
id: u.roleId,
name: u.roleName
})
}
} else {
let obj = {}
for (let k in u) {
let nextKey = k.replace('hrMember.', '')
.replace('member.', '')
if (nextKey.includes('_')) {
nextKey = nextKey.toLowerCase()
.replace(
/(_)[a-z]/g,
(L) => L.toUpperCase()
)
.replace(/_/g, '')
}
obj[nextKey] = u[k] == '1970-01-01 00:00:00.000000' ? null : u[k]
}
pepUserIds.push(u.pepUserId)
exportD.push({
...obj,
departmrnt: u.depId ? [{
id: u.depId,
name: u.depName
}] : [],
role: u.roleId ? [{
id: u.roleId,
name: u.roleName
}] : [],
del: undefined,
pepuserid: undefined
})
}
})
let preHeader = [{ let preHeader = [{
title: '姓名', title: '姓名',

68
api/app/lib/utils/attendance.js
View File

@ -0,0 +1,68 @@
'use strict';
const moment = require('moment')
const request = require('superagent');
module.exports = function (app, opts) {
async function overtimeStatisticListDayType ({
startDate, endDate, pepUserIds = []
}) {
const { clickHouse } = app.fs
const sumRes = await clickHouse.hr.query(`
SELECT
overtime.pep_user_id AS pepUserId,
holiday.type AS dayType,
overtime.compensate AS compensate,
sum(overtime_day.duration) AS duration
FROM overtime_day
INNER JOIN overtime
ON overtime.id = overtime_day.overtime_id
AND overtime.pep_user_id IN (${pepUserIds.join(',')})
LEFT JOIN holiday
ON holiday.day = overtime_day.day
WHERE overtime.pep_user_id IN (${pepUserIds.join(',')})
${startDate ? `
AND overtime_day.day >= '${moment(startDate).format('YYYY-MM-DD')}'
`: ''}
${endDate ? `
AND overtime_day.day <= '${moment(endDate).format('YYYY-MM-DD')}'
` : ''}
GROUP BY holiday.type, overtime.compensate, overtime.pep_user_id
`).toPromise()
return sumRes
}
async function vacateStatisticListDayType ({
startDate, endDate, pepUserIds = []
}) {
const { clickHouse } = app.fs
const sumRes = await clickHouse.hr.query(`
SELECT
vacate.pep_user_id AS pepUserId,
vacate.type AS type,
sum(vacate_day.duration) AS duration
FROM vacate_day
INNER JOIN vacate
ON vacate.id = vacate_day.vacate_id
AND vacate.pep_user_id IN (${pepUserIds.join(',')})
WHERE vacate.pep_user_id IN (${pepUserIds.join(',')})
${startDate ? `
AND vacate_day.day >= '${moment(startDate).format('YYYY-MM-DD')}'
`: ''}
${endDate ? `
AND vacate_day.day <= '${moment(endDate).format('YYYY-MM-DD')}'
` : ''}
GROUP BY vacate.type, vacate.pep_user_id
`).toPromise()
return sumRes
}
return {
overtimeStatisticListDayType,
vacateStatisticListDayType,
}
}

82
api/app/lib/utils/member.js
View File

@ -324,7 +324,87 @@ module.exports = function (app, opts) {
} }
} }
async function packageUserData (userRes, option = {}) {
const { judgeHoliday, } = app.fs.utils
let workTime = false
let dayoffTime = false
if (option.state) {
const curDay = moment().format('YYYY-MM-DD')
const nowTime = moment()
const holidayJudge = await judgeHoliday(curDay)
if (holidayJudge) {
if (
holidayJudge.workday
&& nowTime.isAfter(moment(curDay + ' 08:30'))
&& nowTime.isBefore(moment(curDay + ' 17:30'))
) {
workTime = true
} else if (holidayJudge.dayoff || holidayJudge.festivals) {
dayoffTime = true
}
}
}
let returnD = []
let pepUserIds = []
userRes.rows.forEach(u => {
let existUser = returnD.find(r => r.pepUserId == u.pepUserId)
if (existUser) {
if (u.depId && !existUser.departmrnt.some(d => d.id == u.depId)) {
existUser.departmrnt.push({
id: u.depId,
name: u.depName
})
}
if (u.roleId && !existUser.role.some(r => r.id == u.roleId)) {
existUser.role.push({
id: u.roleId,
name: u.roleName
})
}
} else {
let obj = {}
for (let k in u) {
let nextKey = k.replace('hrMember.', '')
.replace('member.', '')
if (nextKey.includes('_')) {
nextKey = nextKey.toLowerCase()
.replace(
/(_)[a-z]/g,
(L) => L.toUpperCase()
)
.replace(/_/g, '')
}
obj[nextKey] = u[k] == '1970-01-01 00:00:00.000000' ? null : u[k]
}
pepUserIds.push(u.pepUserId)
returnD.push({
...obj,
departmrnt: u.depId ? [{
id: u.depId,
name: u.depName
}] : [],
role: u.roleId ? [{
id: u.roleId,
name: u.roleName
}] : [],
state: option.state ?
obj['dimissionDate'] ? 'dimission' :
obj['vacateStartTime'] ? 'vacate' :
workTime ? 'inOffice' :
dayoffTime ? 'dayoff' : 'rest'
: undefined,
del: undefined,
pepuserid: undefined
})
}
})
return { packageUser: returnD, pepUserIds }
}
return { return {
memberList memberList,
packageUserData
} }
} }
Write Preview
Loading…
Cancel
Save