Skip to content

O
oaServer
Commit 1491cd7f by lixinming
Options

2.0

parent d52a5312
Showing with 2099 additions and 1919 deletions
serverConfig.xml
<config>
<port>7088</port>
<dbConfig>
<!-- 本地mysql配置 -->
<mysqlHost>192.168.0.105</mysqlHost>
<mysqlPort>3306</mysqlPort>
<mysqlUser>root</mysqlUser>
<mysqlPwd>123456</mysqlPwd>
<dataBase>oadb</dataBase>
<dataBase>oadb</dataBase>.
<!-- 服务器mysql配置 -->
<!-- <mysqlHost>127.0.0.1</mysqlHost>
<mysqlPort>3306</mysqlPort>
<mysqlUser>root</mysqlUser>
<mysqlPwd>Yfs123456_</mysqlPwd>
<dataBase>yfs</dataBase> -->
</dbConfig>
</config>
\ No newline at end of file
src/biz/askForLeave.ts
/**
* 请假逻辑
* 作者:lxm
* 包括工时填报
*/
import moment = require("moment");
import { APPROVETYPE, ASKFORLEAVETYPE, STATED } from "../config/enum";
// import { addData, findAllAskforLeave } from "../data/admin/askForLeave";
import * as tools from "../util/tools";
import { addAskforleave, delAskForLeaveListById, findAskForLeaveCountByTime, findAskForLeaveListByApprover, findAskForLeaveListById, findAskForLeaveListByTime, findAskForLeaveListByTimeToPage, findAskForLeaveListByUserId, findAskforleaveByUserIdAndType, updateAskForLeaveState, updateAskforleave } from "../data/admin/askForLeave";
import { findDepartmentRole, findUserByUserIdNum } from "../data/admin/user";
import * as myTools from "../util/myTools";
import { APPROVETYPE, ASKFORLEAVETYPE, ROLEENUM, STATED, SYSTEMCONSTCONFIGENUM, TABLENAMEENUM } from "../config/enum";
import { queue } from "./system";
import { BizError } from "../util/bizError";
import { ERRORENUM } from "../config/errorEnum";
import { findOvertimeApprove } from "../data/admin/overtime";
import * as userData from "../data/admin/user";
import { selectDataCountByParam, selectDataListByParam, selectDataToTableAssociation, selectDataToTableAssociationToPage, selectOneDataByParam, selectOneDataToTableAssociation } from "../model/findData";
import { addData } from "../model/addData";
import { changeEnumValue } from "../util/piecemeal";
import { delData } from "../model/delData";
import { updateManyData } from "../model/updateData";
import { findUserAskCount } from "./member";
/**
* 添加请假记录
* @param userId 填报人
* @param desc 描述
* @param userInfo
* @param des 描述
* @param startTime 开始请假时间
* @param endTime 结束请假时间
* @param type 请假类型
* @param date 填报时间
* @returns {isSuccess:true, message:"添加成功"}
* @param day 填报时间
* @param time
* @returns
*/
export async function addAskForLeaveLog(userId:number, des:string, startTime:string, endTime:string, type:number, day:number, time:number) {
const DateKey = tools.getDateKey();
let st = moment(startTime).format("YYYY-MM-DD HH:mm:ss");
let et = moment(endTime).format("YYYY-MM-DD HH:mm:ss");
let id = tools.getAskForLeaveId(userId);
let userInfo = await findUserByUserIdNum(userId);
let approver = 0;
if (userInfo.roleId == 6) {
let approverInfo = await findDepartmentRole(5, userInfo.departmentId);
approver = approverInfo.userId;
} else {
approver = 16;//默认给万仪婷审批
export async function addAskForLeaveLog(userId:number, userInfo, des:string, startTime:string, endTime:string, type:number, day:number, time:number) {
/**审批人 */
let approver = 0;
if (userInfo.roleId == ROLEENUM.员工) {
approver = queue[SYSTEMCONSTCONFIGENUM.部门经理][userInfo.departmentId].userId;
} else if (userInfo.roleId == ROLEENUM.部门经理) {
approver = queue[SYSTEMCONSTCONFIGENUM.请假默认].userId;
}
/**年假必须是8的整数倍 */
if (type == ASKFORLEAVETYPE.年假) {
let timeCount = (day*8) + time;
if (timeCount%4 != 0) throw new BizError(ERRORENUM.年假限制为4小时的倍数)
if (timeCount > userInfo.annualLeave) throw new BizError(ERRORENUM.年假剩余不足请重新分配请假时间);
}
if (type == ASKFORLEAVETYPE.调休) {
let askforleaveCount = await findAskforleaveByUserIdAndType(userId, ASKFORLEAVETYPE.调休);
let approveCount = await findOvertimeApprove(userId);
let residue = approveCount - askforleaveCount;
} else if (type == ASKFORLEAVETYPE.调休) {
let askList = await selectDataListByParam(TABLENAMEENUM.请假, {userId, type:ASKFORLEAVETYPE.调休}, ["day", "time"] );
let askCount = 0;
askList.forEach(item => {
let {day, time} = item;
if (day!=0) askCount += day*8;
if (time != 0) askCount += time;
});
let ovList = await selectDataListByParam(TABLENAMEENUM.加班, {userId, state:APPROVETYPE.通过}, ["time"] );
let ovCount = 0;
ovList.forEach(item => {
let {time} = item;
ovCount += time;
});
let residue = ovCount - askCount;
let timeCount = (day*8) + time;
if (timeCount > residue) throw new BizError(ERRORENUM.调休剩余不足请重新分配请假时间)
}
await addAskforleave(id, des, st, et, userId, approver, time, day, type, DateKey);
let addInfo = {
id : myTools.generateAskForLeaveId(userId),
startTime:myTools.getDBTime(startTime),
endTime:myTools.getDBTime(endTime),
des,
userId,
approval:approver,
time,
day,
type,
dateKey:myTools.generateDateKey(),
state:0
};
await addData(TABLENAMEENUM.请假, addInfo);
return {isSuccess:true, message:"添加成功"};
}
/**
* 我的请假列表
* @param userId 用户id
*/
export async function myAskForLeaveList(userId:number) {
let dataList = await findAskForLeaveListByUserId(userId);
let column = ["id", "des", "time", "type", "day", "state", "notPassing", "dateKey", "startTime", "endTime"];
let askList = await selectDataListByParam(TABLENAMEENUM.请假, {userId}, column);
let notApproveList = [];
let notPassingList = [];
let passingList = [];
dataList.forEach(info => {
askList.forEach(info => {
let { id, des, time, type, day, state, notPassing, dateKey } = info;
let changeType = tools.changeEnumValue(ASKFORLEAVETYPE, type);
let startTime = moment(info.startTime).format("YYYY/MM/DD HH:mm");
let endTime = moment(info.endTime).format("YYYY/MM/DD HH:mm");
let changeType = changeEnumValue(ASKFORLEAVETYPE, type);
let startTime = myTools.getClientTime(info.startTime);
let endTime = myTools.getClientTime(info.endTime);
let timeStr = `${day}日${time}小时`;
if (new Date(dateKey).valueOf() > ( new Date().valueOf() - (3600*1000*24*80)) ) {
if (new Date(dateKey).valueOf() > ( new Date().valueOf() - (3600*1000*24*80)) ) {
//未超过80天
if (state == STATED.否) notApproveList.push({id, des, startTime, endTime, timeStr, changeType, type, day, time});
else if (state == APPROVETYPE.通过) passingList.push({des, startTime, endTime, timeStr, changeType});
......@@ -84,81 +111,125 @@ export async function myAskForLeaveList(userId:number) {
}
});
let askforleaveCount = await findAskforleaveByUserIdAndType(userId, ASKFORLEAVETYPE.调休);
let approveCount = await findOvertimeApprove(userId);
let residue = approveCount - askforleaveCount;
let userInfo = await findUserByUserIdNum(userId);
let annualLeave = userInfo.annualLeave || 0;
let {cto, annual} = await findUserAskCount(userId);
return {
notApproveList,
notPassingList,
passingList,
residueDay:Math.floor(residue/8),
residueTime: residue%8,
annualLeaveDay : Math.floor(annualLeave/8),
annualLeaveTime : annualLeave%8,
residueDay:Math.floor(cto/8),
residueTime: cto%8,
annualLeaveDay :Math.floor( annual/8),
annualLeaveTime : annual%8,
};
}
export async function deleteAskForLeave(id:string ) {
let askForLeaveInfo = await findAskForLeaveListById(id);
if (askForLeaveInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的请假不能修改或删除);
await delAskForLeaveListById(id);
/**
* 删除未通过审核的请假记录
* @param id
*/
export async function deleteAskForLeave(id:string) {
let askForLeaveInfo = await selectOneDataByParam(TABLENAMEENUM.请假, {id}, ["state"]);
return {isSuccess:true, message:"删除成功"};
}
if (askForLeaveInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的请假不能修改或删除);
await delData(TABLENAMEENUM.请假, {id});
export async function updateAskForLeaveLog(id:string, userId:number, des:string, startTime:string, endTime:string, type:number, day:number, time:number ) {
let overTimeInfo = await findAskForLeaveListById(id);
return {isSuccess:true, message:"删除成功"};
}
if (overTimeInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的加班不能修改或删除);
await updateAskforleave(id, des, startTime, endTime, time, day, type);
/**
* 修改 未审批的请假记录
* @param id
* @param userId
* @param des
* @param startTime
* @param endTime
* @param type
* @param day
* @param time
* @returns
*/
export async function updateAskForLeaveLog(id:string, userId:number, des:string, startTime:string, endTime:string, type:number, day:number, time:number) {
let askForLeaveInfo = await selectOneDataByParam(TABLENAMEENUM.请假, {id}, []);
if (!askForLeaveInfo || !Object.keys(askForLeaveInfo).length) {
throw new BizError(ERRORENUM.目标数据已不存在);
}
if (askForLeaveInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的数据不能修改);
let updateInfo = {des, startTime:myTools.getDBTime(startTime), endTime:myTools.getDBTime(endTime), type, day, time};
await updateManyData(TABLENAMEENUM.请假, {id}, updateInfo);
return {isSuccess:true, message:"添加成功"};
return {isSuccess:true, message:"修改"};
}
/**
* 审批 请假
* @param id
* @param type
* @param notPassingStr
* @returns
*/
export async function approveAskForLeave(id:string, type:number, notPassingStr:string) {
if (type == APPROVETYPE.不通过 && !notPassingStr) {
throw new BizError(ERRORENUM.参数错误);
let askForLeaveInfo = await selectOneDataByParam(TABLENAMEENUM.请假, {id}, []);
if (!askForLeaveInfo || !Object.keys(askForLeaveInfo).length) {
throw new BizError(ERRORENUM.目标数据已不存在);
}
if (askForLeaveInfo.state == STATED.是) {
throw new BizError(ERRORENUM.该请假已通过审批);
}
if (type == APPROVETYPE.通过) notPassingStr = "";
let askForLeaveList = await findAskForLeaveListById(id);
let askForLeaveInfo = askForLeaveList[0];
if (!askForLeaveInfo) throw new BizError(ERRORENUM.目标数据已不存在);
if (type == APPROVETYPE.通过) {
notPassingStr = "";
let { cto, annual} = await findUserAskCount(askForLeaveInfo.userId);
let askLong = ((askForLeaveInfo.day * 8 ) + askForLeaveInfo.time);
if (askForLeaveInfo.type == ASKFORLEAVETYPE.年假) {
//二次校验时间是否满足请假
let annualLeave = annual - askLong;
if (annualLeave < 0) throw new BizError(ERRORENUM.年假剩余时间不足);
if (askForLeaveInfo.type == ASKFORLEAVETYPE.年假) {
let userInfo = await findUserByUserIdNum(askForLeaveInfo.userId);
let annualLeave = userInfo.annualLeave - ((askForLeaveInfo.day * 8 ) + askForLeaveInfo.time);
await userData.updateData({annualLeave:annualLeave}, {userId:userInfo.userId});
await updateManyData(TABLENAMEENUM.用户表, {annualLeave:annualLeave}, {userId:askForLeaveInfo.userId});
} else {
/**调休 */
let residuedCTO = cto - askLong;
if (residuedCTO < 0) throw new BizError(ERRORENUM.调休时间不足);
}
} else {/**不通过 */
if (!notPassingStr) throw new BizError(ERRORENUM.参数错误);
}
await updateAskForLeaveState(id, type, notPassingStr);
await updateManyData(TABLENAMEENUM.请假, {id}, {state:type, notPassing:notPassingStr});
return {isSuccess:true, message:"操作成功"};
}
export async function approveAskForLeaveList(userId:number) {
let askForLeaveList = await findAskForLeaveListByApprover(userId);
/**
* 审批列表
* @param userId 用户id
* @returns {result:{dataList:"数据列表", peopleCount:"请假人数"}}
*/
export async function approveAskForLeaveList(userId:number) {
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name"];
let column = ["startTime", "endTime", "day", "time", "type", "des", "id"];
let askForLeaveList = await selectDataToTableAssociation(TABLENAMEENUM.请假, includeConf, {approval:userId, state:STATED.否}, column);
let dataList = [];
let peopleMap = {};
askForLeaveList.forEach(info => {
let {userName, startTime, endTime, day, time, type, des, id} = info;
let {user, startTime, endTime, day, time, type, des, id} = info;
let userName = user.name;
dataList.push({
startTime:moment(startTime).format("YYYY-MM-DD HH:mm"),
endTime:moment(endTime).format("YYYY-MM-DD HH:mm"),
startTime:myTools.getClientTime(startTime),
endTime:myTools.getClientTime(endTime),
timeStr : `${day}日${time}小时`,
type:tools.changeEnumValue(ASKFORLEAVETYPE, type),
type:changeEnumValue(ASKFORLEAVETYPE, type),
des,
userName,
id
......@@ -170,38 +241,48 @@ export async function approveAskForLeaveList(userId:number) {
}
/**
* 人事的请假列表总览
* @param page
* @param userId
* @param startTime
* @param endTime
*/
export async function getPersonnelAFLList(page:number, userId:number, startTime:string, endTime:string) {
let selectParam:any = {};
if (userId) selectParam.userId = userId;
if (startTime) selectParam.startTime = moment( startTime).format("YYYY-MM-DD")+" 00:00:00";
if (endTime) selectParam.endTime = moment( endTime).format("YYYY-MM-DD")+" 00:00:00";
let dbList = await findAskForLeaveListByTimeToPage(selectParam, (page-1)*10, 10);
let count = await findAskForLeaveCountByTime(selectParam);
if (startTime) selectParam.startTime = {"%gt%":moment( startTime).format("YYYY-MM-DD")+" 00:00:00"};
if (endTime) selectParam.endTime = {"%lt%":moment( endTime).format("YYYY-MM-DD")+" 00:00:00"};
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name", "roleId", "departmentId"];
let column = ["startTime", "endTime", "day", "time", "type", "des", "id", "state"];
let dbList = await selectDataToTableAssociationToPage(TABLENAMEENUM.请假, includeConf, selectParam, column, page, 10 );
let count = await selectDataCountByParam(TABLENAMEENUM.请假, selectParam);
let dataList = [];
dbList.forEach(info => {
let {name, startTime, endTime, day, time, type, des, state, approval } = info;
let approvalStr = "";
if (approval == 16) approvalStr = "万仪婷";
else if (approval == 2) approvalStr = "李欣鸣";
else approvalStr = "蔺荣儿";
let { startTime, endTime, day, time, type, des, state, user } = info;
let approver = "";
if (user.roleId == ROLEENUM.员工) {
approver = queue[SYSTEMCONSTCONFIGENUM.部门经理][user.departmentId].name;
} else if (user.roleId == ROLEENUM.部门经理) {
approver = queue[SYSTEMCONSTCONFIGENUM.请假默认].name;
}
let stateStr = "";
if (state == 0) stateStr = "未审批";
else if (state == 1) stateStr = "已通过";
else stateStr = "未通过";
dataList.push({
name,
startTime:moment( startTime).format("YYYY-MM-DD HH:mm:SS"),
endTime:moment( endTime).format("YYYY-MM-DD HH:mm:SS"),
name:user.name,
startTime:myTools.getClientTime(startTime),
endTime:myTools.getClientTime(endTime),
long:(day*8)+ time,
type:tools.changeEnumValue(ASKFORLEAVETYPE, type), des,
type:changeEnumValue(ASKFORLEAVETYPE, type), des,
state:stateStr,
approval:approvalStr
approval:approver
});
});
......@@ -209,47 +290,46 @@ export async function getPersonnelAFLList(page:number, userId:number, startTime:
}
export async function getMemberNameList() {
let result = await userData.selectMemberUser();
let dataList = [];
result.forEach(info => {
dataList.push({
value:info.userId,
label:info.name
});
});
return {dataList};
}
export async function getOutPutPersonnelAFLList(userId:number, startTime:string, endTime:string) {
/**
* 人事导出请假列表
* @param userId
* @param startTime
* @param endTime
*/
export async function outPutPersonnelAFLList(userId:number, startTime:string, endTime:string) {
let selectParam:any = {};
if (userId) selectParam.userId = userId;
if (startTime) selectParam.startTime = moment( startTime).format("YYYY-MM-DD")+" 00:00:00";
if (endTime) selectParam.endTime = moment( endTime).format("YYYY-MM-DD")+" 00:00:00";
if (startTime) selectParam.startTime = {"%gt%":moment( startTime).format("YYYY-MM-DD")+" 00:00:00"};
if (endTime) selectParam.endTime = {"%lt%":moment( endTime).format("YYYY-MM-DD")+" 00:00:00"};
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name", "roleId", "departmentId"];
let column = ["startTime", "endTime", "day", "time", "type", "des", "id", "state"];
let dbList = await findAskForLeaveListByTime(selectParam);
let dbList = await selectDataListByParam(TABLENAMEENUM.请假, selectParam, column);
let dataList = [];
dbList.forEach(info => {
let {name, startTime, endTime, day, time, type, des, state, approval } = info;
let {users, startTime, endTime, day, time, type, des, state } = info;
let approvalStr = "";
if (approval == 16) approvalStr = "万仪婷";
else if (approval == 2) approvalStr = "李欣鸣";
else approvalStr = "蔺荣儿";
let approver = "";
if (users.roleId == ROLEENUM.员工) {
approver = queue[SYSTEMCONSTCONFIGENUM.部门经理][users.departmentId].name;
} else if (users.roleId == ROLEENUM.部门经理) {
approver = queue[SYSTEMCONSTCONFIGENUM.请假默认].name;
}
let stateStr = "";
if (state == 0) stateStr = "未审批";
else if (state == 1) stateStr = "已通过";
else stateStr = "未通过";
dataList.push({
name,
startTime:moment( startTime).format("YYYY-MM-DD HH:mm:SS"),
endTime:moment( endTime).format("YYYY-MM-DD HH:mm:SS"),
name:users.name,
startTime:myTools.getClientTime( startTime),
endTime:myTools.getClientTime( endTime),
long:(day*8)+ time,
type:tools.changeEnumValue(ASKFORLEAVETYPE, type), des,
type:changeEnumValue(ASKFORLEAVETYPE, type), des,
state:stateStr,
approval:approvalStr
approval:approver
});
});
return {dataList};
......
src/biz/attendance.ts
/**
* 出勤表 逻辑
* 出勤
*/
import moment = require("moment");
import { getWorkLogListByTime } from "../data/admin/workinglog";
import { selectDataToTableAssociation } from "../model/findData";
import { ASKFORLEAVETYPE, STATED, TABLENAMEENUM } from "../config/enum";
import { changeEnumValue } from "../util/piecemeal";
/**
* 出勤列表
* @param year
* @param month
* @returns
*/
export async function getAttendanceData(year:number, month:number) {
let startTime = moment(`${year}-${month}-1 00:00:00`).format("YYYY-MM-DD HH:mm:SS");
let endTime = moment(`${year}-${month}-1 00:00:00`).add(1, 'months').format("YYYY-MM-DD HH:mm:SS");
let startTime = moment(`${year}-${month >=10 ? ''+month : '0'+month}-01 00:00:00`).format("YYYY-MM-DD") + ' 00:00:00';
let endTime = moment(`${year}-${month >=10 ? ''+month : '0'+month}-01 00:00:00`).add(1, 'months').format("YYYY-MM-DD") + ' 00:00:00';
let workLog = await getWorkLogListByTime(startTime, endTime);
/**查询工时 */
let selectParam = {
dateKey:{"%between%":[startTime, endTime]}
};
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name"];
let workLog = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, ["dateKey", "time"]);
//获取日历标题
let tileList = [{label:"姓名", prop:"name", index:0}];
let dataCount = moment(startTime).daysInMonth();
for (let i = 1; i <= dataCount; i++) {
let dateKey = moment(`${year}-${month}-${i} 00:00:00`).format("MM-DD");
let dateKey = moment(`${year}-${month >=10 ? ''+month : '0'+month}-${i >=10 ? ''+i : '0'+i} 00:00:00`).format("MM-DD");
tileList.push({label:dateKey, prop:dateKey, index:i});
// let weekDays = moment(dateKey).day();
// if (weekDays == 0 || weekDays == 6) {
// jumpMap[dateKey] = "-";
// } else {
// }
}
let dataMap = {};
workLog.forEach(info => {
let {dateKey, name, time} = info;
let {dateKey, user, time} = info;
let name = user.name;
let key = moment(dateKey).format("MM-DD");
if (!dataMap[name]) dataMap[name] = {name};
if (!dataMap[name][key] ) dataMap[name][key] = 0;
dataMap[name][key] += time;
})
});
/**查询请假 */
let askSelectParam = {
endTime:{"%gt%":startTime},
state:STATED.是
};
let askIncludeConf = {};
askIncludeConf[TABLENAMEENUM.用户表] = ["name"];
let askLog = await selectDataToTableAssociation(TABLENAMEENUM.请假, askIncludeConf, askSelectParam, ["startTime", "endTime", "time", "type", "day"]);
askLog.forEach(info => {
let {user, time, startTime, endTime, type, day} = info;
if (!dataMap[user.name]) dataMap[user.name] = {name:user.name};
let askDay = moment(endTime).diff(moment(startTime), 'days');
if (askDay > 0) {
for (let i = 0; i < askDay; i++) {
let dayKey = moment(startTime).add(i, 'days').format("MM-DD");
if (!dataMap[user.name][dayKey]) dataMap[user.name][dayKey] = `${changeEnumValue(ASKFORLEAVETYPE, type)}`;
}
} else if (askDay == 0) {
let dayKey = moment(startTime).format("MM-DD");
dataMap[user.name][dayKey] = `${changeEnumValue(ASKFORLEAVETYPE, type)}${(day*8)+time}h`;
}
});
let dataList = Object.values(dataMap);
......
src/biz/member.ts 0 → 100644
import { APPROVETYPE, ASKFORLEAVETYPE, DEPARTMENTENUM, TABLENAMEENUM } from "../config/enum";
import { selectDataListByParam, selectDataToTableAssociation, selectOneDataByParam } from "../model/findData";
import moment = require("moment");
import { updateManyData } from "../model/updateData";
import { getDBTime } from "../util/myTools";
/**
* 成员列表
* @returns
*/
export async function getMemberList() {
let includeConf = {};
includeConf[TABLENAMEENUM.部门表] = {colum:["name"], where:{departmentId:{"%in%":[DEPARTMENTENUM.开发, DEPARTMENTENUM.设计, DEPARTMENTENUM.项目经理, DEPARTMENTENUM.人事]}} };
includeConf[TABLENAMEENUM.角色表] = {colum:["roleName"], where:{} };
let column = ["userId", "name", "ed", "roleId", "departmentId", "annualLeave"];
let userList = await selectDataToTableAssociation(TABLENAMEENUM.用户表, includeConf, {state:1}, column);
let dataList = [];
for (let i = 0; i < userList.length; i++) {
let info = userList[i];
let {userId, name, ed, department, annualLeave} = info;
let monthDifference = 0;
let annualLeaveCount = 0;
let monthNum = new Date(ed).getMonth()
let longStr = ``;
if (ed) monthDifference = -1 * moment(ed).diff(moment(), 'months');
else {
ed = "-";
longStr = "-";
}
if (monthDifference >= 12) {
/**满一年 */
let year = Math.floor(monthDifference/12);
longStr = `${year}年`;
if (monthDifference%12) longStr += `${monthDifference%12}个月`;
annualLeaveCount = year + 5 > 10 ? 10 : year + 5;
} else {
/**未满一年 */
longStr = `${monthDifference}个月`;
annualLeaveCount = Math.round((12 - monthNum)/12*5);
}
let {cto, annual} = await findUserAskCount(userId);
dataList.push({
userId,
name,
departmentName:department.name,
ed,
longStr,
annualLeaveCount,
nowALeave:annual/8,
cto
});
}
return {dataList};
}
// /**
// * 校验年假 test
// */
// export async function eccMemberTime() {
// let includeConf = {};
// includeConf[TABLENAMEENUM.部门表] = {colum:["name"], where:{departmentId:{"%in%":[DEPARTMENTENUM.开发, DEPARTMENTENUM.设计, DEPARTMENTENUM.项目经理, DEPARTMENTENUM.人事]}} };
// includeConf[TABLENAMEENUM.角色表] = {colum:["roleName"], where:{} };
// let column = ["userId", "name", "ed", "roleId", "departmentId", "annualLeave"];
// let userList = await selectDataToTableAssociation(TABLENAMEENUM.用户表, includeConf, {state:1}, column);
// let annMap = {};
// for (let i = 0; i < userList.length; i++) {
// let info = userList[i];
// let {userId, name, ed, department} = info;
// let monthDifference = 0;
// let annualLeaveCount = 0;
// let monthNum = new Date(ed).getMonth()
// let longStr = ``;
// if (ed) monthDifference = -1 * moment(ed).diff(moment(), 'months');
// else {
// ed = "-";
// longStr = "-";
// }
// if (monthDifference >= 12) {
// /**满一年 */
// let year = Math.floor(monthDifference/12);
// longStr = `${year}年`;
// if (monthDifference%12) longStr += `${monthDifference%12}个月`;
// annualLeaveCount = year + 5 > 10 ? 10 : year + 5;
// } else {
// /**未满一年 */
// longStr = `${monthDifference}个月`;
// annualLeaveCount = Math.round((12 - monthNum)/12*5);
// }
// annMap[userId] = annualLeaveCount * 8;
// }
// let askList = await selectDataListByParam(TABLENAMEENUM.请假, {state:APPROVETYPE.通过, type:2}, [ "day", "userId", "time", "type"]);
// let nianjia = {};
// askList.forEach(info => {
// let {userId, time, day} = info;
// let itemCount = time + (day*8);
// if (!nianjia[userId]) nianjia[userId] = 0;
// nianjia[userId] += itemCount;
// });
// for (let key in annMap) {
// let dNum = annMap[key] - (nianjia[key] || 0);
// updateManyData(TABLENAMEENUM.用户表, {userId:key}, {annualLeave:dNum});
// }
// console.log("数据校验成功");
// }
export async function updateMemberData(userId:number, edTime:string) {
let ed = getDBTime(edTime);
await updateManyData(TABLENAMEENUM.用户表, {userId}, {ed});
return {isSuccess:true};
}
/**
* 用户下拉框
* @returns
*/
export async function memberSelectList() {
let result = await selectDataListByParam(TABLENAMEENUM.用户表, {}, ["userId", "name"]);
let dataList = [];
result.forEach(info => {
dataList.push({
value:info.userId,
label:info.name
});
});
return {dataList};
}
/**
* 部门用户下拉框
* @param departmentId
* @returns
*/
export async function getDepartmentUserList(departmentId:number) {
let userList = await selectDataListByParam(TABLENAMEENUM.用户表, {departmentId}, ["userId", "name"]);
let dataList = [];
userList.forEach(info => {
dataList.push({
value:info.userId,
label:info.name
});
});
return {dataList};
}
/**
* 获取用户剩余调休和剩余年假时长
* @param userId 目标用户
* @returns {result:{cto:调休, annual:年假}}
*/
export async function findUserAskCount(userId:number) {
let askList = await selectDataListByParam(TABLENAMEENUM.请假, {userId, state:APPROVETYPE.通过}, [ "day", "time", "type"]);
let tiaoXiu = 0;
askList.forEach(info => {
let {type, day, time} = info;
let itemLong = 0;
if (day != 0) itemLong += day*8;
if (time != 0) itemLong += time;
if (type == ASKFORLEAVETYPE.调休) {
tiaoXiu += itemLong;
}
});
let otList = await selectDataListByParam(TABLENAMEENUM.加班, {userId, state:APPROVETYPE.通过}, ["time"]);
let ovCount = 0;//加班时间
otList.forEach(info => {
ovCount += info.time || 0;
});
let cto = ovCount - tiaoXiu;
let thisUserInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {userId}, ["annualLeave"]);
let annual = thisUserInfo.annualLeave || 0;
return {cto, annual};
}
\ No newline at end of file
src/biz/overtime.ts
/**
* 加班
*/
import moment = require("moment");
import { addOvertime, delOvertime, findOvertime, findOvertimeApprove, findOvertimeByApprover, findOvertimeById, updateOvertime, updateOvertimeState } from "../data/admin/overtime";
import * as tools from "../util/tools";
import * as projectData from "../data/admin/project";
import { APPROVETYPE, ROLEENUM, STATED, SYSTEMCONSTCONFIGENUM, TABLENAMEENUM } from "../config/enum";
import { selectDataListByParam, selectDataToTableAssociation, selectOneDataByParam } from "../model/findData";
import { BizError } from "../util/bizError";
import { ERRORENUM } from "../config/errorEnum";
import { findDepartmentRole, findUserByUserIdNum } from "../data/admin/user";
import { findAskforleaveByUserIdAndType } from "../data/admin/askForLeave";
import { APPROVETYPE, ASKFORLEAVETYPE, STATED } from "../config/enum";
import { queue } from "./system";
import { getOvertimeId } from "../util/myTools";
import { addData } from "../model/addData";
import { findUserAskCount } from "./member";
import { updateManyData } from "../model/updateData";
import { delData } from "../model/delData";
/**
......@@ -19,60 +24,65 @@ import { APPROVETYPE, ASKFORLEAVETYPE, STATED } from "../config/enum";
* @returns {isSuccess:true, message:"添加成功"}
*/
export async function addOvertimeLog(userId:number, time:number, projectId:string, date:string, workLog:string ) {
let selectKey = moment(date).format("YYYY-MM-DD")+ ' 18:00:00'
let dateKey = moment(date).format("YYYY-MM-DD")+ ' 18:00:00'
//查找项目编号
let projectInfo = await projectData.findOnceProjectById(projectId);
let projectInfo = await selectOneDataByParam(TABLENAMEENUM.项目表, {projectId}, []);
if ( !projectInfo ) throw new BizError(ERRORENUM.不存在该项目, `${userId} 填报 ${projectId}`);
//获取个人信息
let userInfo = await findUserByUserIdNum(userId);
let approver = 0;
if (userInfo.roleId == 6) {
let approverInfo = await findDepartmentRole(5, userInfo.departmentId);
approver = approverInfo.userId;
} else {
approver = 17;//默认给张老师审批
let userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {userId}, []);
let approver = 0;
if (userInfo.roleId == ROLEENUM.员工) {
approver = queue[SYSTEMCONSTCONFIGENUM.部门经理][userInfo.departmentId].userId;
} else if (userInfo.roleId == ROLEENUM.部门经理) {
approver = queue[SYSTEMCONSTCONFIGENUM.加班默认].userId;
}
let id = tools.getOvertimeId(userId);
let id = getOvertimeId(userId);
await addOvertime(id, projectId, userId, time, selectKey, workLog, approver);
let addInfo = {id, projectId, userId, time, state:STATED.否, dateKey, workLog, approver};
await addData(TABLENAMEENUM.加班, addInfo);
return {isSuccess:true, message:"添加成功"};
}
/**
* 查看
* 加班列表
* @param userId 填报人
* @returns { 本周填报的工时信息, 本月工时统计 }
*/
export async function overtimeList(userId:number) {
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name", "projectId"];
let column = ["id", "userId", "time", "dateKey", "workLog", "state", "projectId"];
let overtimeLog = await selectDataToTableAssociation(TABLENAMEENUM.加班, includeConf, {userId}, column);
let overtimeLog = await findOvertime(userId);
let projectMap = await projectData.findAllProjectMap();
overtimeLog.sort((a, b) => {return new Date(b.dateKey).valueOf() - new Date(a.dateKey).valueOf() });
let notApprove = 0;
let dataList = [];
let overtimeCount = 0;
let approveCount = 0;
overtimeLog.forEach(info => {
let {id, projectId, userId, time, dateKey, isOutside, workLog, state } = info;
let {id, projectId, userId, time, dateKey, workLog, state, project } = info;
notApprove += state == 0 ? time : 0;
approveCount += state == APPROVETYPE.通过 ? time : 0;
overtimeCount += time;
let stateStr = "未审批"
if (state) stateStr = state == APPROVETYPE.通过 ? "通过" : "未通过";
dataList.push({
dateKey:moment(dateKey).format("YYYY-MM-DD"),
id, projectId, userId, time, isOutside, workLog,
projectName:projectMap[projectId],
id, projectId, userId, time, workLog,
projectName:project.name,
state: stateStr
});
});
let askforleaveCount = await findAskforleaveByUserIdAndType(userId, ASKFORLEAVETYPE.调休);
let approveCount = await findOvertimeApprove(userId);
let {cto} = await findUserAskCount(userId);
return { dataList, notApprove, available:approveCount-askforleaveCount, overtimeCount };
return { dataList, notApprove, available:approveCount-cto, overtimeCount };
}
......@@ -86,55 +96,80 @@ export async function overtimeList(userId:number) {
* @param workLog 工作内容
* @returns {isSuccess:true, message:"添加成功"}
*/
export async function updateOvertimeLog(id:string, userId:number, time:number, projectId:string, workLog:string ) {
let overTimeInfo = await findOvertimeById(id);
export async function updateOvertimeLog(id:string, userId:number, time:number, projectId:string, workLog:string ) {
let overTimeInfo = await selectOneDataByParam(TABLENAMEENUM.加班, {id}, []);
if (!overTimeInfo[0]) throw new BizError(ERRORENUM.目标数据已不存在)
if (overTimeInfo[0].state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的加班不能修改或删除);
if (!overTimeInfo || !overTimeInfo.id) throw new BizError(ERRORENUM.目标数据已不存在)
if (overTimeInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的加班不能修改或删除);
await updateOvertime(id, projectId, time, workLog);
await updateManyData(TABLENAMEENUM.加班, {id}, {projectId, time, workLog});
return {isSuccess:true, message:"添加成功"};
return {isSuccess:true, message:"修改成功"};
}
/**
* 删除加班
* @param id
* @returns
*/
export async function deleteOvertimeLog(id:string ) {
let overTimeInfo = await findOvertimeById(id);
if (!overTimeInfo[0]) throw new BizError(ERRORENUM.目标数据已不存在)
if (overTimeInfo[0].state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的加班不能修改或删除);
let overTimeInfo = await selectOneDataByParam(TABLENAMEENUM.加班, {id}, []);
if (!overTimeInfo || !overTimeInfo.id) throw new BizError(ERRORENUM.目标数据已不存在)
if (overTimeInfo.state == STATED.是) throw new BizError(ERRORENUM.已经通过审批的加班不能修改或删除);
await delOvertime(id);
await delData(TABLENAMEENUM.加班, {id});
return {isSuccess:true, message:"删除成功"};
}
/**
* 加班审批
* @param id
* @param type
* @param notPassingStr
* @returns
*/
export async function approveOverTime(id:string, type:number, notPassingStr:string) {
if (type == APPROVETYPE.不通过 && !notPassingStr) {
throw new BizError(ERRORENUM.参数错误);
}
if (type == APPROVETYPE.通过) notPassingStr = "";
let overTimeInfo = await findOvertimeById(id);
if (!overTimeInfo) throw new BizError(ERRORENUM.目标数据已不存在);
await updateOvertimeState(id, type, notPassingStr);
let overTimeInfo = await selectOneDataByParam(TABLENAMEENUM.加班, {id}, []);
if (!overTimeInfo || !overTimeInfo.id) throw new BizError(ERRORENUM.目标数据已不存在);
await updateManyData(TABLENAMEENUM.加班, {id}, {state:type, notPassingStr});
return {isSuccess:true, message:"操作成功"};
}
export async function approveOverTimeList(userId:number) {
let overTimeList = await findOvertimeByApprover(userId);
/**
* 审批列表
* @param userId
* @returns
*/
export async function approveOverTimeList(userId:number) {
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = ["name"];
let column = ["projectId", "id", "time", "dateKey", "workLog"];
let overTimeList = await selectDataToTableAssociation(TABLENAMEENUM.加班, includeConf, {approver:userId, state:STATED.否}, column);
let dataList = [];
let peopleMap = {};
overTimeList.forEach(info => {
let {userName, projectName, id, time, dateKey, workLog} = info;
let {user, id, time, dateKey, workLog, project} = info;
let userName = user.name;
dataList.push({
dateKey:moment(dateKey).format("YYYY-MM-DD"),
userName, projectName, id, time, workLog
userName, projectName:project.name, id, time, workLog
});
peopleMap[userName] = 1;
});
return {dataList, peopleCount:Object.keys(peopleMap).length };
}
\ No newline at end of file
src/biz/project.ts
import moment = require("moment");
/**
* 项目
*/
import { TABLENAMEENUM } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import { addProject, findAllProject, findOnceProjectById, updateProject } from "../data/admin/project"
import { addData } from "../model/addData";
import { selectDataListByParam, selectOneDataByParam } from "../model/findData";
import { updateManyData } from "../model/updateData";
import { BizError } from "../util/bizError";
import { getDBTime } from "../util/myTools";
/**
* 项目下拉框
* @returns
*/
export async function projectListForSelect() {
let projectList = await findAllProject();
let projectList = await selectDataListByParam(TABLENAMEENUM.项目表, {}, ["projectId", "name"]);
let dataList = [];
projectList.forEach(info => {
let {projectId, name} = info;
dataList.push( {id:projectId, name});
});
return {dataList:projectList}
return {dataList:dataList}
}
/**
* 所有项目列表
* @returns
*/
export async function allProjectList() {
let projectList = await findAllProject();
let projectList = await await selectDataListByParam(TABLENAMEENUM.项目表, {}, ["projectId", "projectId", "name", "controller", "createTime"]);
let dataList = [];
projectList.forEach(info => {
dataList.push({
id:info.id,
id:info.projectId,
name:info.name,
controller:info.controller||"",
controllerStr:info.controller || "无",
......@@ -30,20 +51,36 @@ export async function allProjectList() {
return {dataList};
}
export async function addProjectData(id:string, name:string, controller:string) {
let projectInfo = await findOnceProjectById(id);
if (projectInfo.id) throw new BizError(ERRORENUM.项目ID已存在);
await addProject(id, name, controller, moment().format("YYYY-MM-DD HH:mm:ss") );
/**
* 创建新项目
* @param id
* @param name
* @param controller
* @returns
*/
export async function addProjectData(id:string, name:string, controller:string) {
let projectInfo = await selectOneDataByParam(TABLENAMEENUM.项目表, {projectId:id}, ["projectId", "name"]);
if (projectInfo.projectId) throw new BizError(ERRORENUM.项目ID已存在);
await addData(TABLENAMEENUM.项目表, {projectId:id, name, controller, createTime:getDBTime() } );
return {isSuccess:true, message:"添加成功"};
}
/**
* 修改
* @param id
* @param name
* @param controller
* @returns
*/
export async function updateProjectData(id:string, name:string, controller:string) {
let projectInfo = await findOnceProjectById(id);
if (!projectInfo.id) throw new BizError(ERRORENUM.目标数据已不存在);
let projectInfo = await selectOneDataByParam(TABLENAMEENUM.项目表, {projectId:id}, ["projectId", "name"]);
if (!projectInfo.projectId) throw new BizError(ERRORENUM.目标数据已不存在);
await updateProject(id, name, controller );
await updateManyData(TABLENAMEENUM.项目表, {projectId:id}, {name, controller});
return {isSuccess:true, message:"修改成功"};
}
\ No newline at end of file
src/biz/stats.ts
......@@ -3,32 +3,54 @@
*/
import moment = require("moment");
import { DEPARTMENT } from "../config/enum";
import { findAllProject, findAllProjectMap, findProjectByName } from "../data/admin/project";
import { getThisMonthWorkingLogByProject, getThisMonthWorkingLogByProjectAndUserName, statsAllProjectTime, statsProjectTimeByTime, statsThisMonthProjectWorkingLog, statsThisMonthWorkingLog, statsTimeByDepartment } from "../data/admin/workinglog";
import { selectUserByDepartmentId } from "../data/admin/user";
import { findOvertimeByDepartmentId } from "../data/admin/overtime";
import { findAskForLeaveByDepartmentId } from "../data/admin/askForLeave";
import { APPROVETYPE, DEPARTMENTENUM, TABLENAMEENUM } from "../config/enum";
import { selectDataListByParam, selectDataToTableAssociation } from "../model/findData";
import { getDBTime } from "../util/myTools";
export async function allProjectData() {
let projectMap = await findAllProjectMap();
let dataList = await statsAllProjectTime();
/**
* 统计所有项目的部门消耗
* @returns
*/
export async function allProjectData() {
let projectDBList = await selectDataListByParam(TABLENAMEENUM.项目表, {}, ["projectId", "name"]);
let projectMap = {};
projectDBList.forEach(info => {
projectMap[info.projectId] = info.name;
});
/**计算工时 */
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name", "departmentId" ];
/**加班 */
let overtimeDBList = await selectDataToTableAssociation(TABLENAMEENUM.加班, includeConf, {state:APPROVETYPE.通过}, ["projectId", "userId", "time" ]);
let map = {};
dataList.forEach(info => {
let {time, projectId, departmentId} = info;
overtimeDBList.forEach(info => {
let {projectId, user, time} = info;
let {departmentId} = user;
if (!map[projectId]) map[projectId] = {};
if (!map[projectId][departmentId]) map[projectId][departmentId] = time;
if (!map[projectId][departmentId]) map[projectId][departmentId] = 0;
map[projectId][departmentId] += time;
});
/**工时 */
includeConf[TABLENAMEENUM.项目表] = ["name"];
let column = ["dateKey", "time", "isOutside"];
let wlDBList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, {}, column );
wlDBList.forEach(info => {
let {time, projectId, user} = info;
let {departmentId} = user;
if (!map[projectId]) map[projectId] = {};
if (!map[projectId][departmentId]) map[projectId][departmentId] = 0;
map[projectId][departmentId] += time;
});
let projectList = [];
for (let projectId in map) {
let info = map[projectId];
let ui = parseInt(info[DEPARTMENT.设计] || 0);
let dev = parseInt(info[DEPARTMENT.开发] || 0);
let pm = parseInt(info[DEPARTMENT.项目经理] || 0);
let ui = parseInt(info[DEPARTMENTENUM.设计] || 0);
let dev = parseInt(info[DEPARTMENTENUM.开发] || 0);
let pm = parseInt(info[DEPARTMENTENUM.项目经理] || 0);
projectList.push({
ui, dev, pm,
count:ui+dev+pm,
......@@ -57,31 +79,60 @@ export async function allProjectData() {
}
});
return { ui, dev, pm, projectNameList, pieChartList };
}
export async function timeProjectData(st:string, et:string) {
let projectMap = await findAllProjectMap();
/**
* 统计时间内的所有项目的部门消耗
* @param st
* @param et
* @returns
*/
export async function timeProjectData(st:string, et:string) {
let selectParam:any = {};
if (st && et) {
selectParam.dateKey = {"%between%":[moment(st).format("YYYY-MM-DD") + ' 00:00:00', moment(et).format("YYYY-MM-DD") + ' 23:59:59']};
}
let dataList = await statsProjectTimeByTime(st, et);
let projectDBList = await selectDataListByParam(TABLENAMEENUM.项目表, {}, ["projectId", "name"]);
let projectMap = {};
projectDBList.forEach(info => {
projectMap[info.projectId] = info.name;
});
/**计算工时 */
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = ["name", "departmentId" ];
/**加班 */
let overtimeDBList = await selectDataToTableAssociation(TABLENAMEENUM.加班, includeConf, Object.assign({state:APPROVETYPE.通过}, selectParam), ["projectId", "userId", "time" ]);
let map = {};
dataList.forEach(info => {
let {time, projectId, departmentId} = info;
overtimeDBList.forEach(info => {
let {projectId, user, time} = info;
let {departmentId} = user;
if (!map[projectId]) map[projectId] = {};
if (!map[projectId][departmentId]) map[projectId][departmentId] = 0;
map[projectId][departmentId] += time;
});
/**工时 */
includeConf[TABLENAMEENUM.项目表] = ["name"];
let column = ["dateKey", "time", "isOutside"];
let wlDBList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, column );
wlDBList.forEach(info => {
let {time, projectId, user} = info;
let {departmentId} = user;
if (!map[projectId]) map[projectId] = {};
if (!map[projectId][departmentId]) map[projectId][departmentId] = time;
if (!map[projectId][departmentId]) map[projectId][departmentId] = 0;
map[projectId][departmentId] += time;
});
let projectList = [];
for (let projectId in map) {
let info = map[projectId];
let ui = parseInt(info[DEPARTMENT.设计] || 0);
let dev = parseInt(info[DEPARTMENT.开发] || 0);
let pm = parseInt(info[DEPARTMENT.项目经理] || 0);
let ui = parseInt(info[DEPARTMENTENUM.设计] || 0);
let dev = parseInt(info[DEPARTMENTENUM.开发] || 0);
let pm = parseInt(info[DEPARTMENTENUM.项目经理] || 0);
projectList.push({
ui, dev, pm,
count:ui+dev+pm,
......@@ -110,17 +161,35 @@ export async function timeProjectData(st:string, et:string) {
}
});
return { ui, dev, pm, projectNameList, pieChartList };
}
/**
* 部门工时消耗统计-人员应填统计统计
* @param departmentId
* @returns
*/
export async function departmentWorkinglogData(departmentId:number) {
let thisDepartmentUserList = await selectUserByDepartmentId(departmentId);
let thisDepartmentUserList = await selectDataListByParam(TABLENAMEENUM.用户表, {departmentId}, ["name"]);
let startTime = moment().format("YYYY-MM")+'-01 00:00:00';
let worklogMap = await statsTimeByDepartment(departmentId, startTime);
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
let column = ["userId", "time", "isOutside"];
let workLogDBList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, {dateKey:{"%gt%":startTime} }, column );
let worklogMap = {};
workLogDBList.forEach(info => {
let {user, time} = info;
let {name} = user;
if (!worklogMap[name]) worklogMap[name] = 0;
worklogMap[name] += time;
});
let nowMs = new Date(moment().format("YYYY-MM-DD")+' 00:00:00').valueOf();
/**算应填的时间 */
let workDayCount = 0;
for (let i = 0; i < moment().daysInMonth(); i++) {
......@@ -150,39 +219,65 @@ export async function departmentWorkinglogData(departmentId:number) {
export async function departmentAskForLeaveAndOverTimeData(departmentId:number) {
let thisDepartmentUserList = await selectUserByDepartmentId(departmentId);
let selectTime = moment().format("YYYY-MM")+'-01 00:00:00';
let overtimeDataMap = await findOvertimeByDepartmentId(departmentId, selectTime);
let askForLeaveMap = await findAskForLeaveByDepartmentId(departmentId, selectTime);
let memberDistinctMap = {}
let includeConf = {};
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
let column = ["userId", "time", "isOutside"];
let workLogDBList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, {dateKey:{"%gt%":selectTime} }, column );
let overtimeDataMap = {};
workLogDBList.forEach(info => {
let {user, time} = info;
let {name} = user;
if (!overtimeDataMap[name]) overtimeDataMap[name] = 0;
overtimeDataMap[name] += time;
memberDistinctMap[name] = 1;
});
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
column = ["day", "time"];
let askDBList = await selectDataToTableAssociation(TABLENAMEENUM.请假, includeConf, {startTime:{"%lt%":selectTime}, endTime:{"%gt%":selectTime} }, column );
let askForLeaveMap = {};
askDBList.forEach(info => {
let {user, time, day} = info;
let {name} = user;
if (!askForLeaveMap[name]) askForLeaveMap[name] = 0;
askForLeaveMap[name] += parseInt(time) + (parseInt(day) * 8 );
memberDistinctMap[name] = 1;
});
let overTimeList = []
let askForLeaveList = [];
let nameList = [];
thisDepartmentUserList.forEach(info => {
let {name} = info;
for (let name in memberDistinctMap) {
let overTime = overtimeDataMap[name] || 0;
let askForLeaveTime = askForLeaveMap[name] || 0;
overTimeList.push(overTime);
askForLeaveList.push(askForLeaveTime);
nameList.push(name);
});
}
return { overTimeList, askForLeaveList, nameList };
}
export async function departmentProjectData(departmentId:number) {
let selectTime = moment().format("YYYY-MM")+'-01 00:00:00';
let dbList = await statsThisMonthWorkingLog(departmentId, selectTime);
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
let column = ["userId", "time", "isOutside"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf,{dateKey:{"%gt%":selectTime} }, column );
let dataMap = {};
dbList.forEach(info => {
let {projectName, time, userName} = info;
if (!dataMap[projectName]) dataMap[projectName] = {};
dataMap[projectName][userName] = parseInt(time);
let {project, time, user} = info;
if (!dataMap[project.name]) dataMap[project.name] = {};
if (!dataMap[project.name][user.name]) dataMap[project.name][user.name] = 0;
dataMap[project.name][user.name] += parseInt(time);
});
let dataList = [];
......@@ -204,21 +299,26 @@ export async function departmentProjectData(departmentId:number) {
export async function departmentProjectCalendarData(departmentId:number) {
let selectTime = moment().format("YYYY-MM")+'-01 00:00:00';
let thisTime = getDBTime();
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
let column = ["userId", "time", "isOutside", "dateKey"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf,{dateKey:{"%between%":[selectTime, thisTime]} }, column );
let workLogList = await statsThisMonthProjectWorkingLog(departmentId, selectTime);
let nowMs = new Date(moment().format("YYYY-MM-DD")+' 00:00:00').valueOf();
let dataMap = {};
let distinctMap = {};
workLogList.forEach(info => {
let {projectName, time, dateKey} = info;
distinctMap[projectName] = 1;
dbList.forEach(info => {
let {project, time, dateKey} = info;
distinctMap[project.name] = 1;
let key = moment(dateKey).format("YYYY-MM-DD");
if (!dataMap[key]) dataMap[key] = {};
if (!dataMap[key][projectName]) dataMap[key][projectName] = 0;
dataMap[key][projectName] += parseInt(time);
if (!dataMap[key][project.name]) dataMap[key][project.name] = 0;
dataMap[key][project.name] += parseInt(time);
});
let nowMs = new Date(moment().format("YYYY-MM-DD")+' 00:00:00').valueOf();
let dataList = [];
let scatterData = [];
for (let i = 0; i < moment().daysInMonth(); i++) {
......@@ -242,32 +342,33 @@ export async function departmentProjectCalendarData(departmentId:number) {
}
export async function getThisMonthProject(projectName:string, departmentId:number) {
let projectList = await findProjectByName(projectName);
if (!projectList.length) return {dataList:[]}
let projectId = projectList[0].id;
let selectTime = moment().format("YYYY-MM")+'-01 00:00:00';
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = {column:["name"], where:{name:projectName}}
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId}};
let column = ["userId", "time", "isOutside", "workLog"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf,{dateKey:{"%gt%":selectTime} }, column );
let dataBaseList = await getThisMonthWorkingLogByProject(departmentId, selectTime, projectId);
let dataList = [];
dataBaseList.forEach(info => {
let {name, dateKey, workLog, time} = info;
dataList.push({name, date:moment(dateKey).format("YYYY-MM-DD"), workLog, time});
dbList.forEach(info => {
let {project, dateKey, workLog, time} = info;
dataList.push({name:project.name, date:moment(dateKey).format("YYYY-MM-DD"), workLog, time});
});
return {dataList}
}
export async function getThisMonthProjectAndName(projectName:string, departmentId:number, userName:string) {
let projectList = await findProjectByName(projectName);
if (!projectList.length) return {dataList:[]}
let projectId = projectList[0].id;
let selectTime = moment().format("YYYY-MM")+'-01 00:00:00';
let dataBaseList = await getThisMonthWorkingLogByProjectAndUserName(departmentId, selectTime, projectId, userName);
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = {column:["name"], where:{name:projectName}}
includeConf[TABLENAMEENUM.用户表] = {column: ["name", "userId", "departmentId" ], where:{departmentId, name:userName}};
let column = ["userId", "time", "isOutside", "workLog"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf,{dateKey:{"%gt%":selectTime} }, column );
let dataList = [];
dataBaseList.forEach(info => {
let {name, dateKey, workLog, time} = info;
dataList.push({name, date:moment(dateKey).format("YYYY-MM-DD"), workLog, time});
dbList.forEach(info => {
let {user, dateKey, workLog, time} = info;
dataList.push({name:user.name, date:moment(dateKey).format("YYYY-MM-DD"), workLog, time});
});
return {dataList}
}
\ No newline at end of file
src/biz/system.ts 0 → 100644
/**
* 放系系统基础数据
*/
import { DEPARTMENTENUM, ROLEENUM, SYSTEMCONSTCONFIGENUM, TABLENAMEENUM } from "../config/enum";
import { selectOneDataByParam } from "../model/findData";
export let queue = {
};
export async function initSystemConst() {
/**部门经理 */
queue[SYSTEMCONSTCONFIGENUM.部门经理] = {};
let userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {roleId:ROLEENUM.部门经理,departmentId:DEPARTMENTENUM.开发 }, ["userId", "name"]);
queue[SYSTEMCONSTCONFIGENUM.部门经理][DEPARTMENTENUM.开发] = {userId:userInfo.userId, name:userInfo.name};
userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {roleId:ROLEENUM.部门经理,departmentId:DEPARTMENTENUM.设计 }, ["userId", "name"])
queue[SYSTEMCONSTCONFIGENUM.部门经理][DEPARTMENTENUM.设计] = {userId:userInfo.userId, name:userInfo.name};
userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {roleId:ROLEENUM.部门经理,departmentId:DEPARTMENTENUM.项目经理 }, ["userId", "name"])
queue[SYSTEMCONSTCONFIGENUM.部门经理][DEPARTMENTENUM.项目经理] = {userId:userInfo.userId, name:userInfo.name};
queue[SYSTEMCONSTCONFIGENUM.加班默认] = {userId:17, name:"张谕"};
queue[SYSTEMCONSTCONFIGENUM.请假默认] = {userId:16, name:"万仪停"};
}
\ No newline at end of file
src/biz/user.ts
/**
* 用户管理
* 作者:lxm
* 包括 登录 改密码 获取权限密码
* 用户
*/
import { DEPARTMENT, ROLE } from "../config/enum";
import { DEPARTMENTENUM, FIRSTLVLIMIT, ROLEENUM, SECONDLVLIMIT, TABLENAMEENUM } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import { FIRSTLVLIMIT, SECONDLVLIMIT } from "../config/systemConfig";
import * as userData from "../data/admin/user";
import { selectOneDataByParam } from "../model/findData";
import { updateManyData } from "../model/updateData";
import { BizError } from "../util/bizError";
import { getToken } from "../util/tools";
import { getToken } from "../util/myTools";
/**
* 登陆
* @param loginId
* @param pwd
* @returns
*/
export async function login(loginId:string, pwd:number) {
let userInfo = await userData.findUserByLoginId(loginId);
if (!userInfo) throw new BizError(ERRORENUM.登录失败, '用户不存在');
let userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {loginId}, [] );
if (!userInfo.userId) throw new BizError(ERRORENUM.登录失败, '用户不存在');
if (userInfo.pwd != pwd) throw new BizError(ERRORENUM.密码错误, `密码错误 ${pwd}`);
let token = getToken(userInfo.loginId);
await userData.updateData({token}, {loginId});
await updateManyData(TABLENAMEENUM.用户表, {loginId}, {token});
let stagingList = [];
let approveList = [];
let statsList = [];//统计
if (userInfo.departmentId == DEPARTMENT.开发 || userInfo.departmentId == DEPARTMENT.设计 ||userInfo.departmentId == DEPARTMENT.项目经理) {
if (userInfo.departmentId == DEPARTMENTENUM.开发 || userInfo.departmentId == DEPARTMENTENUM.设计 ||userInfo.departmentId == DEPARTMENTENUM.项目经理) {
stagingList = [FIRSTLVLIMIT.工时填报, FIRSTLVLIMIT.加班填报, FIRSTLVLIMIT.请假填报];
if (userInfo.roleId == ROLE.部门经理) {
if (userInfo.roleId == ROLEENUM.部门经理) {
stagingList.push(FIRSTLVLIMIT.数据导出);
stagingList.push(FIRSTLVLIMIT.部门工时列表)
statsList = [SECONDLVLIMIT.工时统计, SECONDLVLIMIT.部门统计];
if (userInfo.departmentId != DEPARTMENT.项目经理) approveList = [FIRSTLVLIMIT.加班审批, FIRSTLVLIMIT.请假审批];
if (userInfo.departmentId != DEPARTMENTENUM.项目经理) approveList = [FIRSTLVLIMIT.加班审批, FIRSTLVLIMIT.请假审批];
}
} else if (userInfo.departmentId == DEPARTMENT.领导) {
} else if (userInfo.departmentId == DEPARTMENTENUM.领导) {
stagingList = [FIRSTLVLIMIT.请假审批, FIRSTLVLIMIT.数据导出];
statsList = [SECONDLVLIMIT.工时统计, SECONDLVLIMIT.部门统计];
} else if (userInfo.departmentId == DEPARTMENT.行政 ) {
} else if (userInfo.departmentId == DEPARTMENTENUM.行政 ) {
stagingList = [FIRSTLVLIMIT.加班审批, FIRSTLVLIMIT.数据导出, FIRSTLVLIMIT.立项];
} else if (userInfo.departmentId == DEPARTMENT.人事) {
stagingList = [FIRSTLVLIMIT.人事用请假情况, FIRSTLVLIMIT.请假审批, FIRSTLVLIMIT.出勤];
} else if (userInfo.departmentId == DEPARTMENTENUM.人事) {
stagingList = [FIRSTLVLIMIT.人事用请假情况, FIRSTLVLIMIT.请假审批, FIRSTLVLIMIT.出勤, FIRSTLVLIMIT.成员列表];
}
let result = { token,
......@@ -47,7 +50,7 @@ export async function login(loginId:string, pwd:number) {
roleId:userInfo.roleId,
departmentId:userInfo.departmentId,
name:userInfo.name,
headSculpture:`http://192.168.0.105:7088/1.png`,
headSculpture:`http://192.168.0.109:7088/1.png`,
stagingList,
approveList,
statsList
......@@ -56,10 +59,17 @@ export async function login(loginId:string, pwd:number) {
return result;
}
/**
* 退出登陆
* @param userId
* @returns
*/
export async function logout(userId:number) {
let userInfo = await userData.findUserByUserIdNum(userId);
if ( !userInfo ) throw new BizError(ERRORENUM.身份验证失败);
await userData.updateData({token:""}, {userId});
let userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {userId}, [] );
if ( !userInfo.userId ) throw new BizError(ERRORENUM.身份验证失败);
await updateManyData(TABLENAMEENUM.用户表, {userId}, {token:""});
return {isSuccess:true}
}
......
src/biz/workingLog.ts
/**
* 工时逻辑
* 作者:lxm
* 包括工时填报
* 工时
*/
import moment = require("moment");
import { selectDataCountByParam, selectDataCountToTableAssociation, selectDataListByParam, selectDataToTableAssociation, selectDataToTableAssociationToPage, selectOneDataByParam } from "../model/findData";
import { DEPARTMENTENUM, TABLENAMEENUM } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import * as projectData from "../data/admin/project";
import * as workinglogData from "../data/admin/workinglog";
import * as overtimeData from "../data/admin/overtime";
import { BizError } from "../util/bizError";
import * as tools from "../util/tools";
import { findDepartmentMap } from "../data/admin/department";
import { selectUserByDepartmentId } from "../data/admin/user";
import { getWorkingLogId } from "../util/myTools";
import { addData } from "../model/addData";
import { updateManyData } from "../model/updateData";
import { delData } from "../model/delData";
import { changeEnumValue } from "../util/piecemeal";
/**
......@@ -25,20 +24,28 @@ import { selectUserByDepartmentId } from "../data/admin/user";
* @param workLog 工作内容
* @returns {isSuccess:true, message:"添加成功"}
*/
export async function addWorking(userId:number, time:number, projectId:string, isOutside:boolean, date:string, workLog:string ) {
let selectKey = moment(date).format("YYYY-MM-DD")+ ' 18:00:00'
let timeCount = await workinglogData.findWorkingLogLengthByDateKey(userId, selectKey);
if ((timeCount + time) > 8) throw new BizError(ERRORENUM.一天只有8小时多余的时间请填加班, `${timeCount + time } >= 24`);
export async function addWorking(userId:number, time:number, projectId:string, outside:boolean, date:string, workLog:string ) {
let dateKey = moment(date).format("YYYY-MM-DD")+ ' 10:00:00';
let selectStartTime = moment(date).format("YYYY-MM-DD")+ ' 00:00:00';
let selectEndTime = moment(date).format("YYYY-MM-DD")+ ' 23:00:00';
let thisDayLogList = await selectDataListByParam(TABLENAMEENUM.工时表, {userId, dateKey:{"%between%":[selectStartTime, selectEndTime]}}, ["time"]);
let thisDayLogCount = 0;
thisDayLogList.forEach(info => {
thisDayLogCount += info.time;
});
if ((thisDayLogCount + time) > 8) throw new BizError(ERRORENUM.一天只有8小时多余的时间请填加班, `${thisDayLogCount + time } >= 24`);
// if (logCount>0) throw new BizError(ERRORENUM.重复提交, `${DateKey}工时填报重复提交`);
//查找项目编号
let projectInfo = await projectData.findOnceProjectById(projectId);
if ( !projectInfo ) throw new BizError(ERRORENUM.不存在该项目, `${userId} 填报 ${projectId}`);
let projectInfo = await selectOneDataByParam(TABLENAMEENUM.项目表, {}, ["projectId", "name"]);
if ( !projectInfo.projectId ) throw new BizError(ERRORENUM.不存在该项目, `${userId} 填报 ${projectId}`);
let id = tools.getWorkingLogId(userId);
let id = getWorkingLogId(userId);
let outside = isOutside ? 1 : 0;
await workinglogData.addWorkingLog(id, projectId, userId, time, selectKey, outside, workLog);
let isOutside = outside ? 1 : 0;
let addInfo = {id, projectId, userId, time, dateKey, isOutside, workLog};
await addData(TABLENAMEENUM.工时表, addInfo);
return {isSuccess:true, message:"添加成功"};
}
......@@ -46,30 +53,44 @@ export async function addWorking(userId:number, time:number, projectId:string, i
/**
* 查看本月填报的工时 工时列表
* 本周的规则是:周一到周日
* @param userId 填报人
* @returns { dataList:本周填报的工时信息, 本周工时统计 }
*/
export async function workinglogList(userId:number) {
let weekofday = parseInt(moment().format('d')) // 计算今天是这周第几天 周日为一周中的第一天
if (weekofday == 0) weekofday = 7;
let s = moment().startOf('month').format('YYYY-MM-DD') + ' 00:00:00';// 周-日期
let e = moment().format('YYYY-MM-DD') + ' 23:59:59';// 周日期
let thisWeekLog = await workinglogData.findThisWeekWorkingLog(userId, s, e);
let selectParam = {
userId,
dateKey:{"%between%":[s, e]}
};
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
let column = ["dateKey", "time", "isOutside", "workLog", "projectId", "id"];
let thisWeekLog = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, column);
thisWeekLog.sort((a, b) => {return new Date(b.dateKey).valueOf() - new Date(a.dateKey).valueOf() });
let timeCount = 0;
let distinctMap = {};
let dataList = [];
thisWeekLog.forEach(info => {
info.dateKey = moment(info.dateKey).format("YYYY-MM-DD");
timeCount += info.time;
info.isOutside = info.isOutside == 1;
distinctMap[info.dateKey] = 1;
let {dateKey, project, isOutside, time, workLog, projectId, id} = info;
let dateKeyStr = moment(dateKey).format("YYYY-MM-DD");
dataList.push({
dateKey:dateKeyStr,
projectName:project.name,
isOutside:isOutside == 1,
time,
workLog,
projectId,
id
});
timeCount += time;
distinctMap[dateKeyStr] = 1;
});
return { dataList:thisWeekLog, timeCount, dateCount:Object.keys(distinctMap).length };
return { dataList:dataList, timeCount, dateCount:Object.keys(distinctMap).length };
}
......@@ -83,29 +104,22 @@ export async function workinglogList(userId:number) {
* @param workLog 工作内容
* @returns { isSuccess:true, message:"修改成功" }
*/
export async function updateWorkinglog(userId:number, id:string, time:number, projectId:string, isOutside:boolean, workLog:string) {
let s = moment().startOf('month').format('YYYY-MM-DD') + ' 00:00:00';// 周-日期
let e = moment().format('YYYY-MM-DD') + ' 23:59:59';// 周日期
let thisWeekLog = await workinglogData.findThisWeekWorkingLog(userId, s, e);
export async function updateWorkinglog(userId:number, id:string, time:number, projectId:string, outside:boolean, workLog:string) {
let itemInfo = await selectOneDataByParam(TABLENAMEENUM.工时表, {id}, []);
if (!itemInfo.id) throw new BizError(ERRORENUM.目标数据已不存在, id);
let checkDateKey = 0;
thisWeekLog.forEach(info => {
if (info.id == id) {
checkDateKey = new Date(info.dateKey).getDate();
}
});
if (!checkDateKey) throw new BizError(ERRORENUM.未找到该数据, id);
let dbList = await selectDataListByParam(TABLENAMEENUM.工时表, {userId, dateKey:itemInfo.dateKey}, []);
let count = time;
thisWeekLog.forEach(info => {
if (new Date(info.dateKey).getDate() == checkDateKey && info.id != id ) {
dbList.forEach(info => {
if (info.id != id) {
count += info.time;
}
});
if (count > 8) throw new BizError(ERRORENUM.一天只有8小时多余的时间请填加班, `${ count } > 8`);
let outside = isOutside ? 1 : 0;
await workinglogData.updateWorkinglog(id, projectId, time, outside, workLog);
let isOutside = outside ? 1 : 0;
await updateManyData(TABLENAMEENUM.工时表, {id}, {projectId, time, workLog, isOutside} );
return { isSuccess:true, message:"修改成功" };
}
......@@ -118,11 +132,11 @@ export async function updateWorkinglog(userId:number, id:string, time:number, pr
* @returns { isSuccess:true, message:"删除成功" }
*/
export async function delWorkinglog(userId:number, id:string,) {
let itemInfo = await selectOneDataByParam(TABLENAMEENUM.工时表, {id}, []);
let dataInfo = await workinglogData.findWorkingLogById(id);
if (!dataInfo) throw new BizError(ERRORENUM.未找到该数据, id);
if (!itemInfo.id) throw new BizError(ERRORENUM.目标数据已不存在, id);
await workinglogData.deleteWorkingLogById(id);
await delData(TABLENAMEENUM.工时表, {id});
return { isSuccess:true, message:"删除成功" };
}
......@@ -136,39 +150,41 @@ export async function delWorkinglog(userId:number, id:string,) {
* @returns {dataList:工时管理列表, total:工时列表统计 }
*/
export async function adminWorkLogForTime(page:number, startMs:string, endMs:string) {
let s = null;
let e = null;
let selectParam:any = {};
if (startMs && endMs) {
s = moment(startMs).format("YYYY-MM-DD") + ' 00:00:00';
e = moment(endMs).format("YYYY-MM-DD") + ' 23:59:59';
selectParam.dateKey = {"%between%":[moment(startMs).format("YYYY-MM-DD") + ' 00:00:00', moment(endMs).format("YYYY-MM-DD") + ' 23:59:59']};
}
let {dataList, count} = await workinglogData.findAllWorkingLogToPage((page-1 )*10, s, e);
const DepartmentMap = await findDepartmentMap();
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = ["name", "departmentId" ];
let column = ["dateKey", "time", "isOutside"];
let dbList = await selectDataToTableAssociationToPage(TABLENAMEENUM.工时表, includeConf, selectParam, column, page, 10 );
let result = [];
let dataList = [];
let distinctMap = {};
dataList.forEach(info => {
let year = moment(info.dateKey).year();
let month = moment(info.dateKey).month()+1;
let day = moment(info.dateKey).date();
result.push({
dbList.forEach(info => {
let {dateKey, users, project } = info;
let year = moment(dateKey).year();
let month = moment(dateKey).month()+1;
let day = moment(dateKey).date();
dataList.push({
year,
month,
day,
name:info.name,
departmentName : DepartmentMap[info.departmentId],
projectName:info.projectName,
projectId:info.projectId,
name:users.name,
departmentName : changeEnumValue(DEPARTMENTENUM, users.departmentId),
projectName:project.name,
projectId:project.projectId,
workLog:info.workLog,
time: info.time
});
distinctMap[day] = 1;
});
return {dataList:result, total:count, dateCount:Object.keys(distinctMap).length };
return {dataList, total:dbList.length, dateCount:Object.keys(distinctMap).length };
}
......@@ -180,20 +196,23 @@ export async function adminWorkLogForTime(page:number, startMs:string, endMs:str
* @returns {dataList:工时管理列表, total:工时列表统计 };
*/
export async function adminWorkLogForProject(page:number, startMs:string, endMs:string) {
let s = null;
let e = null;
let selectParam:any = {};
if (startMs && endMs) {
s = moment(startMs).format("YYYY-MM-DD") + ' 00:00:00';
e = moment(endMs).format("YYYY-MM-DD") + ' 23:59:59';
selectParam.dateKey = {"%between%":[moment(startMs).format("YYYY-MM-DD") + ' 00:00:00', moment(endMs).format("YYYY-MM-DD") + ' 23:59:59']};
}
let workingLog = await workinglogData.findAllWorkingLogToProject(s, e);
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name", "projectId"];
let column = ["time", "isOutside", "projectId"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, column );
let distinctMap = {};// => {name:{id:"", count:0}}
workingLog.forEach(info => {
if (!distinctMap[info.projectName]) distinctMap[info.projectName] = {id:info.projectId, count:0 }
distinctMap[info.projectName].count += info.time;
dbList.forEach(info => {
let {project, time} = info;
if (!distinctMap[project.name]) distinctMap[project.name] = {id:project.projectId, count:0 }
distinctMap[project.name].count += time;
});
let result = [];
......@@ -219,55 +238,52 @@ export async function adminWorkLogForProject(page:number, startMs:string, endMs:
* @returns {dataList:工时管理列表, name:`【按时间分工时】.xlsx`}
*/
export async function outPutAdminWorkingLogListForTime(startMs:string, endMs:string) {
let s = null;
let e = null;
let selectParam:any = {};
if (startMs && endMs) {
s = moment(startMs).format("YYYY-MM-DD") + ' 00:00:00';
e = moment(endMs).format("YYYY-MM-DD") + ' 23:59:59';
selectParam.dateKey = {"%between%":[moment(startMs).format("YYYY-MM-DD") + ' 00:00:00', moment(endMs).format("YYYY-MM-DD") + ' 23:59:59']};
}
let workingLog = await workinglogData.findAllWorkingLog(s, e);
/**加班 */
let overtimeList = await overtimeData.findOvertimeByTime(s, e);
let overtimeList = await selectDataListByParam(TABLENAMEENUM.加班, selectParam, ["dateKey", "userId", "time" ]);
let overtimeMap = {};
overtimeList.forEach(info => {
let {dateKey, name, time} = info;
let {dateKey, userId, time} = info;
let dateKeyStr = moment(dateKey).format("YYYY-MM-DD");
if (!overtimeMap[dateKeyStr]) overtimeMap[dateKeyStr] = {};
if (!overtimeMap[dateKeyStr][name]) overtimeMap[dateKeyStr][name] = time;
if (!overtimeMap[dateKeyStr][userId]) overtimeMap[dateKeyStr][userId] = time;
});
const DepartmentMap = await findDepartmentMap();
/**工时 */
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = ["name", "userId", "departmentId" ];
let column = ["dateKey", "time", "isOutside"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, column );
let result = [
["日期年","日期月","日期日","部门","姓名","项目名称","项目编号","时长/小时","工作内容", "加班时长"]
];
workingLog.forEach(info => {
let year = moment(info.dateKey).year();
let month = moment(info.dateKey).month()+1;
let day = moment(info.dateKey).date();
let departmentName = DepartmentMap[info.departmentId];
let dateKeyStr = moment(info.dateKey).format("YYYY-MM-DD");
let overtimeCount = "";
if (overtimeMap[dateKeyStr] && overtimeMap[dateKeyStr][info.name]) overtimeCount = ""+overtimeMap[dateKeyStr][info.name];
let subList = [
dbList.forEach(info => {
let {dateKey, users, project } = info;
let year = moment(dateKey).year();
let month = moment(dateKey).month()+1;
let day = moment(dateKey).date();
let itemList = [
year,
month,
day,
departmentName,
info.name,
info.projectName,
info.projectId,
changeEnumValue(DEPARTMENTENUM, users.departmentId),
users.name,
project.name,
project.projectId,
info.time,
info.workLog,
overtimeCount
]
result.push(subList);
info.workLog
];
if (overtimeMap[dateKey][users.userId]) itemList.push(overtimeMap[dateKey][users.userId]);
result.push(itemList);
});
return {dataList:result, name:`【按时间分工时】.xlsx`};
}
......@@ -279,27 +295,29 @@ export async function outPutAdminWorkingLogListForTime(startMs:string, endMs:str
* @returns {dataList:工时管理列表, name:`【按项目分工时】.xlsx`}
*/
export async function outPutAdminWorkingLogListForProject(startMs:string, endMs:string) {
let s = null;
let e = null;
let selectParam:any = {};
if (startMs && endMs) {
s = moment(startMs).format("YYYY-MM-DD") + ' 00:00:00';
e = moment(endMs).format("YYYY-MM-DD") + ' 23:59:59';
selectParam.dateKey = {"%between%":[moment(startMs).format("YYYY-MM-DD") + ' 00:00:00', moment(endMs).format("YYYY-MM-DD") + ' 23:59:59']};
}
let workingLog = await workinglogData.findAllWorkingLogToProject(s, e);
let overtimeList = await overtimeData.findOvertimeByTime(s, e);
/**加班 */
let overtimeList = await selectDataListByParam(TABLENAMEENUM.加班, selectParam, [ "projectId", "time" ]);
let overtimeMap = {};
overtimeList.forEach(info => {
let {dateKey, name, time, projectName} = info;
if (!overtimeMap[projectName]) overtimeMap[projectName] = 0;
overtimeMap[projectName] += time;
let {projectId, time} = info;
if (!overtimeMap[projectId]) overtimeMap[projectId] = 0;
overtimeMap[projectId] += time;
});
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name", "projectId"];
let column = ["time"];
let dbList = await selectDataToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam, column );
let distinctMap = {};// => {name:{id:"", count:0}}
workingLog.forEach(info => {
if (!distinctMap[info.projectName]) distinctMap[info.projectName] = {id:info.projectId, count:0 }
distinctMap[info.projectName].count += info.time;
dbList.forEach(info => {
let {project, time} = info;
if (!distinctMap[project.name]) distinctMap[project.name] = {id:project.projectId, count:0 };
distinctMap[project.name].count += time;
});
let result = [
......@@ -308,10 +326,17 @@ export async function outPutAdminWorkingLogListForProject(startMs:string, endMs:
for (let name in distinctMap) {
let {id, count} = distinctMap[name];
let dayCount = Math.ceil(count/8 * 100)/100;
let overtimeCount = overtimeMap[name] || 0;
result.push([name, id, count, dayCount, overtimeCount]);
let itemList = [
name,
id,
count,
dayCount
];
if (overtimeMap[id]) itemList.push(overtimeMap[id]);
result.push(itemList);
}
return {dataList:result, name:`【按项目分工时】.xlsx`};
}
......@@ -320,37 +345,33 @@ export async function outPutAdminWorkingLogListForProject(startMs:string, endMs:
* 部门主管看的工时列表
*/
export async function departmentWorklog(departmentId:number, startTime:string, endTime:string, userId:number, page:number, projectId:string) {
let selectParam:any = {departmentId};
let selectParam:any = {};
if (startTime && endTime) {
selectParam.dateKey = {"%between%":[moment(startTime).format("YYYY-MM-DD") + ' 00:00:00', moment(endTime).format("YYYY-MM-DD") + ' 23:59:59']};
}
if (userId) selectParam.userId = userId;
if (startTime) selectParam.startTime = moment( startTime).format("YYYY-MM-DD")+" 00:00:00";
if (endTime) selectParam.endTime = moment( endTime).format("YYYY-MM-DD")+" 00:00:00";
if (projectId) selectParam.projectId = projectId;
let dbList = await workinglogData.findWorkingLogByTimeOrUserId(departmentId, selectParam, (page-1)*10);
let count = await workinglogData.findWorkingLogCountByTimeOrUserId(departmentId, selectParam);
let includeConf = {};
includeConf[TABLENAMEENUM.项目表] = ["name"];
includeConf[TABLENAMEENUM.用户表] = { column:["name", "departmentId" ], where:{departmentId} }
let column = ["dateKey", "time", "isOutside", "workLog"];
let dbList = await selectDataToTableAssociationToPage(TABLENAMEENUM.工时表, includeConf, selectParam, column, page, 10 );
let count = await selectDataCountToTableAssociation(TABLENAMEENUM.工时表, includeConf, selectParam);
let dataList = [];
dbList.forEach(info => {
dbList.forEach(item => {
let {user, project, dateKey, time, isOutside, workLog} = item;
dataList.push({
dateKey:moment(info.dateKey).format("YYYY-MM-DD"),
name:info.name,
time:info.time,
projectName : info.projectName,
isOutside:info.isOutside,
workLog:info.workLog
dateKey:moment(dateKey).format("YYYY-MM-DD"),
name:user.name,
time:time,
projectName:project.name,
isOutside:isOutside,
workLog:workLog
});
});
return {dataList, count}
}
export async function getDepartmentUserList(departmentId:number) {
let userList = await selectUserByDepartmentId(departmentId);
let dataList = [];
userList.forEach(info => {
dataList.push({
value:info.userId,
label:info.name
});
});
return {dataList};
}
\ No newline at end of file
src/config/enum.ts
export enum OPERATIONTYPEENUM {
增 = 1,
删,
改,
查
}
export enum ASKFORLEAVETYPE {
调休 =1,
年假,
......@@ -6,10 +14,44 @@ export enum ASKFORLEAVETYPE {
事假
}
export enum APPROVETYPE {
通过 = 1,
不通过 = 2
}
export enum WORKLOGADMINTYPE {
按项目分 = 1,
按时间分
export enum TABLENAMEENUM {
用户表 = 'users',
角色表 = 'role',
项目表 = 'project',
部门表 = 'department',
加班 = 'overtime',
请假 = 'askforleave',
工时表 = 'workinglog'
}
export enum ROLEENUM {
系统管理员 = 1,
老板 = 4,
部门经理 = 5,
员工 = 6
}
export enum DEPARTMENTENUM {
财务 = 1,
设计 = 2,
开发 = 3,
项目经理 = 4,
领导 = 5,
系统管理员 = 6,
行政 = 7,
人事 = 8
}
export enum SYSTEMCONSTCONFIGENUM {
部门经理 = 1,
请假默认,
加班默认
}
export enum STATED{
......@@ -17,25 +59,29 @@ export enum STATED{
是 = 1,
}
export enum APPROVETYPE {
通过 = 1,
不通过 = 2
export enum FIRSTLVLIMIT {
工时填报 = 1,
加班填报,
请假填报,
加班审批,
请假审批,
数据导出,
立项,
人事用请假情况,
出勤,
部门工时列表 = 10,
成员列表
}
export enum DEPARTMENT {
财务 = 1,
设计,
开发,
项目经理,
领导,
系统管理员,
行政,
人事,
/**
* 统计
*/
export enum SECONDLVLIMIT {
工时统计 = 188,
部门统计,
}
export enum ROLE {
系统管理员 = 1,
老板 = 4,
部门经理 = 5,
员工 = 6,
}
export enum WORKLOGADMINTYPE {
按项目分 = 1,
按时间分
}
\ No newline at end of file
src/config/errorEnum.ts
export enum ERRORENUM {
登录失败 = 1,
密码错误,
重复提交,
身份验证失败,
非法登录,
身份验证过期,
参数错误,
未找到该数据,
表单校验失败,
一天只有8小时多余的时间请填加班,
不存在该项目,
已经通过审批的加班不能修改或删除,
已经通过审批的请假不能修改或删除,
目标数据已不存在,
项目ID已存在,
年假剩余不足请重新分配请假时间,
调休剩余不足请重新分配请假时间
不存在表 = 1,
身份验证失败,
非法登录,
身份验证过期,
数据表不存在,
参数错误,
添加时数据对象为空,
修改时数据对象为空,
年假剩余不足请重新分配请假时间,
年假限制为4小时的倍数,
调休剩余不足请重新分配请假时间,
已经通过审批的请假不能修改或删除,
目标数据已不存在,
已经通过审批的数据不能修改,
该请假已通过审批,
年假剩余时间不足,
调休时间不足,
不存在该项目,
已经通过审批的加班不能修改或删除,
项目ID已存在,
登录失败,
密码错误,
一天只有8小时多余的时间请填加班,
表单校验失败
}
/**
* 只用做code码定义
*/
export enum ERRORCODEENUM {
身份验证失败 = 401,
非法登录 = 402,
......
src/config/mysqlTableConfig.ts 0 → 100644
const Sequelize = require('sequelize');
export const TablesConfig = [
{
tableNameCn:'角色表',
tableName:'role',
schema:{
roleId:{
type:Sequelize.INTEGER(20), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
roleName:{type:Sequelize.STRING(255), allowNull:false}, //登录账号
},
association: []
},
{
tableNameCn:'部门表',
tableName:'department',
schema:{
departmentId:{
type:Sequelize.INTEGER(20), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
name:{type:Sequelize.STRING(255), allowNull:false}, //部门名称
},
association: []
},
{
tableNameCn:'用户表',
tableName:'users',
schema:{
userId: {
type:Sequelize.INTEGER(20), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
name: {type:Sequelize.STRING(255), allowNull:false}, //名称
loginId: {type:Sequelize.STRING(255), allowNull:false}, //账号
pwd: {type:Sequelize.STRING(255), allowNull:false}, //密码
roleId: {type:Sequelize.INTEGER(20), allowNull:false, references:{
model:'role',
key:'roleId'
}}, //角色id
exchangeTime: {type:Sequelize.INTEGER(20), allowNull:false}, //调休剩余
annualLeave: {type:Sequelize.INTEGER(20), allowNull:false}, //年假剩余
departmentId: {type:Sequelize.INTEGER(20), allowNull:false, references:{
model:'department',
key:'departmentId'
}}, //部门id
token: {type:Sequelize.STRING(255)},
tokenDate: {type:Sequelize.DATE},
ed: {type:Sequelize.DATE}//入职时间
},
association: []
},
{
tableNameCn:'项目表',
tableName:'project',
schema:{
projectId:{
type:Sequelize.STRING(255), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
name:{type:Sequelize.STRING(255)}, //项目名称
contractId:{type:Sequelize.STRING(255)}, //合同编号
controller:{type:Sequelize.STRING(255)}, //项目经理
createTime:{type:Sequelize.DATE}, //创建时间
},
association: []
},
{
tableNameCn:'加班',
tableName:'overtime',
schema:{
id:{
type:Sequelize.STRING(244), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
projectId:{type:Sequelize.STRING(255), references:{
model:'project',
key:'projectId'
}}, //
userId:{type:Sequelize.INTEGER(20), references:{
model:'users',
key:'userId'
}}, //
dateKey:{type:Sequelize.DATE}, //
time:{type:Sequelize.INTEGER(20), allowNull:false}, //
state:{type:Sequelize.INTEGER(20), allowNull:false}, //
approver:{type:Sequelize.INTEGER(20), allowNull:false}, //
workLog:{type:Sequelize.STRING(255), allowNull:true},
notPassing:{type:Sequelize.STRING(255), allowNull:true}//不通过理由
},
association: []
},
{
tableNameCn:'请假',
tableName:'askforleave',
schema:{
id:{
type:Sequelize.STRING(255), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
des:{type:Sequelize.STRING(255)}, //描述
startTime:{type:Sequelize.DATE}, //
endTime:{type:Sequelize.DATE}, //
userId:{type:Sequelize.INTEGER(20), references:{
model:'users',
key:'userId'
}}, //
approval:{type:Sequelize.INTEGER(20), allowNull:false}, //
time:{type:Sequelize.INTEGER(20), allowNull:false}, //
type:{type:Sequelize.INTEGER(20), allowNull:false}, //
day:{type:Sequelize.INTEGER(20), allowNull:false}, //
state:{type:Sequelize.INTEGER(20), allowNull:false}, //
notPassing:{type:Sequelize.STRING(255), allowNull:true},//不通过理由
dateKey:{type:Sequelize.DATE} //
},
association: [
]
},
{
tableNameCn:'工时表',
tableName:'workinglog',
schema:{
id:{
type:Sequelize.STRING(255), //表示属性的数据类型
allowNull:false, //表示当前列是否允许为空， false表示该列不能为空
primaryKey:true, //表示主键
unique:true //表示该列的值必须唯一
},
projectId:{type:Sequelize.STRING(255), references:{
model:'project',
key:'projectId'
}}, //
userId:{type:Sequelize.INTEGER(20), references:{
model:'users',
key:'userId'
}}, //
time:{type:Sequelize.INTEGER(20), allowNull:false}, //
dateKey:{type:Sequelize.DATE}, //
isOutside:{type:Sequelize.INTEGER(20)}, //
workLog:{type:Sequelize.STRING(255)}, //描述
},
association: [
]
}
];
\ No newline at end of file
src/config/serverConfig.ts
......@@ -3,8 +3,6 @@ import * as fs from "fs";
import { BizError } from "../util/bizError";
import { analysisXml } from "../util/myXML";
import { ServerConfig } from "../config/systemClass";
const os = require('os');
export let systemConfig = new ServerConfig;
const ConfigName = "serverConfig.xml";
......@@ -19,21 +17,26 @@ export async function initConfig() {
let {port, dbConfig } = configInfo.config;
systemConfig.port = parseInt(port[0]);
if (dbConfig) {
let dbConfigInfo = dbConfig[0];
systemConfig.mysqldb = {host:'', port:0, user:'', pwd:'', dataBase:''};
if (dbConfigInfo.mysqlHost && dbConfigInfo.mysqlPort && dbConfigInfo.mysqlUser && dbConfigInfo.dataBase) {
systemConfig.mysqlHost=dbConfigInfo.mysqlHost[0];
systemConfig.mysqlPort=parseInt(dbConfigInfo.mysqlPort[0]);
systemConfig.mysqlUser=dbConfigInfo.mysqlUser[0];
systemConfig.mysqlPwd=dbConfigInfo.mysqlPwd[0] || "";
systemConfig.dataBase=dbConfigInfo.dataBase[0];
systemConfig.mysqldb.host=dbConfigInfo.mysqlHost[0];
systemConfig.mysqldb.port=parseInt(dbConfigInfo.mysqlPort[0]);
systemConfig.mysqldb.user=dbConfigInfo.mysqlUser[0];
systemConfig.mysqldb.pwd=dbConfigInfo.mysqlPwd[0] || "";
systemConfig.mysqldb.dataBase=dbConfigInfo.dataBase[0];
}
}
}
console.log("config init success");
} catch(err) {
console.log('ERROR => 服务器配置解析错误 请检查根目录下 serverConfig.xml 文件是否正确');
console.log(err);
throw new BizError("服务器配置解析错误 请检查根目录下 serverConfig.xml 文件是否正确");
}
}
......@@ -41,7 +44,3 @@ export async function initConfig() {
function analysisMongoConnectStr(path, port, dataBase, w, timeOutMs) {
return `mongodb://${path}:${port}/${dataBase}?w=${w}&wtimeoutMS=${timeOutMs}`
}
export function getEnum() {
}
\ No newline at end of file
src/config/systemClass.ts
/**
* 系统配置类
*
*/
export class ServerConfig {
/**系统配置 */
port:number;
mysqlHost:string;
mysqlPort:number;
mysqlUser:string;
mysqlPwd:string;
dataBase:string;
mysqldb:{
host:string,
port:number,
user:string,
pwd:string,
dataBase:string,
}
}
\ No newline at end of file
src/config/systemConfig.ts deleted 100644 → 0
export enum FIRSTLVLIMIT {
工时填报 = 1,
加班填报,
请假填报,
加班审批,
请假审批,
数据导出,
立项,
人事用请假情况,
出勤,
部门工时列表 = 10
}
export enum SECONDLVLIMIT {
工时统计 = 188,
部门统计,
}
\ No newline at end of file
src/data/admin/askForLeave.ts deleted 100644 → 0
/**请假 */
import { APPROVETYPE } from "../../config/enum";
import { mysqlDB } from "../../db/mysqlInit";
const Sequelize =require('sequelize')
//创建StudentModel模型，该模型对应的表名是student
let askforleaveModel;
export async function initModel() {
var model = mysqlDB.define('askforleave',{
id:{
type:Sequelize.STRING(100), //表示属性的数据类型
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
des:{ type:Sequelize.STRING(100), allowNull:false }, //事由
startTime:{ type:Sequelize.DATE, allowNull:false },//开始时间
endTime:{ type:Sequelize.DATE, allowNull:false },//结束时间
userId:{ type:Sequelize.INTEGER, allowNull: false },//填报人
approval:{ type:Sequelize.INTEGER, allowNull: false },//审批人
time:{ type:Sequelize.INTEGER, allowNull: false},//请假时长 小时
day:{ type:Sequelize.INTEGER, allowNull: false},//请假时长 天
type:{ type:Sequelize.INTEGER, allowNull: false},//类型
dateKey:{ type:Sequelize.DATE, allowNull:false },//填报日期
state:{ type:Sequelize.INTEGER, allowNull: false},//状态
notPassing:{ type:Sequelize.STRING(100), allowNull:false }, //不通过原因
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
// //同步数据库，force的值为false，表若存在则先删除后创建，force的值为true表示表若存在则不创建
askforleaveModel = await model.sync({});
}
export async function initAskforleave(id:string, des:string, startTime:string, endTime:string, userId:number, approval:number, time:number, day:number, type:number, dateKey:string, state:number) {
await askforleaveModel.create({id, des, startTime, endTime, userId, approval, time, day, type, dateKey, notPassing:"", state});
}
/**
* 添加请假
*/
export async function addAskforleave(id:string, des:string, startTime:string, endTime:string, userId:number, approval:number, time:number, day:number, type:number, dateKey:string) {
await askforleaveModel.create({id, des, startTime, endTime, userId, approval, time, day, type, dateKey, notPassing:"", state:0});
}
export async function findAskforleaveByUserIdAndType(userId:number, type:number) {
let list = await askforleaveModel.findAll({
where:{ userId, type, state:APPROVETYPE.通过 }
});
let count = 0;
list.forEach(info => {
let {day, time} = info;
if (day!=0) count += day*8;
if (time != 0) count += time;
});
return count;
}
export async function findAskForLeaveListByUserId(userId:number) {
return await askforleaveModel.findAll({where:{userId}});
}
export async function findAskForLeaveListById(id:string) {
return await askforleaveModel.findAll({where:{id}});
}
export async function delAskForLeaveListById(id:string) {
await askforleaveModel.destroy({where:{id}});
}
export async function findAskForLeaveListByTimeToPage(param, startNum:number, endNum:number) {
let sql = `select users.name, askforleave.state, askforleave.startTime, askforleave.endTime, askforleave.day, askforleave.time, askforleave.type,askforleave.des, askforleave.approval from askforleave INNER JOIN users on users.userId = askforleave.userId `;
let paramList = Object.keys(param)
if (paramList.length) {
sql += ' where ';
for (let i= 0; i < paramList.length; i++) {
let key = paramList[i];
if (key == "startTime") {
sql += `askforleave.startTime > '${param.startTime}' `;
}
if (key == "endTime") {
sql += `askforleave.endTime < '${param.endTime}' `;
}
if (key == "userId") {
sql += `users.userId = ${param.userId}`;
}
if (i != paramList.length -1) {
sql += ' and '
}
}
}
sql += ` ORDER BY askforleave.dateKey DESC limit ${startNum}, ${endNum}`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function findAskForLeaveListByTime(param) {
let sql = `select users.name, askforleave.state, askforleave.startTime, askforleave.endTime, askforleave.day, askforleave.time, askforleave.type,askforleave.des, askforleave.approval from askforleave INNER JOIN users on users.userId = askforleave.userId `;
let paramList = Object.keys(param)
if (paramList.length) {
sql += ' where ';
for (let i= 0; i < paramList.length; i++) {
let key = paramList[i];
if (key == "startTime") {
sql += `askforleave.startTime > '${param.startTime}' `;
}
if (key == "endTime") {
sql += `askforleave.endTime < '${param.endTime}' `;
}
if (key == "userId") {
sql += `users.userId = ${param.userId}`;
}
if (i != paramList.length -1) {
sql += ' and '
}
}
}
sql += ` ORDER BY askforleave.dateKey DESC`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function findAskForLeaveCountByTime(param) {
let sql = `select count(*) as count from askforleave`;
let paramList = Object.keys(param)
if (paramList.length) {
sql += ' where ';
for (let i= 0; i < paramList.length; i++) {
let key = paramList[i];
if (key == "startTime") {
sql += `startTime > '${param.startTime}' `;
}
if (key == "endTime") {
sql += `endTime < '${param.endTime}' `;
}
if (key == "userId") {
sql += `userId = ${param.userId}`;
}
if (i != paramList.length -1) {
sql += ' and '
}
}
}
let countData = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
return countData[0].count;
}
export async function updateAskforleave(id:string, des:string, startTime:string, endTime:string, time:number, day:number, type:number) {
let updateInfo = {des, startTime, endTime, time, day, type};
await askforleaveModel.update(updateInfo, {where:{id}});
}
export async function findAskForLeaveListByApprover(userId:number) {
let sql = `select users.name as userName, askforleave.id, askforleave.startTime, askforleave.endTime, askforleave.day, askforleave.time, askforleave.type, askforleave.des from askforleave INNER JOIN users on `;
sql += `askforleave.userId = users.userId where askforleave.approval = ${userId} and askforleave.state = 0`
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function updateAskForLeaveState(id:string, state:number, notPassing?) {
let updateInfo:any = {state};
if (notPassing) updateInfo.notPassing = notPassing;
await askforleaveModel.update(updateInfo, {where:{id}});
}
export async function findAskForLeaveByDepartmentId(departmentId:number, selectTime:string) {
let sql = `select users.name, sum(askforleave.time) as time, sum(askforleave.day) as day from users LEFT JOIN askforleave on askforleave.userId = users.userId WHERE users.departmentId = ${departmentId} and (askforleave.startTime > "${selectTime}" or askforleave.endTime > "${selectTime}") GROUP BY users.name `
let dataList = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
let map = {};
dataList.forEach(info => {
map[info.name] = parseInt(info.time) + (parseInt(info.day) * 8 );
});
return map;
}
\ No newline at end of file
src/data/admin/department.ts deleted 100644 → 0
/**
* 部门表
*/
const Sequelize =require('sequelize')
const MySequesize = require('../../db/mysqlInit'); //导入创建的sequelize对象
//创建StudentModel模型，该模型对应的表名是student
let departmentModel;
export async function initModel() {
var model = MySequesize.mysqlDB.define('department',{
id:{//项目号
type:Sequelize.INTEGER,
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
name:{ type:Sequelize.STRING(100), allowNull:false },
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
// //同步数据库，force的值为false，表若存在则先删除后创建，force的值为true表示表若存在则不创建
departmentModel = await model.sync({});
}
/**
* 查询所有部门
* @returns
*/
export async function findDepartmentMap() {
let dataList = await departmentModel.findAll({ });
let map = {};
dataList.forEach(info => {
map[info.id] = info.name;
});
return map;
}
src/data/admin/overtime.ts deleted 100644 → 0
/**
* 加班表
*/
import { mysqlDB } from "../../db/mysqlInit";
const Sequelize =require('sequelize')
//创建StudentModel模型，该模型对应的表名是student
let overtimeModel;
export async function initModel() {
var model = mysqlDB.define('overtime',{
id:{
type:Sequelize.STRING(100), //表示属性的数据类型
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
projectId:{ type:Sequelize.STRING(100), allowNull:false }, //项目号
userId:{ type:Sequelize.INTEGER, allowNull: false },//填报人
time:{ type:Sequelize.INTEGER, allowNull:false },//时长
dateKey:{ type:Sequelize.DATE, allowNull:false },//填报时间
state:{ type:Sequelize.INTEGER },//状态 0=否 1=通过 2=不通过
workLog:{ type:Sequelize.STRING(200)}, //工作内容
approver:{ type:Sequelize.INTEGER, allowNull: false },//审批人
notPassing:{type:Sequelize.STRING(200)},//不通过理由
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
// //同步数据库，force的值为false，表若存在则先删除后创建，force的值为true表示表若存在则不创建
overtimeModel = await model.sync({});
}
/**
* 添加工时记录
* @param id 属性的数据类型
* @param projectId 项目号
* @param userId 填报人
* @param time 工时
* @param dateKey 填报时间
* @param isOutside 是否外出 0=否 1=是
* @param workLog 工作内容
*/
export async function addOvertime(id:string, projectId:string, userId:number, time:number, dateKey:string, workLog:string, approver:number) {
await overtimeModel.create({id, projectId, userId, time, dateKey, state:0, workLog, approver});
}
export async function findOvertimeById(id:string) {
return await overtimeModel.findAll({
where:{id}
});
}
export async function findOvertime(userId:number) {
return await overtimeModel.findAll({
where:{userId}
});
}
export async function findOvertimeApprove(userId:number) {
let list = await overtimeModel.findAll({
where:{userId, state:1}
});
let count = 0;
list.forEach(info => {
let {time} = info;
count += time;
});
return count;
}
export async function updateOvertime(id:string, projectId:string, time:number, workLog:string) {
await overtimeModel.update({projectId, time, workLog}, {where:{id}});
}
export async function delOvertime(id:string) {
await overtimeModel.destroy({where:{id}});
}
export async function updateOvertimeState(id:string, state:number, notPassing?) {
let updateInfo:any = {state};
if (notPassing) updateInfo.notPassing = notPassing;
await overtimeModel.update(updateInfo, {where:{id}});
}
export async function findOvertimeByApprover(userId:number) {
let sql = `select users.name as userName, project.name as projectName, overtime.id, overtime.time, overtime.dateKey, overtime.workLog from overtime INNER JOIN users on `;
sql += `overtime.userId = users.userId INNER JOIN project on project.id = overtime.projectId where overtime.approver = ${userId} and overtime.state = 0`
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function initOvertime(id:string, projectId:string, userId:number, time:number, dateKey:string, workLog:string, approver:number, state:number) {
await overtimeModel.create({id, projectId, userId, time, dateKey, state, workLog, approver, notPassing:""});
}
export async function findOvertimeByDepartmentId(departmentId:number, startTime:string) {
let sql = `select users.name, sum(overtime.time) as time from users LEFT JOIN overtime on overtime.userId = users.userId WHERE users.departmentId = ${departmentId} and overtime.dateKey >"${startTime}" GROUP BY users.name`
let dataList = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
let map = {};
dataList.forEach(info => {
map[info.name] = info.time;
});
return map;
}
export async function findOvertimeByTime(startTime:string, endTime:string) {
let sql = `select users.name, project.name as projectName, overtime.time, overtime.dateKey from users LEFT JOIN overtime on overtime.userId = users.userId inner join project on project.id = overtime.projectId `
if (startTime && endTime) {
sql += ` where overtime.dateKey > "${startTime}" and overtime.dateKey < "${endTime}"`;
}
let dataList = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
return dataList;
}
\ No newline at end of file
src/data/admin/project.ts deleted 100644 → 0
/**
* 项目表
*/
const Sequelize =require('sequelize')
const MySequesize = require('../../db/mysqlInit'); //导入创建的sequelize对象
//创建StudentModel模型，该模型对应的表名是student
let projectModel;
export async function initModel() {
var model = MySequesize.mysqlDB.define('project',{
id:{//项目号
type:Sequelize.STRING(200),
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
name:{ type:Sequelize.STRING(100), allowNull:false },
contractId:{ type:Sequelize.STRING(200), },//合同号
controller:{ type:Sequelize.STRING(200) }, //项目经理
createTime:{ type:Sequelize.DATE},// 创建时间
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
projectModel = await model.sync({});
}
/**
* 查询所有项目
* @returns
*/
export async function findAllProjectMap() {
let projectList = await projectModel.findAll({});
let result = {};
projectList.forEach(info => {
result[info.id] = info.name;
});
return result;
}
/**
* 根据项目id查询项目
* @param projectId
* @returns
*/
export async function findOnceProjectById(projectId:string) {
let dataList = await projectModel.findAll({
where:{id:projectId}
});
return dataList[0] || {};
}
/**
* 查询所有项目的id和名称
* @returns
*/
export async function findAllProject() {
let dataList = await projectModel.findAll({
where:{}
});
return dataList;
}
/**
* 查询项目名称
* @returns
*/
export async function findProjectByName(projectName:string) {
let dataList = await projectModel.findAll({
where:{name:projectName}
});
return dataList;
}
export async function addProject(id:string, name:string, controller:string, createTime:string) {
await projectModel.create({id, name, controller, createTime });
}
export async function updateProject(id:string, name:string, controller:string) {
await projectModel.update({name, controller }, {where:{id}});
}
\ No newline at end of file
src/data/admin/user.ts deleted 100644 → 0
/**
* 用户表
*/
import { mysqlDB } from "../../db/mysqlInit";
const Sequelize =require('sequelize')
const MySequesize = require('../../db/mysqlInit'); //导入创建的sequelize对象
let userModel;
export async function initModel() {
var model = MySequesize.mysqlDB.define('users',{
userId:{//用户id
type:Sequelize.INTEGER,
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
name:{ type:Sequelize.STRING(100), allowNull:false }, //名称
loginId:{ type:Sequelize.STRING(200)},//登录id
pwd:{ type:Sequelize.STRING(200)},//密码
roleId:{ type:Sequelize.INTEGER},//角色id 外键角色表id
exchangeTime:{ type:Sequelize.INTEGER},//调休余额
annualLeave:{ type:Sequelize.INTEGER},//年假余额
departmentId:{ type:Sequelize.INTEGER },//部门id 外键部门表id
token:{ type:Sequelize.Sequelize.STRING(200) }
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
// //同步数据库，force的值为false，表若存在则先删除后创建，force的值为true表示表若存在则不创建
userModel = await model.sync({});
// userModel = await instantiateModel('users', {
// userId:{type:String, mainKey:true},
// name:{type:String, allowNull:true},
// loginId:{ type:String},//登录id
// pwd:{ type:String},//密码
// roleId:{ type:Number},//角色id 外键角色表id
// exchangeTime:{ type:Number},//调休余额
// annualLeave:{ type:Number},//年假余额
// departmentId:{ type:Number },//部门id 外键部门表id
// token:{ type:String },
// });
}
/**
* 登录账号查询用户
* @param loginId
*/
export async function findUserByLoginId(loginId:string) {
let dataList = await userModel.findAll({ where:{loginId}});
return dataList[0] || {};
}
/**
* 登录账号查询用户
* @param loginId
*/
export async function findUserByUserId(userId:string) {
let dataList = await userModel.findAll({ where:{userId:parseInt(userId)}});
return dataList[0] || {};
}
/**
* 登录账号查询用户
* @param loginId
*/
export async function findUserByUserIdNum(userId:number) {
let dataList = await userModel.findAll({ where:{userId}});
return dataList[0] || {};
}
/**
* 根据登录信息
* @param roleId
* @param departmentId
*/
export async function findDepartmentRole(roleId:number, departmentId:number) {
let dataList = await userModel.findAll({ where:{roleId, departmentId}});
return dataList[0] || {};
}
/**
* 修改数据
* @param param 修改内容
* @param select 修改条件
* @returns
*/
export async function updateData(param:object, select:object) {
await userModel.update(param, {where:select});
}
export async function selectUserByDepartmentId(departmentId:number) {
return await userModel.findAll({ where:{departmentId}});
}
export async function selectMemberUser() {
let sql = `select * from users where departmentId >= 2 and departmentId <=4`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
src/data/admin/workinglog.ts deleted 100644 → 0
/**
* 工时表
*/
import { mysqlDB } from "../../db/mysqlInit";
const Sequelize =require('sequelize')
//创建StudentModel模型，该模型对应的表名是student
let workinglogModel;
export async function initModel() {
var model = mysqlDB.define('workinglog',{
id:{
type:Sequelize.STRING(100), //表示属性的数据类型
primaryKey:true, //表示主键
allowNull:false, //表示当前列是否允许为空，false表示该列不能为空
unique:true //表示该列的值必须唯一
},
projectId:{ type:Sequelize.STRING(100), allowNull:false }, //项目号
userId:{ type:Sequelize.INTEGER, allowNull: false },//填报人
time:{ type:Sequelize.INTEGER, allowNull:false },//工时
dateKey:{ type:Sequelize.DATE, allowNull:false },//填报时间
isOutside:{ type:Sequelize.INTEGER },//是否外出 0=否 1=是
workLog:{ type:Sequelize.STRING(200)}, //工作内容
},{
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
});
// //同步数据库，force的值为false，表若存在则先删除后创建，force的值为true表示表若存在则不创建
workinglogModel = await model.sync({});
}
/**
* 获取今日时长
* @param userId
* @param dateKey
* @returns
*/
export async function findWorkingLogLengthByDateKey(userId:number, dateKey:string) {
let count = 0;
let dataList = await workinglogModel.findAll({
where:{userId:userId, dateKey:dateKey}
});
dataList.forEach(info => {
count += info.time;
});
return count;
}
/**
* 获取本周工时记录
* @param userId
* @param startTime
* @param endTime
* @returns
*/
export async function findThisWeekWorkingLog(userId:number, startTime:string, endTime:string) {
let sql = `select workinglog.workLog, workinglog.id as id,workinglog.projectId as projectId, project.name as projectName, workinglog.time, workinglog.dateKey, `;
sql += `workinglog.isOutside from workinglog INNER JOIN project on project.id = workinglog.projectId where userId = ${userId} and dateKey > "${startTime}" and dateKey < "${endTime}" `
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
let dataList = [];
res.forEach(info => {
dataList.push(info);
});
return dataList;
}
/**
* 获取所有工时记录 按时间分
* 带分页
* @param startIndex
* @param startTime
* @param endTime
* @returns
*/
export async function findAllWorkingLogToPage(startIndex:number, startTime:string, endTime:string) {
let sql = `SELECT workinglog.workLog, workinglog.projectId AS projectId, project.NAME AS projectName, workinglog.time, workinglog.dateKey, workinglog.isOutside, users.name, users.departmentId `;
sql += `FROM workinglog INNER JOIN project ON project.id = workinglog.projectId inner JOIN users on users.userId = workinglog.userId `;
if (startTime && endTime) {
sql += ` where workinglog.dateKey > "${startTime}" and workinglog.dateKey < "${endTime}"`;
}
sql += `LIMIT ${startIndex},10`;
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
let dataList = [];
res.forEach(info => {
dataList.push(info);
});
let countSql = `SELECT workinglog.workLog, workinglog.projectId AS projectId, project.NAME AS projectName, workinglog.time, workinglog.dateKey, workinglog.isOutside, users.name, users.departmentId `;
countSql += `FROM workinglog INNER JOIN project ON project.id = workinglog.projectId inner JOIN users on users.userId = workinglog.userId`
if (startTime && endTime) {
countSql += ` where dateKey > "${startTime}" and dateKey < "${endTime}"`;
}
let countRes = await mysqlDB.query(countSql, { type: mysqlDB.QueryTypes.SELECT } );
return {dataList, count:countRes.length};
}
/**
* 获取所有工时记录 按时间分
* 不带分页
* @param startTime
* @param endTime
* @returns
*/
export async function findAllWorkingLog( startTime:string, endTime:string) {
let sql = `SELECT workinglog.workLog, workinglog.projectId AS projectId, project.NAME AS projectName, workinglog.time, workinglog.dateKey, workinglog.isOutside, users.name, users.departmentId `;
sql += `FROM workinglog INNER JOIN project ON project.id = workinglog.projectId inner JOIN users on users.userId = workinglog.userId `
if (startTime && endTime) {
sql += ` where workinglog.dateKey > "${startTime}" and workinglog.dateKey < "${endTime}"`;
}
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
return res;
}
/**
* 获取所有工时记录 按项目分
* @param startTime 开始时间
* @param endTime 结束时间
* @returns
*/
export async function findAllWorkingLogToProject(startTime:string, endTime:string) {
let sql = `SELECT workinglog.projectId AS projectId, project.NAME AS projectName, workinglog.time `;
sql += `FROM workinglog INNER JOIN project ON project.id = workinglog.projectId `;
if (startTime && endTime) {
sql += ` where workinglog.dateKey > "${startTime}" and workinglog.dateKey < "${endTime}"`;
}
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } )
return res;
}
/**
* 添加工时记录
* @param id 属性的数据类型
* @param projectId 项目号
* @param userId 填报人
* @param time 工时
* @param dateKey 填报时间
* @param isOutside 是否外出 0=否 1=是
* @param workLog 工作内容
*/
export async function addWorkingLog(id:string, projectId:string, userId:number, time:number, dateKey:string, isOutside:number, workLog:string) {
// let sql = `INSERT INTO workinglog ( id, projectId, userId, time, dateKey, isOutside, workLog) values `;
// sql += `( "${id}", "${projectId}", "${userId}", "${time}", "${dateKey}", "${isOutside}", "${workLog}" )`;
await workinglogModel.create({id, projectId, userId, time, dateKey, isOutside, workLog});
}
/**
* 修改工时记录
* @param id 属性的数据类型
* @param projectId 项目号
* @param time 工时
* @param isOutside 是否外出 0=否 1=是
* @param workLog 工作内容
*/
export async function updateWorkinglog(id:string, projectId:string, time:number, isOutside:number, workLog:string) {
let sql = `UPDATE workinglog SET projectId="${projectId}", time="${time}", isOutside="${isOutside}", workLog="${workLog}" where id="${id}"`;
await workinglogModel.update({projectId, time, isOutside, workLog}, {where:{id}});
}
/**
* 根据id查询工时记录
* @param id 属性的数据类型
* @returns
*/
export async function findWorkingLogById(id:string) {
let dataList = await workinglogModel.findAll({
where:{id}
});
return dataList[0] || {};
}
/**
* 根据id删除工时记录
* @param id 属性的数据类型
* @returns
*/
export async function deleteWorkingLogById(id:string) {
return await workinglogModel.destroy({where:{id}});
}
export async function statsAllProjectTime() {
let sql = `select workinglog.projectId, users.departmentId, sum(workinglog.time) as time from users INNER JOIN workinglog on workinglog.userId = users.userId GROUP BY users.departmentId, workinglog.projectId`;
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } )
return res;
}
export async function statsProjectTimeByTime(st:string, et:string) {
let sql = `select workinglog.projectId, users.departmentId, sum(workinglog.time) as time from users INNER JOIN workinglog on workinglog.userId = users.userId where workinglog.dateKey > '${st}' and workinglog.dateKey < '${et}' GROUP BY users.departmentId, workinglog.projectId `;
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } )
return res;
}
export async function statsTimeByDepartment(departmentId:number, st:string) {
let sql = `select users.name, sum(workinglog.time) as time from users INNER JOIN workinglog on workinglog.userId = users.userId WHERE users.departmentId = ${departmentId} and dateKey>"${st}" GROUP BY users.name`;
let data = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
let map = {};
data.forEach(info => {
map[info.name] = info.time;
});
return map;
}
export async function statsThisMonthWorkingLog(departmentId:number, st:string) {
let sql = `select project.name as projectName, users.name as userName, sum(workinglog.time) as time from users INNER JOIN workinglog on workinglog.userId = users.userId INNER JOIN project on project.id = workinglog.projectId where users.departmentId = ${departmentId} and workinglog.dateKey >"${st}" GROUP BY project.name, users.name`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function statsThisMonthProjectWorkingLog(departmentId:number, st:string) {
let sql = `select project.name as projectName, workinglog.time, workinglog.dateKey from project LEFT JOIN workinglog on workinglog.projectId= project.id INNER JOIN users on users.userId = workinglog.userId where workinglog.dateKey > "${st}" and users.departmentId = ${departmentId}`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function getThisMonthWorkingLogByProject(departmentId:number, st:string, projectId:string) {
let sql = `select workinglog.dateKey, workinglog.time, workinglog.workLog, users.name from users INNER JOIN workinglog on workinglog.userId = users.userId where users.departmentId = ${departmentId} and workinglog.dateKey > "${st}" and workinglog.projectId = "${projectId}"`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function getThisMonthWorkingLogByProjectAndUserName(departmentId:number, st:string, projectId:string, userName:string) {
let sql = `select workinglog.dateKey, workinglog.time, workinglog.workLog, users.name from users INNER JOIN workinglog on workinglog.userId = users.userId where users.departmentId = ${departmentId} and workinglog.dateKey > "${st}" and workinglog.projectId = "${projectId}" and users.name = "${userName}"`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
export async function getWorkLogListByTime(st:string, et:string) {
let sql = `select workinglog.time, users.name, workinglog.dateKey from users INNER JOIN workinglog on workinglog.userId = users.userId where workinglog.dateKey >"${st}" and workinglog.dateKey <"${et}"`;
return await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
}
/**
* 获取本周工时记录
* @param userId
* @param startTime
* @param endTime
* @returns
*/
export async function findWorkingLogByTimeOrUserId(departmentId:number, param, startNumber) {
let sql = `select workinglog.workLog, users.name as name, workinglog.id as id, project.name as projectName, workinglog.time, workinglog.dateKey, `;
sql += `workinglog.isOutside from workinglog INNER JOIN project on project.id = workinglog.projectId inner join users on users.userId = workinglog.userId where users.departmentId=${departmentId} `;
let paramList = Object.keys(param)
if (paramList.length) {
for (let i= 0; i < paramList.length; i++) {
let key = paramList[i];
if (key == "startTime") {
sql += `workinglog.dateKey > '${param.startTime}' `;
}
if (key == "endTime") {
sql += `workinglog.dateKey < '${param.endTime}' `;
}
if (key == "userId") {
sql += `users.userId = ${param.userId}`;
}
if (key == "projectId") {
sql += `workinglog.projectId = '${param.projectId}'`;
}
if (i != paramList.length -1) {
sql += ' and '
}
}
}
sql += ` ORDER BY workinglog.dateKey DESC limit ${startNumber}, ${10}`;
let res = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
return res;
}
/**
* 获取本周工时记录数据数
* @param userId
* @param startTime
* @param endTime
* @returns
*/
export async function findWorkingLogCountByTimeOrUserId(departmentId:number, param) {
let sql = `select count(*) as count from workinglog inner join users on users.userId = workinglog.userId where users.departmentId=${departmentId} `;
let paramList = Object.keys(param);
if (paramList.length) {
for (let i= 0; i < paramList.length; i++) {
let key = paramList[i];
if (key == "startTime") {
sql += `workinglog.dateKey > '${param.startTime}' `;
}
if (key == "endTime") {
sql += `workinglog.dateKey < '${param.endTime}' `;
}
if (key == "userId") {
sql += `users.userId = ${param.userId}`;
}
if (key == "projectId") {
sql += `workinglog.projectId = '${param.projectId}'`;
}
if (i != paramList.length -1) {
sql += ' and '
}
}
}
let countData = await mysqlDB.query(sql, { type: mysqlDB.QueryTypes.SELECT } );
return countData[0].count;
}
\ No newline at end of file
src/db/initTable.ts deleted 100644 → 0
import * as workinglogData from "../data/admin/workinglog";
import * as projectData from "../data/admin/project";
import * as userData from "../data/admin/user";
import * as departmentData from "../data/admin/department";
import * as overtimeData from "../data/admin/overtime";
import * as askForLeaveData from "../data/admin/askForLeave";
export async function initTable() {
await workinglogData.initModel();
await projectData.initModel();
await userData.initModel();
await departmentData.initModel();
await overtimeData.initModel();
await askForLeaveData.initModel();
}
\ No newline at end of file
src/db/mysqlClass.ts deleted 100644 → 0
const Sequelize = require('sequelize');
export async function instantiateModel(tableName:string, config) {
let tablesBase = {};
for ( let key in config) {
let info = config[key];
let keysValue:any = {type:null};
if (typeof config.type.isFinite == "function") {
keysValue.type = Sequelize.INTEGER;
} else if (typeof config.type.concat == "function") {
keysValue.type = Sequelize.STRING(200);
} else if (typeof config.type.getFullYear == "function") {
keysValue.type = Sequelize.DATE;
}
if (info.mainKey) {
keysValue.primaryKey = true; //表示主键
keysValue.allowNull = false; //表示当前列是否允许为空，false表示该列不能为空
keysValue.unique = true; //表示该列的值必须唯一
}
if (info.allowNull) {
keysValue.allowNull = info.allowNull;
}
tablesBase[key] = keysValue;
}
let defaultConfig = {
freezeTableName:true,
timestamps:false,
}
let model = Sequelize.mysqlDB.define(tableName, tablesBase, defaultConfig);
return await model.sysc({});
}
src/db/mysqlInit.ts
import { systemConfig } from "../config/serverConfig";
import { initTable } from "./initTable";
//导入sequelize模块
const Sequelize = require('sequelize');
var mysqlDB;
export async function initMysqlDB() {
mysqlDB = new Sequelize(systemConfig.dataBase,systemConfig.mysqlUser,systemConfig.mysqlPwd,{
host:systemConfig.mysqlHost,
port:systemConfig.mysqlPort,
mysqlDB = new Sequelize(systemConfig.mysqldb.dataBase,systemConfig.mysqldb.user,systemConfig.mysqldb.pwd,{
host:systemConfig.mysqldb.host,
port:systemConfig.mysqldb.port,
dialect:'mysql', //数据库类型
pool:{ //数据库连接池
max:20, //最大连接对象的个数
min:5, //最小连接对象的个数
idle:1000 //最长等待时间，单位为毫秒
}
});
//
await initTable();
},
timezone: '+08:00', //东八时区
dialectOptions: {
dateStrings: true,
typeCast: true
},
});
}
export { mysqlDB };
\ No newline at end of file
src/main.ts
import { initSystemConst } from "./biz/system";
import { initConfig, systemConfig} from "./config/serverConfig";
import { initMysqlDB } from "./db/mysqlInit";
import * as mysqlDB from "./db/mysqlInit";
import { initMysqlModel } from "./model/sqlModelBind";
import { httpServer } from "./net/http_server";
async function lanuch() {
await initConfig();//初始化配置解析
await initMysqlDB();
/**初始化配置解析 */
await initConfig();
/**初始化数据库 */
// await mongoDB.initDB();
// await initModel();
/**初始化sql */
await mysqlDB.initMysqlDB();
await initMysqlModel();
/**创建http服务 */
httpServer.createServer(systemConfig.port);
/**初始化系统常量 */
await initSystemConst();
// await smsTask();
console.log('This indicates that the server is started successfully.');
// await initData();
}
lanuch();
\ No newline at end of file
src/middleware/fromParam.ts deleted 100644 → 0
var formidable = require("formidable");
const path = require('path');
export async function parseFormParam(req, res, next) {
var form = new formidable.IncomingForm();
form.uploadDir = path.join(__dirname.substring(0,__dirname.indexOf("out")), 'files');
form.parse(req, (err, fields, files)=>{
if (err) {
next(err)
}
else {
req.fields = fields;
req.files = files;
next();
}
})
}
\ No newline at end of file
src/middleware/httpErrorHandler.ts
import { bizlive } from "tencentcloud-sdk-nodejs";
import { ERRORCODEENUM } from "../config/errorEnum";
/**
......@@ -16,7 +17,7 @@ export function httpErrorHandler(err, req, res, next) {
res.success({success:false, msg:err.message, code:ERRORCODEENUM[err.message]});
next();
}
else {
else {
res.success({success:false, msg:err.message, code:500});
next();
}
......
src/middleware/user.ts
import { TABLENAMEENUM } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import { findUserByUserId } from "../data/admin/user";
import { selectOneDataByParam } from "../model/findData";
import { BizError } from "../util/bizError";
/**
......@@ -17,14 +18,19 @@ export async function checkFuHuaQiToken(req, res, next) {
if (!userId) return next(new BizError(ERRORENUM.身份验证失败, `userId:${userId} token:${reqToken}`));
let userInfo = await findUserByUserId(userId);
let userInfo = await selectOneDataByParam(TABLENAMEENUM.用户表, {userId}, ["userId", "roleId", "name", "departmentId", "token"]);
if (!userInfo) return next(new BizError(ERRORENUM.非法登录, `userId:${userId} token:${reqToken}`));
if (userInfo.token != reqToken ) return next(new BizError(ERRORENUM.身份验证过期, `userId:${userId} token:${reqToken}`));
req.headers.userid = userInfo.userId;
req.headers.userinfo = {
userId,
roleId:userInfo.roleId,
name:userInfo.name,
departmentId:userInfo.departmentId
}
next();
}
src/model/addData.ts 0 → 100644
import { mysqlModelMap } from "./sqlModelBind";
/**
* 添加数据
* @param tableName
* @param data
* @returns
*/
export async function addData(tableName:string, data:any) {
let dataArray = [];
if (!Array.isArray(data)) {
dataArray.push(data);
} else dataArray = data;
await mysqlModelMap[tableName].bulkCreate(dataArray);
return true;
}
\ No newline at end of file
src/model/delData.ts 0 → 100644
import { mysqlModelMap } from "./sqlModelBind";
export async function delData(tableName:string, param) {
await mysqlModelMap[tableName].destroy({where:param});
return true;
}
\ No newline at end of file
src/model/findData.ts 0 → 100644
import { Op, Sequelize } from "sequelize";
import { ERRORENUM } from "../config/errorEnum";
import { mysqlModelMap } from "./sqlModelBind";
import { BizError } from "../util/bizError";
/**
* where条件查询参数
* @param param
* %like%：模糊查询 {列名: {"%like%": }}
* %gt%：大于 {列名: {"%gt%": }}
* %gte%：大于等于 {列名: {"%gte%": }}
* %lt%：小于 {列名: {"%lt%": }}
* %lte%：小于等于 {列名: {"%lte%": }}
* %between%：查询范围内数据 {列名: {"%between%": ["开始参数", "结束参数"]}} ---BETWEEN 开始参数 AND 结束参数 列>开始参数 and 列<结束参数
* %notBetween%：查询不在范围内数据 {列名: {"%notBetween%": ["开始参数", "结束参数"]}} ---NOT BETWEEN 开始参数 AND 结束参数
* %orderDesc%: order by DESC {"%orderDesc%": "列名"}
* %limit%: {"%limit%": 数量}
* @param column
* @returns
*/
function analysisParamToWhere(param, column) {
let where = {};
let order = [];
let group = "";
let limit = 0;
for (let key in param) {
if (typeof param[key] == "object") {
where[key] = {};
for (let whereKey in param[key]){
switch(whereKey) {
case "%like%":
where[key][Op.like] = `%${param[key]["%like%"]}%`;
break;
case "%gt%":
where[key][Op.gt] = param[key]["%gt%"];
break;
case "%gte%":
where[key][Op.gte] = param[key]["%gte%"];
break;
case "%lt%":
where[key][Op.lt] = param[key]["%lt%"];
break;
case "%lte%":
where[key][Op.lte] = param[key]["%lte%"];
break;
case "%between%":
where[key][Op.between] = param[key]["%between%"];
break;
case "%notBetween%":
where[key][Op.notBetween] = param[key]["%notBetween%"];
break;
case "%in%":
where[key][Op.in] = param[key]["%in%"];
break;
case "%notIn%":
where[key][Op.notIn] = param[key]["%notIn%"];
break;
}
}
}else {
switch (key) {
case "%orderDesc%":
order = [[Sequelize.col(param[key]), "DESC"]];
break;
case "%orderAsc%":
order = [[Sequelize.col(param[key]), "ASC"]];
break;
case "%limit%":
limit = param[key];
break;
case "%group%":
group = param[key];
break;
default: where[key] = param[key];
}
}
}
let selectParam:any = {where};
if (column && column.length) selectParam.attributes = column;
if (order && order.length) selectParam.order = order;
if (limit) selectParam.limit = limit;
if (group) selectParam.group = group;
return selectParam;
}
/**
* 查询单个数据
* @param tableModel 表对象
* @param param
* @returns
*/
export async function selectOneDataByParam(tableName:string, param, column) {
let selectParam = analysisParamToWhere(param, column);
let data = await mysqlModelMap[tableName].findOne(selectParam);
data = data || {};
return data;
}
/**
* 查询多个数据
* @param tableName 表对象
* @param param
* @returns
*/
export async function selectDataListByParam(tableName:string, param, column) {
let selectParam = analysisParamToWhere(param, column);
let data = await mysqlModelMap[tableName].findAll(selectParam);
return data;
}
/**
* 分页查询
* @param
* @param param
* @param pageNumber
* @param pageSize
* @returns
*/
export async function selectDataListToPageByParam(tableName:string, param, column, pageNumber:number, pageSize:number) {
let selectParam:any = analysisParamToWhere(param, column);
selectParam.limit = pageSize || 10;
selectParam.offset = (pageNumber-1)*10;
let data = await mysqlModelMap[tableName].findAll(selectParam);
return data;
}
export async function selectDataCountByParam(tableName:string, param) {
let selectParam:any = analysisParamToWhere(param, []);
let data = await mysqlModelMap[tableName].count(selectParam);
return data;
}
export async function associationSelect(tableName:string, param) {
let model = mysqlModelMap[tableName];
if (!model) throw new BizError(ERRORENUM.不存在表);
let data = await model.aggragateData(param);
return data;
}
/**
* 多表联查 列表
* @param
* @param includeConf {"表名":["",""] }
* @param param
* @param column
* @returns
*/
export async function selectDataToTableAssociation(tableName:string, includeConf, param, column) {
let include = [];
for (let tableName in includeConf) {
if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
let item = includeConf[tableName];
let itemWhere= [];
let itemColumn = [];
if (Array.isArray(item)) {
itemColumn = item;
} else {
itemWhere = item.where;
itemColumn = item.column;
}
let includeInfomation = analysisParamToWhere(itemWhere, itemColumn);
includeInfomation.model = mysqlModelMap[tableName];
include.push(includeInfomation);
}
let selectParam:any = analysisParamToWhere(param, column);
selectParam.include = include;
let data = await mysqlModelMap[tableName].findAll(selectParam);
return data;
}
/**
* 多表联查 分页
* @param
* @param includeConf {"表名":["",""] }
* @param param
* @param column
* @returns
*/
export async function selectDataToTableAssociationToPage(tableName, includeConf, param, column, pageNumber:number, pageSize:number) {
let include = [];
for (let tableName in includeConf) {
if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
let item = includeConf[tableName];
let itemWhere= [];
let itemColumn = [];
if (Array.isArray(item)) {
itemColumn = item;
} else {
itemWhere = item.where || [];
itemColumn = item.column || [];
}
let includeInfomation = analysisParamToWhere(itemWhere, itemColumn);
includeInfomation.model = mysqlModelMap[tableName];
include.push(includeInfomation);
}
let selectParam:any = analysisParamToWhere(param, column);
selectParam.include = include;
selectParam.limit = pageSize || 10;
selectParam.offset = (pageNumber-1)*10;
let data = await mysqlModelMap[tableName].findAll(selectParam);
return data;
}
/**
* 多表查询单个
* @param
* @param includeConf
* @param param
* @param column
* @returns
*/
export async function selectOneDataToTableAssociation(tableName, includeConf, param, column) {
let include = [];
for (let tableName in includeConf) {
if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
let item = includeConf[tableName];
let itemWhere= [];
let itemColumn = [];
if (Array.isArray(item)) {
itemColumn = item;
} else {
itemWhere = item.where;
itemColumn = item.column;
}
let includeInfomation = analysisParamToWhere(itemWhere, itemColumn);
includeInfomation.model = mysqlModelMap[tableName];
include.push(includeInfomation);
}
let selectParam:any = analysisParamToWhere(param, column);
selectParam.include = include;
let data = await mysqlModelMap[tableName].findOne(selectParam);
data = data || {};
return data;
}
/**
* 多表获取总数
* @param tableName
* @param includeConf
* @param param
* @param column
*/
export async function selectDataCountToTableAssociation(tableName, includeConf, param) {
let include = [];
for (let tableName in includeConf) {
if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
let item = includeConf[tableName];
let itemWhere= [];
let itemColumn = [];
if (Array.isArray(item)) {
itemColumn = item;
} else {
itemWhere = item.where;
itemColumn = item.column;
}
let includeInfomation = analysisParamToWhere(itemWhere, itemColumn);
includeInfomation.model = mysqlModelMap[tableName];
include.push(includeInfomation);
}
let selectParam:any = analysisParamToWhere(param, []);
selectParam.include = include;
let count = await mysqlModelMap[tableName].count(selectParam);
return count;
}
\ No newline at end of file
src/model/sqlModelBind.ts 0 → 100644
/**
* mysql 数据层
*/
import { TablesConfig } from "../config/mysqlTableConfig";
import { mysqlDB } from "../db/mysqlInit";
let mysqlModelMap = {};
export async function initMysqlModel() {
/**初始化表 */
for (let i =0; i < TablesConfig.length; i++) {
let { tableName, schema } = TablesConfig[i];
let schemaConf = {
freezeTableName:true, //true表示使用给定的表名，false表示模型名后加s作为表名
timestamps:false //true表示给模型加上时间戳属性(createAt、updateAt),false表示不带时间戳属性
};
let assocsConfigList = [];
for (let key in schema) {
if (schema[key].references) {
let modelName = schema[key]["references"].model;
assocsConfigList.push({modelName, foreignKey:schema[key]["references"].key});
schema[key]["references"].model = mysqlModelMap[modelName];
}
}
let model = mysqlDB.define( tableName, schema, schemaConf);
mysqlModelMap[tableName] = await model.sync({}).then();
assocsConfigList.forEach(async (item) => {
let {modelName, foreignKey} = item;
mysqlModelMap[tableName].belongsTo(mysqlModelMap[modelName], {foreignKey});
});
}
console.log();
/**初始化表关联 */
// for (let i =0; i < TablesConfig.length; i++) {
// let { tableName, association } = TablesConfig[i];
// association.forEach( (item:any) => {
// if (item) {
// let {type, check, foreignKey} = item;
// if (type == "hasMany") {
// mysqlModelMap[check].hasOne(mysqlModelMap[tableName]);
// } else if (type == "hasMany") {
// mysqlModelMap[tableName].hasMany(mysqlModelMap[check], {foreignKey});
// }
// mysqlModelMap[check].belongsTo(mysqlModelMap[tableName], {foreignKey});
// console.log(check,"建立", tableName, "连接");
// }
// });
// }
}
export { mysqlModelMap };
\ No newline at end of file
src/model/updateData.ts 0 → 100644
import { Op, Sequelize } from "sequelize";
import { mysqlModelMap } from "./sqlModelBind";
/**
* where条件查询参数
* @param param
* %like%：模糊查询 {列名: {"%like%": }}
* %gt%：大于 {列名: {"%gt%": }}
* %gte%：大于等于 {列名: {"%gte%": }}
* %lt%：小于 {列名: {"%lt%": }}
* %lte%：小于等于 {列名: {"%lte%": }}
* %between%：查询范围内数据 {列名: {"%between%": ["开始参数", "结束参数"]}} ---BETWEEN 开始参数 AND 结束参数
* %notBetween%：查询不在范围内数据 {列名: {"%notBetween%": ["开始参数", "结束参数"]}} ---NOT BETWEEN 开始参数 AND 结束参数
* %orderDesc%: order by DESC {"%orderDesc%": "列名"}
* %limit%: {"%limit%": 数量}
* @returns
*/
function analysisParamToWhere(param) {
let where = {};
let order = [];
let limit = 0;
for (let key in param) {
if (typeof param[key] == "object") {
where[key] = {};
for (let whereKey in param[key]){
switch(whereKey) {
case "%like%":
where[key][Op.like] = `%${param[key]["%like%"]}%`;
break;
case "%gt%":
where[key][Op.gt] = param[key]["%gt%"];
break;
case "%gte%":
where[key][Op.gte] = param[key]["%gte%"];
break;
case "%lt%":
where[key][Op.lt] = param[key]["%lt%"];
break;
case "%lte%":
where[key][Op.lte] = param[key]["%lte%"];
break;
case "%between%":
where[key][Op.between] = param[key]["%between%"];
break;
case "%notBetween%":
where[key][Op.notBetween] = param[key]["%notBetween%"];
break;
case "%in%":
where[key][Op.in] = param[key]["%in%"];
break;
case "%notIn%":
where[key][Op.notIn] = param[key]["%notIn%"];
break;
}
}
}else {
switch (key) {
case "%orderDesc%":
order = [[Sequelize.col(param[key]), "DESC"]];
break;
case "%orderAsc%":
order = [[Sequelize.col(param[key]), "ASC"]];
break;
case "%limit%":
limit = param[key];
break;
default: where[key] = param[key];
}
}
}
let selectParam:any = {where};
if (order && order.length) selectParam.order = order;
if (limit) selectParam.limit = limit;
return selectParam;
}
export async function updateManyData(tableName, param:object, data:object) {
let where = analysisParamToWhere(param);
await mysqlModelMap[tableName].update(data, where);
return {isSuccess:true};
}
\ No newline at end of file
src/routers/askForLeave.ts
......@@ -6,6 +6,7 @@ import * as asyncHandler from 'express-async-handler';
import * as askForLeaveBiz from '../biz/askForLeave';
import { checkFuHuaQiToken } from '../middleware/user';
import { eccReqParamater } from '../tools/eccParam';
import { memberSelectList } from '../biz/member';
export function setRouter(httpServer) {
httpServer.post('/askforleave/add', checkFuHuaQiToken, asyncHandler(add));
......@@ -25,10 +26,11 @@ export function setRouter(httpServer) {
async function add(req, res) {
let userId = req.headers.userid;
let userInfo = req.headers.userinfo;
let reqConf = {des: 'String', startTime: 'String', endTime: 'String', type:'Number', day:"Number", time:"Number"};
let { des, startTime, endTime, type, day, time } = eccReqParamater(reqConf, req.body, ["day", "time"]);
let result = await askForLeaveBiz.addAskForLeaveLog(userId, des, startTime, endTime, type, day, time);
let result = await askForLeaveBiz.addAskForLeaveLog(userId, userInfo, des, startTime, endTime, type, day, time);
res.success(result);
}
......@@ -98,7 +100,7 @@ async function personnelList(req, res) {
async function memberNameList(req, res) {
let userId = req.headers.userid;
let result = await askForLeaveBiz.getMemberNameList();
let result = await memberSelectList();
res.success(result);
}
......@@ -107,7 +109,7 @@ async function outPutData(req, res) {
let reqConf = { startTime:"String", endTime:"String", userId:"Number"};
let {userId, startTime, endTime} = eccReqParamater(reqConf, req.body, ["startTime", "endTime", "userId"]);
let result = await askForLeaveBiz.getOutPutPersonnelAFLList(userId, startTime, endTime);
let result = await askForLeaveBiz.outPutPersonnelAFLList(userId, startTime, endTime);
res.success(result);
}
src/routers/member.ts 0 → 100644
/**
* 成员
*/
import * as asyncHandler from 'express-async-handler';
import { checkFuHuaQiToken } from '../middleware/user';
import * as memberBiz from '../biz/member';
import { eccReqParamater } from '../tools/eccParam';
export function setRouter(httpServer) {
httpServer.post('/member/personnel/list', checkFuHuaQiToken, asyncHandler(memberList));
httpServer.post('/member/personnel/update', checkFuHuaQiToken, asyncHandler(updateInfo));
}
/**
* 成员列表
* @param req
* @param res
*/
async function memberList(req, res) {
let result = await memberBiz.getMemberList();
res.success(result);
}
/**
* 更新入职时间
* @param req
* @param res
*/
async function updateInfo(req, res) {
let reqConf = {userId: 'Number', ed: 'String'};
let { userId, ed} = eccReqParamater(reqConf, req.body, ["day", "time"]);
let result = await memberBiz.updateMemberData(userId, ed);
res.success(result);
}
\ No newline at end of file
src/routers/router.ts
......@@ -10,6 +10,7 @@ import * as overtimeRouters from './overtime'
import * as projectRouters from './project'
import * as statsRouters from './stats'
import * as attendanceRouters from './attendance'
import * as memberRouters from './member'
export function setRouter(httpServer){
......@@ -21,4 +22,5 @@ export function setRouter(httpServer){
projectRouters.setRouter(httpServer);
statsRouters.setRouter(httpServer);
attendanceRouters.setRouter(httpServer);
memberRouters.setRouter(httpServer);
}
\ No newline at end of file
src/routers/user.ts
......@@ -3,9 +3,9 @@
*/
import * as asyncHandler from 'express-async-handler';
import * as tools from '../util/tools';
import * as userBiz from '../biz/user';
import { checkFuHuaQiToken } from '../middleware/user';
import { eccReqParamater } from '../tools/eccParam';
export function setRouter(httpServer) {
httpServer.post('/user/login', asyncHandler(login));
......@@ -15,7 +15,7 @@ export function setRouter(httpServer) {
async function login(req, res) {
let reqConf = {loginId:'String', pwd:'String'};
let {loginId, pwd} = tools.checkReqParam(reqConf, req.body);
let {loginId, pwd} = eccReqParamater(reqConf, req.body);
let userInfo = await userBiz.login(loginId, pwd);
......
src/routers/workingLog.ts
......@@ -5,9 +5,9 @@
import * as asyncHandler from 'express-async-handler';
import * as workingLogBiz from '../biz/workingLog';
import { checkFuHuaQiToken } from '../middleware/user';
import { eccReqParamater } from '../tools/eccParam';
import { eccEnumValue } from '../tools/eccEnum';
import { eccEnumValue, eccReqParamater } from '../tools/eccParam';
import { WORKLOGADMINTYPE } from '../config/enum';
import { getDepartmentUserList } from '../biz/member';
export function setRouter(httpServer) {
httpServer.post('/workinglog/find', checkFuHuaQiToken, asyncHandler(find));
......@@ -128,7 +128,7 @@ async function departmentUserList(req, res) {
let reqConf = {departmentId:"Number"};
let {departmentId} = eccReqParamater(reqConf, req.body, []);
let result = await workingLogBiz.getDepartmentUserList(departmentId);
let result = await getDepartmentUserList(departmentId);
res.success(result);
}
src/tools/eccEnum.ts deleted 100644 → 0
import { ERRORENUM } from "../config/errorEnum";
import { BizError } from "../util/bizError";
/**
* 校验value是否符合传入的枚举
* @param name 被掉用名称 用于输出异常日志
* @param key 目标字段 用于输出异常日志
* @param enumConf 目标枚举
* @param value 目标值
* 无返回 有异常直接报错
*/
export function eccEnumValue(name:string, key:string, enumConf, value:any) {
let eccSuccess = true;
if ( typeof value == 'number' ) {
if (!enumConf[value] ) eccSuccess = false;
} else if (Array.isArray(value)) {
value.forEach(item => {
if ( !enumConf[item] ) eccSuccess = false;
});
}
if (!eccSuccess) throw new BizError(ERRORENUM.表单校验失败, `${name} 下的 ${key} 字段值为 ${value} 不满足枚举范围`);
}
src/tools/eccParam.ts
......@@ -3,35 +3,47 @@ import { BizError } from "../util/bizError";
/**
* 根据conf配置校验请求参数
* @param conf 配置
* @param param 表单
* @param conf 配置
* @param param 表单
* @param skipKeys []不必填的字段
*/
export function eccReqParamater(conf:object, param, skipKeys?) {
skipKeys = skipKeys || [];
for (let key in conf) {
let type = conf[key];
let value = param[key];
let isError = false; //校验是否异常
let errorStr = "";//异常说明
let skipMap = {};
skipKeys.forEach(keyName => {
skipMap[keyName] = 1;
});
if ( (typeof value != 'boolean') && !value ) {
if (skipKeys.indexOf(key) < 0 ) {
isError = true;
errorStr = `缺少 ${key} 字段`;
}
} else if(param[key]) {
let paramType = typeof param[key];
switch(conf[key]) {
/**校验多余字段 */
for (let key in param) {
if (!conf[key]) throw new BizError(ERRORENUM.参数错误, `多余${key}字段`);
}
/**校验必填和缺失字段 */
for (let key in conf) {
let confType = conf[key];
let value = param[key];
let valueType = typeof value;
if ( value == null || value == undefined ) {
if (!skipMap[key]) throw new BizError(ERRORENUM.参数错误, `缺失${key}字段`);
} else {
let isError = false;
let errorStr = "";
switch(confType) {
case 'Number':
if ( paramType != 'number' ) isError = true;
if ( confType.toLowerCase() != valueType ) isError = true;
else {
if ((""+param[key]).indexOf('.') > -1) {
param[key] = parseInt(`${param[key] *100}`)/100;
}
}
break;
case 'String':
if ( paramType != 'string' ) isError = true;
break;
case 'Boolean':
if ( paramType != 'boolean' ) isError = true;
case 'Object':
if ( confType.toLowerCase() != valueType ) isError = true;
break;
case '[Number]':
if ( !Array.isArray(param[key]) ) isError = true;
......@@ -53,15 +65,76 @@ export function eccReqParamater(conf:object, param, skipKeys?) {
}
}
break;
case '[String]':
if ( !Array.isArray(param[key]) ) isError = true;
for (let i =0; i < param[key].length; i++) {
let item = param[key][i];
if ( typeof item != 'string' ) {
isError = true;
errorStr = `${key}应是String型数组其中下标${i}是${typeof item}`;
}
}
break;
// case 'Address':
// /**地址类型 基本数据类型为数组字符串但是要判断层级关系 */
// if ( !Array.isArray(param[key]) ) {
// isError = true;
// errorStr = `${key}应是数组形`;
// }
// if ( param[key].length != 4) {
// isError = true;
// errorStr = `${key}超过特定长度4 目前长度 ${param[key].length}`;
// }
// for (let i =0; i < param[key].length; i++) {
// let item = param[key][i];
// if ( typeof item != 'string' ) {
// isError = true;
// errorStr = `${key}应是string型数组其中下标${i}是${typeof item}`;
// }
// }
// /** 不符合规则的 */
// let nullIndex = -1;
// for (let i = 0; i < param[key].length; i++) {
// if (nullIndex != -1) {//出现过空 第一次出现后的位置 都不能有值
// if (param[key]) {
// //做一个特化
// throw new BizError(ERRORENUM.地址数据不完整, `${key} 下标 ${nullIndex} 为空 `);
// }
// }
// if (nullIndex == -1 && !param[key][i]) {
// /**按顺序第一次赋值 */
// nullIndex = i;
// }
// }
// break;
}
errorStr = isError && errorStr == "" ? `${key}应该是${type}型 而不是${paramType}`: errorStr;
errorStr = isError && errorStr == "" ? `${key}应该是${confType}型 而不是${valueType}`: errorStr;
if (isError) throw new BizError(ERRORENUM.参数错误, errorStr);
}
if (isError) throw new BizError(ERRORENUM.参数错误, errorStr);
}
for (let key in param) {
if (!conf[key]) throw new BizError(ERRORENUM.参数错误, `多余${key}字段`);
}
return param;
}
/**
* 校验value是否符合传入的枚举
* @param name 被掉用名称 用于输出异常日志
* @param key 目标字段 用于输出异常日志
* @param enumConf 目标枚举
* @param value 目标值
* 无返回 有异常直接报错
*/
export function eccEnumValue(name:string, key:string, enumConf, value:any) {
let eccSuccess = true;
if ( typeof value == 'number' ) {
if (!enumConf[value] ) eccSuccess = false;
} else if (Array.isArray(value)) {
value.forEach(item => {
if ( !enumConf[item] ) eccSuccess = false;
});
}
if (!eccSuccess) throw new BizError(ERRORENUM.表单校验失败, `${name} 下的 ${key} 字段值为 ${value} 不满足枚举范围`);
}
src/util/bizError.ts
/**
* 异常类
* 需要和log4js共同使用
*/
import { getBizMsg } from "../config/errorEnum";
import { logError } from "./log";
......
src/util/initData.ts deleted 100644 → 0
// /**
// * 初始化加班和调休数据
// */
// const xlsx = require('node-xlsx');
// const path = require('path');
// const md5 = require("md5");
// import moment = require("moment");
// import { onceSheetBecomeOfblockData } from "./analysisExcel";
// import { addWorkingLog } from "../data/admin/workinglog";
// import { addOvertime, initOvertime } from "../data/admin/overtime";
// import { ASKFORLEAVETYPE } from "../config/enum";
// import { initAskforleave } from "../data/admin/askForLeave";
// import { getAskForLeaveId, getOvertimeId } from "./tools";
// export async function initData() {
// // return
// let name = "李欣鸣";
// let userId = 12;
// let data = onceSheetBecomeOfblockData("初始化数据.xlsx", name);
// for(let i = 0; i < data.length; i++) {
// let {blockData, blockTitle} = data[i];
// if (blockTitle == "0_0") initAskForLeaveData(name, userId, blockData);
// if (blockTitle == "5_0") initOverTimeData(name, userId, blockData);
// }
// }
// async function initOverTimeData(name, userId, list) {
// if (!list) {
// console.log(name, "初始化加班", "=无数据");
// }
// let projectId = "SH-YY-GD";
// let utc = new Date();
// let count = 0;
// let addFloat = 0;
// for (let i = 0; i < list.length; i++) {
// if (!i) continue;
// let subList = list[i];
// let dataTime;
// if (typeof subList[0] == 'number') {
// dataTime =  new Date((subList[0] - 25569 ) * 86400 * 1000 + utc.getTimezoneOffset()*1000*60);
// } else dataTime = new Date(subList[0]);
// let id = `ot${userId}${new Date(dataTime).valueOf()}${Math.ceil(Math.random() *100)}`;
// let dateKey = moment(dataTime).format("YYYY-MM-DD")+ ' 18:00:00';
// let state = 1;
// let workLog = "归档";
// let time = subList[1];
// if (Math.floor(time) != time) addFloat += time - Math.floor(time);
// let approver = 3;//张老师
// if (Math.floor(time)) await initOvertime(id, projectId, userId, Math.floor(time), dateKey, workLog, approver, state);
// count+=1;
// }
// console.log(name+"初始化加班成功"+count+"条数据");
// let todayKey = '2023-01-22 18:00:00';
// if (addFloat) await initOvertime(getOvertimeId(userId), projectId, userId, Math.ceil(addFloat), todayKey, "补充小数位", 3, 1);
// console.log(name+"初始化加班 补录小数点一条数据"+addFloat+"小时");
// }
// async function initAskForLeaveData(name, userId, list) {
// if (!list) {
// console.log(name, "初始化请假", "=无数据");
// }
// let utc = new Date();
// let count = 0;
// let addFloat = 0;
// for (let i = 0; i < list.length; i++) {
// if (!i) continue;
// let subList = list[i];
// let dataTime;
// if (typeof subList[0] == 'number') {
// dataTime =  new Date((subList[0] - 25569 ) * 86400 * 1000 + utc.getTimezoneOffset()*1000*60);
// } else dataTime = new Date(subList[0]);
// let id = `al${userId}${new Date(dataTime).valueOf()}${Math.ceil(Math.random() *100)}`;
// let des = "调休";
// let startTime = moment(dataTime).format("YYYY-MM-DD")+ ' 09:00:00';
// let endTime = moment(dataTime).format("YYYY-MM-DD")+ ' 06:00:00';
// let dateKey = moment(dataTime).format("YYYY-MM-DD")+ ' 18:00:00';
// let state = 1;
// let day = 0;
// let time = subList[1];
// if (Math.floor(time) != time) addFloat += time - Math.floor(time);
// let type = ASKFORLEAVETYPE.调休;
// let approval = 3;//罗总
// if (Math.floor(time)) await initAskforleave(id, des, startTime, endTime, userId, approval, Math.floor(time), day, type, dateKey, state);
// count+=1;
// }
// console.log(name+"调休 初始化成功"+count+"条数据");
// let todayKey = '2023-01-22 18:00:00';
// let startTime = '2023-01-22 09:00:00';
// let endTime = '2023-01-22 18:00:00';
// if (Math.ceil(addFloat)) await initAskforleave(getAskForLeaveId(userId), "补充小数点", startTime, endTime, userId, 3, Math.ceil(addFloat), 0, ASKFORLEAVETYPE.调休, todayKey, 1);
// console.log(name+"初始化调休 补录小数点一条数据"+addFloat+"小时");
// }
\ No newline at end of file
src/util/log.ts
/**
* 日志类
* 包括错误日志 普通日志
* 日志存放在根目录的logs内
*/
let log4js = require('log4js');
let path = require('path');
......@@ -21,7 +27,7 @@ let config = {
"errorLogger": {
"type": "dateFile", // 日志类型
"filename": errFile, // 输出文件名
"pattern": "-yyyy-MM-dd.log", // 后缀
"pattern": "yyyy-MM-dd.log", // 后缀
"alwaysIncludePattern": true, // 上面两个参数是否合并
"encoding": "utf-8", // 编码格式
"maxLogSize": 1000, // 最大存储内容
......@@ -31,7 +37,7 @@ let config = {
"handleLogger": {
"type": "dateFile",
"filename": handFile,
"pattern": "-yyyy-MM-dd.log",
"pattern": "yyyy-MM-dd.log",
"alwaysIncludePattern": true,
"encoding": "utf-8",
"maxLogSize": 1000,
......
src/util/myTools.ts 0 → 100644
import moment = require("moment");
const md5 = require("md5");
/**
* 生成工时填报的dateKey
* @returns
*/
export function generateDateKey(time?) {
if (time) {
return moment(time).format("YYYY-MM-DD")+ ' 18:00:00';
}
return moment().format("YYYY-MM-DD")+ ' 18:00:00'
}
/**
* 生成请假的id
* @param userId
* @returns
*/
export function generateAskForLeaveId(userId:number) {
return `al${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
export function getClientTime(time:string) {
return moment(time).format("YYYY/MM/DD HH:mm");
}
export function getDBTime(time?) {
if (!time) return moment().format("YYYY-MM-DD HH:mm:ss");
return moment(time).format("YYYY-MM-DD HH:mm:ss");
}
/**
* 生成加班填报的id
* @param userId
* @returns
*/
export function getOvertimeId(userId:number) {
return `ot${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
/**
* 获取token
* @param loginId 登录id
*/
export function getToken(loginId:string) {
return md5(`${loginId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`);
}
/**
* 生成工时填报的id
* @param userId
* @returns
*/
export function getWorkingLogId(userId:number) {
return `wl${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
\ No newline at end of file
src/util/myXML.ts
/**
* 解析xml
*/
var xml2js = require("xml2js");
......
src/util/piecemeal.ts 0 → 100644
/**
* 零碎的通用工具
*/
import moment = require("moment");
/**
* 匹配新旧对象变化
* 将newObj 与 oldObj 比对，将newObj中发生变化的key返回
* 使用前需要校验对象中的内容
* @param newObj 新对象
* @param oldObj 旧对象
* @returns [key] 发生变化的key
*/
export function checkChange(newObj, oldObj) {
let changeKeyList = [];
for (let newKey in newObj) {
if (`${newObj[newKey]}` != `${oldObj[newKey]}`) changeKeyList.push(newKey);
}
return changeKeyList;
}
/**
* 根据conf截取data中的数据
* @param conf
* @param data
* @returns
*/
export function extractData(conf, data, isAdmin) {
let result = {};
for (let key in conf) {
let confInfo = conf[key];
if (confInfo.changeDate) {
if (isAdmin) result[key] = data[key] ? moment(data[key]).format("YYYY-MM-DD") : '-';
else result[key] = data[key] || 0;
} else if (confInfo.isAdd && isAdmin) {
let addStr = "";
data[key].forEach(str => {
addStr += str;
});
result[key] = addStr;
}
else {
result[key] = data[key];
if (typeof result[key] == 'string' && !result[key]) result[key] = '';
}
}
return result;
}
/**
* 校验数据对象是否有空
* @param data
* @param sensitive 敏感校验 true时 0 和 ""会校验失败 false时 校验成功
* @returns true/false true = 有空值 false=无空值
*/
export function checkDataHaveNull(data:object, sensitive:boolean) {
if (Array.isArray(data)) return data.length == 0;
if (Object.keys(data).length == 0) return true;
let success = false;
for (let key in data) {
if (data[key] == null || data[key] == undefined) success = true;
if (sensitive) {
if (data[key] === 0 || data[key] === "" ) success = true;
}
}
return success;
}
/**
* 将枚举值转换成对应的枚举名(key)
* @param enumConf 目标枚举
* @param value 目标值
* @returns string 返回字符串 如果传入多个枚举值，就拼接字符串
*/
export function changeEnumValue(enumConf, value:any) {
if (!value) return '';
if ( typeof value == 'number' ) {
return enumConf[value];
}
let str = "";
value.forEach((item, index) => {
str += enumConf[item];
if (index == value.length-1) str+="";
else str += ","
});
return str;
}
src/util/request.ts
/**
* 请求工具
*/
import * as request from 'request';
import { BizError } from './bizError';
/**
* 请求接口（get）
* @param url 路由
* @param query 请求参数
* @param headers 请求头
* @returns
*/
export function get(url:string, query?, headers?) {
if (!url || (url.search(/http:/) && url.search(/https:/)) ) throw new BizError(!url ? "请求地址为空" : "请求地址错误");
return new Promise((resolve, reject)=>{
......@@ -31,7 +42,7 @@ export function post(url, body, headers) {
resolve(body);
}
else {
reject(error)
// reject(error)
}
});
})
......
src/util/tools.ts deleted 100644 → 0
import moment = require("moment");
import { ERRORENUM } from "../config/errorEnum";
import { BizError } from "./bizError";
const md5 = require("md5");
/**
* 生成工时填报的dateKey
* @returns
*/
export function getDateKey(time?) {
if (time) {
return moment(time).format("YYYY-MM-DD")+ ' 18:00:00';
}
return moment().format("YYYY-MM-DD")+ ' 18:00:00'
}
/**
* 生成工时填报的id
* @param userId
* @returns
*/
export function getWorkingLogId(userId:number) {
return `wl${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
/**
* 生成加班填报的id
* @param userId
* @returns
*/
export function getOvertimeId(userId:number) {
return `ot${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
/**
* 生成请假的id
* @param userId
* @returns
*/
export function getAskForLeaveId(userId:number) {
return `al${userId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`
}
/**
* 获取token
* @param loginId 登录id
*/
export function getToken(loginId:string) {
return md5(`${loginId}${new Date().valueOf()}${Math.ceil(Math.random() *100)}`);
}
/**
* 生成草稿箱Id
* @param uscc
* @returns
*/
export function getDraftId(uscc:string) {
return md5(`${uscc}${new Date().valueOf()}${Math.ceil(Math.random()*1000)}`);
}
/**
* 通过config校验参数param
* 包括类型 String, Number, Boolean, [Number]
* @param name 被调用的方法名
* @param config 校验配置
* @param param 需要校验的参数
*/
export function checkParamater(name:string, keyTypeConf:object, param:object, skipKeys?) {
for (let key in keyTypeConf ) {
if ( skipKeys && skipKeys.indexOf(key) > -1 && !param[key]) {
continue;
}
if ( typeof param[key] != 'boolean' && !param[key] ) throw new BizError(ERRORENUM.表单校验失败, name, `缺失${key}字段`);
let type = typeof param[key];
switch(keyTypeConf[key]) {
case 'Number':
if ( type != 'number' ) throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是number型 而不是${type}`);
break;
case 'String':
if ( type != 'string' ) throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是string型 而不是${type}`);
break;
case 'Boolean':
if ( type != 'boolean' ) throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是boolean型 而不是${type}`);
break;
case '[Number]':
if ( !Array.isArray(param[key]) ) throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是数组型 而不是${type}`);
for (let i =0; i < param[key].length; i++) {
let item = param[key][i];
if ( typeof item != 'number' ) {
throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是number型数组其中下标${i}是${typeof item}`);
}
}
break;
case '[Object]':
if ( !Array.isArray(param[key]) ) throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是数组型 而不是${type}`);
for (let i =0; i < param[key].length; i++) {
let item = param[key][i];
if ( typeof item != 'object' ) {
throw new BizError(ERRORENUM.表单校验失败, name, `${key}应是object型数组其中下标${i}是${typeof item}`);
}
}
break;
}
}
for (let key in param) {
if (!keyTypeConf[key]) throw new BizError(ERRORENUM.表单校验失败, name, `多余${key}字段`);
}
return true;
}
/**
* 匹配新旧对象变化
* 将newObj 与 oldObj 比对，将newObj中发生变化的key返回
* 使用前需要校验对象中的内容
* @param newObj 新对象
* @param oldObj 旧对象
* @returns [key] 发生变化的key
*/
export function checkChange(newObj, oldObj) {
let changeKeyList = [];
for (let newKey in newObj) {
if (`${newObj[newKey]}` != `${oldObj[newKey]}`) changeKeyList.push(newKey);
}
return changeKeyList;
}
/**
* 密码加密
* @param uscc 信用代码
* @param pwd 密码
* @returns md5后的密码
*/
export function getPwdMd5(uscc:string, pwd:string) {
return md5(uscc+pwd);
}
/**
* 校验请求参数
* 判断参数为必填
* @param conf
* @param param
* @returns
*/
export function checkReqParam(conf, param) {
for (let key in conf ) {
if ( typeof param[key] != 'boolean' && !param[key] ) throw new BizError(ERRORENUM.参数错误, `缺失${key}字段`);
let type = typeof param[key];
switch(conf[key]) {
case 'Number':
if ( type != 'number' ) throw new BizError(ERRORENUM.参数错误, `${key}应是number型 而不是${type}`);
break;
case 'String':
if ( type != 'string' ) throw new BizError(ERRORENUM.参数错误, `${key}应是string型 而不是${type}`);
break;
case 'Boolean':
if ( type != 'boolean' ) throw new BizError(ERRORENUM.参数错误, `${key}应是boolean型 而不是${type}`);
break;
case '[Number]':
if ( !Array.isArray(param[key]) ) throw new BizError(ERRORENUM.参数错误, `${key}应是数组型 而不是${type}`);
for (let i =0; i < param[key].length; i++) {
let item = param[key][i];
if ( typeof item != 'number' ) {
throw new BizError(ERRORENUM.参数错误, `${key}应是number型数组其中下标${i}是${typeof item}`);
}
}
break;
case 'Object':
if ( type != 'object' ) throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 而不是${type}`);
if ( Array.isArray(param[key]) ) throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 而不是array`);
try {
JSON.stringify(param[key]);
} catch(err) {
throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 转换JSON时失败`);
}
break;
}
}
for (let key in param) {
if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, `多余${key}字段`);
}
return param;
}
/**
* 校验请求参数
* 判断参数可以不填
* @param conf
* @param param
* @returns
*/
export function checkParamaterType(conf, param) {
for (let key in conf ) {
if (!param[key]) continue;
let type = typeof param[key];
switch(conf[key]) {
case 'Number':
if ( type != 'number' ) throw new BizError(ERRORENUM.参数错误, `${key}应是number型 而不是${type}`);
break;
case 'String':
if ( type != 'string' ) throw new BizError(ERRORENUM.参数错误, `${key}应是string型 而不是${type}`);
break;
case 'Boolean':
if ( type != 'boolean' ) throw new BizError(ERRORENUM.参数错误, `${key}应是boolean型 而不是${type}`);
break;
case '[Number]':
if ( !Array.isArray(param[key]) ) throw new BizError(ERRORENUM.参数错误, `${key}应是数组型 而不是${type}`);
for (let i =0; i < param[key].length; i++) {
let item = param[key][i];
if ( typeof item != 'number' ) {
throw new BizError(ERRORENUM.参数错误, `${key}应是number型数组其中下标${i}是${typeof item}`);
}
}
break;
case 'Object':
if ( type != 'object' ) throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 而不是${type}`);
if ( Array.isArray(param[key]) ) throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 而不是array`);
try {
JSON.stringify(param[key]);
} catch(err) {
throw new BizError(ERRORENUM.参数错误, `${key}应是Object型 转换JSON时失败`);
}
break;
}
}
for (let key in param) {
if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, `多余${key}字段`);
}
return param;
}
/**
* 根据conf截取data中的数据
* @param conf
* @param data
* @returns
*/
export function extractData(conf, data, isAdmin) {
let result = {};
for (let key in conf) {
let confInfo = conf[key];
if (confInfo.changeDate) {
if (isAdmin) result[key] = data[key] ? moment(data[key]).format("YYYY-MM-DD") : '-';
else result[key] = data[key] || 0;
}else {
result[key] = data[key];
if (typeof result[key] == 'string' && !result[key]) result[key] = '';
}
}
return result;
}
/**
* 校验value是否符合传入的枚举
* @param enumConf 目标枚举
* @param value 目标值
* @returns true/false 是否通过校验
*/
export function checkEnumValue(enumConf, value:any) {
if ( typeof value == 'number' ) {
return enumConf[value] ? true : false;
}
let checkSuccess = true;
value.forEach(item => {
if ( !enumConf[item] ) checkSuccess = false;
});
return checkSuccess;
}
/**
* 将枚举值转换成对应的枚举名(key)
* @param enumConf 目标枚举
* @param value 目标值
* @returns string 返回字符串 如果传入多个枚举值，就拼接字符串
*/
export function changeEnumValue(enumConf, value:any) {
if (!value) return '';
if ( typeof value == 'number' ) {
return enumConf[value];
}
let str = "";
value.forEach((item, index) => {
str += enumConf[item];
if (index == value.length-1) str+="";
else str += ","
});
return str;
}
export function checkPhone(phoneNumber:string) {
}
export function checkUscc() {
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment