289 Commits (44a84f958a76ebfdb72c8f023dc8e9dc2f5ea4f6)

Author SHA1 Message Date
sy 44a84f958a 考勤-请假流程,退回时,清空明细表1和明细表2数据 8 months ago
liuliang 5dba6041f9 批量流程代理 8 months ago
sy 521114c649 考勤-加班计划流程,允许非休息班次的休息时段申请加班计划 8 months ago
sy c7b660badb Merge remote-tracking branch 'origin/main' 8 months ago
liuliang a1d8c1ee03 流程删除、流程强制收回 8 months ago
sy 7b4869feda Merge remote-tracking branch 'origin/main' 8 months ago
liuliang 7eedcb7008 代理 8 months ago
sy 7ea587d54e Merge remote-tracking branch 'origin/main' 8 months ago
liuliang 1b106d762c 代理 8 months ago
sy d30257719b Merge remote-tracking branch 'origin/main' 8 months ago
liuliang 22d6d7c8b9 代理 8 months ago
sy 74c82a751c Merge remote-tracking branch 'origin/main' 8 months ago
liuliang 70918f2cf7 代理类 8 months ago
sy 95451caa47 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java
8 months ago
sy d7b410364a 考勤-加班计划流程,加班时长去除休息班次中的休息时段 8 months ago
liuliang 0dab7a9349 修改打印日志 8 months ago
liuliang 9c197cb7fc 优化日志打印、优化假期额度发放、优化人员分组条件 8 months ago
sy 5d3b9aefbe Merge remote-tracking branch 'origin/main' 8 months ago
liuliang f238ff4a45 修改加班超出逻辑 8 months ago
sy 21f100065d Merge remote-tracking branch 'origin/main' 8 months ago
liuliang e82542c988 修改sql转换 8 months ago
sy fabec17ae4 Merge remote-tracking branch 'origin/main' 8 months ago
sy 11798f0260 考勤-加班计划流程,加班最小分钟数校验逻辑 8 months ago
liuliang 4018b5019b 排班结果优化,代码修改 8 months ago
sy 59d2142327 考勤-出差流程,出差明细生成逻辑优化,修复时长累加问题 8 months ago
sy 0a74b875fb 考勤-批量请假流程,请假明细生成逻辑优化,修复时长累加问题 8 months ago
sy 877476efc0 考勤-考勤汇总报表查询,分权逻辑中人员类型获取优化 8 months ago
sy 4c91cd0ac8 考勤-加班计划流程,加班计划区间允许与休息班次区间出现重叠;修复请假、出差明细生成bug 8 months ago
sy ad21ed944b 考勤-加班计划流程,加班计划明细筛选去重逻辑增加 9 months ago
liuliang d687c16247 迟到精确到分钟 9 months ago
sy e881a8ff7e 11 9 months ago
sy fab1bdda7d 考勤-出差流程,明细数据生成接口 9 months ago
liuliang 320c506901 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance 9 months ago
liuliang d728e6ce5b 加班拆分 9 months ago
sy 5b1ee79780 考勤-出差流程,明细数据生成功能 9 months ago
sy d2b2a22be0 Merge remote-tracking branch 'origin/main' 9 months ago
sy 6fbdc521e8 考勤-考勤周期,自动关账定时任务 9 months ago
liuliang 0b5345062e 1 9 months ago
liuliang 84bd22e9c9 11 9 months ago
sy 2676f707c1 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance 9 months ago
sy 43017408ae 11 9 months ago
liuliang 3ce7af0727 出勤结果加上考勤抽泣 9 months ago
sy 021d2afe3e Merge remote-tracking branch 'origin/main' 9 months ago
sy 5a4e6af0a0 考勤-考勤相关流程,批准节点触发考勤周期是否结账校验 9 months ago
liuliang aed2d8e428 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance 9 months ago
liuliang dca1e02609 考勤周期 9 months ago
sy f8b8842c73 考勤-考勤相关流程,归档节点触发出勤结果数据状态变更功能 9 months ago
sy 86f1dbeea1 Merge remote-tracking branch 'origin/main' 9 months ago
sy 3d82396dfe 考勤-加班计划流程,加班计划明细中加班计划和归属日期自动匹配逻辑 9 months ago
liuliang 12de1f9cbd 请假跨多天加班 9 months ago