hrm-attendance

dce81e8d7e 考勤，考勤日报相关视图刷新功能中查询逻辑增加班次字段 sy 2024-06-24 17:55:35 +0800
3b08141f04 考勤，考勤日报相关视图刷新功能中生成sql分组逻辑增加班次字段 sy 2024-06-24 17:50:29 +0800
de1fd1bed3 考勤，考勤日报相关视图刷新功能中增加班次字段 sy 2024-06-24 17:43:55 +0800
63ae8376b5 优化加班 liuliang 2024-06-21 17:14:28 +0800
cea2e95b65 liuliang liuliang 2024-06-20 16:49:46 +0800
7ffed5f24e Merge remote-tracking branch 'origin/main' sy 2024-06-20 16:02:07 +0800
4cff17a919 考勤，出勤津贴数据生成功能中增加“加班时长计入核算量”字段相关逻辑 sy 2024-06-20 16:01:50 +0800
280a4d8a11 调整流程 liuliang 2024-06-19 20:40:31 +0800
0e6a0bcd65 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-06-19 14:29:01 +0800
927494015a 合并班段 liuliang 2024-06-19 14:28:57 +0800
26db439bb0 考勤，出勤结果明细页面，打卡数据增加补打卡类型名称返回 sy 2024-06-17 09:51:07 +0800
cf6304c4e4 考勤，出勤结果明细页面，打卡数据增加补打卡字段流程id、数据来源等数据 sy 2024-06-14 17:47:56 +0800
dfc437f4d1 优化弹性班次代码 liuliang 2024-06-14 14:15:44 +0800
083f005268 修改弹性班次以及候选班次数据混乱的问题 liuliang 2024-06-13 15:32:11 +0800
51299db4b0 调整日期类型 liuliang 2024-06-12 16:15:47 +0800
e57b7c6398 修改卡点，出勤结果编辑后增加出勤结果 liuliang 2024-06-12 13:42:05 +0800
50ae22e21f 考勤，日历排班结果列表导入预览接口 sy 2024-06-12 10:54:28 +0800
b2904e1aad 考勤，日历排班结果列表导出接口逻辑优化,部门、分部字段增加多语言格式表述解析 sy 2024-06-12 09:40:24 +0800
de9e941ab9 考勤，日历排班结果列表导出接口逻辑优化 sy 2024-06-11 17:59:47 +0800
4631b03cb6 调整卡点 liuliang 2024-06-11 15:12:19 +0800
2d6b992cda 考勤，日历排班结果列表导出导入接口 sy 2024-06-11 14:50:32 +0800
5d44b211ea Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-06-11 13:34:41 +0800
85754e8feb 日历排班 liuliang 2024-06-11 13:34:35 +0800
30e606f250 考勤，出勤津贴数据生成功能逻辑优化，目标人员或班次出现空时，不进行旧数据删除 sy 2024-06-07 15:00:18 +0800
ad5de70136 liuliang liuliang 2024-06-07 14:42:23 +0800
28061f710c liuliang liuliang 2024-06-06 14:08:27 +0800
2daf6e009a Merge remote-tracking branch 'origin/main' sy 2024-06-06 11:32:48 +0800
d0db86fbf3 考勤，考勤日报相关视图刷新功能中增加津贴数据表、补打卡记录表数据字段 sy 2024-06-06 11:32:36 +0800
7a8ed429ba 增加日期类型公共方法 liuliang 2024-06-05 17:50:30 +0800
b2755a47b7 liuliang liuliang 2024-06-05 17:47:34 +0800
d1a3489f74 日历排班分页，手工和已确认数据不分析，批量分析接口失败 liuliang 2024-06-05 17:30:38 +0800
b17eb586c4 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-06-04 14:20:41 +0800
e21553e125 liuliang liuliang 2024-06-04 14:20:36 +0800
77d1bb3bb6 考勤，企业日历初始化功能接口增加返回值 sy 2024-06-04 14:14:30 +0800
35a458823d Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-06-03 14:21:37 +0800
71bf4f4401 liuliang liuliang 2024-06-03 14:21:34 +0800
faeff4269a 考勤，请假流程提交节点校验action增加请假次数不足的判断 sy 2024-06-03 11:07:32 +0800
507d909a8f liuliang liuliang 2024-06-03 10:51:31 +0800
a25ac981f1 liuliang liuliang 2024-06-03 10:13:47 +0800
785ee44a92 Merge remote-tracking branch 'origin/main' sy 2024-05-29 13:21:32 +0800
fede14ba42 考勤，考勤汇总报表导出功能问题修复、考勤汇总报表查询功能增加分权逻辑 sy 2024-05-29 13:21:18 +0800
dc20a05e84 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-05-29 11:16:50 +0800
959163ad69 请假流程过滤节假日，修复请假流程提交校验假期余额逻辑 liuliang 2024-05-29 11:16:30 +0800
277cf33c93 feat: 新增聚才林打卡接口 pzy2 2024-05-29 10:38:14 +0800
23459242c7 考勤，考勤日报相关视图刷新功能中字段名截取逻辑优化 sy 2024-05-27 13:21:56 +0800
124668aa4f liuliang liuliang 2024-05-27 11:15:06 +0800
3651b57b91 Merge remote-tracking branch 'origin/main' sy 2024-05-27 09:32:12 +0800
118dfa9a65 考勤，出勤津贴数据生成功能中班次班段数据处理逻辑变更，直接从班次明细表中获取 sy 2024-05-27 09:31:51 +0800
f08667f81a liuliang liuliang 2024-05-24 18:44:52 +0800
ab3c899b07 liuliang liuliang 2024-05-24 16:04:37 +0800
d759111b82 考勤，出勤汇总导出、考勤日报相关视图刷新功能 sy 2024-05-24 09:47:37 +0800
73274faecd 候选班组逻辑、休息班次工作时段转加班 liuliang 2024-05-21 16:00:35 +0800
eb123f6123 liuliang liuliang 2024-05-21 14:19:11 +0800
29d9fd522f Merge remote-tracking branch 'origin/main' sy 2024-05-21 14:18:32 +0800
127bb546a4 考勤，请假流程校验action增加请假时长不足最小时长要求的判断 sy 2024-05-21 14:18:11 +0800
a8ef695f8e liuliang liuliang 2024-05-21 14:17:17 +0800
cecfd7a350 liuliang liuliang 2024-05-20 14:25:10 +0800
715701613b 考勤，打卡数据匹配候选班组中某班次逻辑中问题修复实际打卡时间点取值逻辑 sy 2024-05-20 13:56:22 +0800
0067e99a0c liuliang liuliang 2024-05-20 11:47:11 +0800
b4512cda29 考勤，出勤津贴数据生成功能逻辑优化，旧的津贴数据删除逻辑修复，津贴数据状态赋值逻辑添加 sy 2024-05-17 17:58:48 +0800
cd0cdad702 考勤，打卡数据匹配候选班组中某班次信息方法返回增加班次数据 sy 2024-05-17 16:38:59 +0800
c2e2bd4c64 考勤，打卡数据匹配候选班组中某班次信息方法 sy 2024-05-17 10:12:20 +0800
0f5956f4fb Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-05-16 18:56:46 +0800
0126f71ab4 liuliang liuliang 2024-05-16 18:56:42 +0800
57f2bf83a7 Merge remote-tracking branch 'origin/main' sy 2024-05-16 11:11:02 +0800
15ae02339d 考勤，出勤津贴数据生成功能中目标人员获取逻辑变更，出现通用津贴数据时，适用范围默认为全员 sy 2024-05-16 11:10:34 +0800
81d913eeb5 liuliang liuliang 2024-05-13 16:40:50 +0800
35e024cf61 liuliang liuliang 2024-05-13 16:24:31 +0800
b84e9921f9 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-05-13 16:12:52 +0800
64599fa0ab 将卡点换成实体类 liuliang 2024-05-13 16:12:47 +0800
535f8e995a Merge remote-tracking branch 'origin/main' sy 2024-05-11 15:56:02 +0800
b0b6748ae6 考勤，汇总数据生成逻辑中添加汇总主表中汇总状态变更过程 sy 2024-05-11 15:55:49 +0800
8722a107dc Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-05-11 15:53:39 +0800
5e7b52803c liuliang liuliang 2024-05-11 15:53:35 +0800
d48b132e9b 考勤，请假流程校验action额度不足时返回提示修改 sy 2024-05-11 15:16:28 +0800
7748a45ccb Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-05-10 10:00:30 +0800
c45653f6e0 liuliang liuliang 2024-05-10 10:00:24 +0800
58df1145d8 考勤，请假流程节点action类逻辑中有关校验假期额度的假期类型筛选优化 sy 2024-05-08 17:08:02 +0800
517bbeaddb 考勤，汇总数据生成问题修复 sy 2024-05-07 14:10:00 +0800
1222951520 规律排班遇到休息班次为休息，考勤分析没有排班遇到休息日时不记异常 liuliang 2024-05-07 09:34:12 +0800
ad494d954b liuliang liuliang 2024-04-30 18:23:00 +0800
8e2c9ba0f8 考勤，请假流程节点action类逻辑优化 sy 2024-04-30 15:30:53 +0800
cf271ea653 Merge remote-tracking branch 'origin/main' sy 2024-04-30 14:58:00 +0800
3c82054b63 考勤，请假流程节点action类逻辑修改，增加需要校验假期额度的假期类型筛选 sy 2024-04-30 14:57:41 +0800
b206d01465 Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance liuliang 2024-04-30 14:38:59 +0800
1a43712cda liuliang liuliang 2024-04-30 14:38:54 +0800
20d8957f59 Merge remote-tracking branch 'origin/main' sy 2024-04-29 16:06:01 +0800
a054cfc2a4 考勤，企业日历初始化功能需求变更，适配单双休逻辑 sy 2024-04-29 16:05:45 +0800
a293591f4a liuliang liuliang 2024-04-29 12:28:15 +0800
4208d755ad 考勤，出勤津贴数据生成功能变更，适配出勤结果中进出时间格式变化 sy 2024-04-28 10:13:46 +0800
a270e20e92 考勤，企业日历初始化功能接口 sy 2024-04-24 16:07:16 +0800
531702b96f Merge remote-tracking branch 'origin/main' sy 2024-04-24 11:04:59 +0800
9348686aca 考勤，出勤汇总功能优化 sy 2024-04-24 11:04:32 +0800
5c3374c2a1 liuliang liuliang 2024-04-23 23:20:32 +0800
349b327af6 liuliang liuliang 2024-04-22 18:05:49 +0800
c52d25d110 liuliang liuliang 2024-04-19 16:07:35 +0800
fbcdecdf52 考勤，出勤汇总报表中考勤项目浏览按钮实现逻辑优化 sy 2024-04-19 15:29:30 +0800
199c942719 考勤，出勤汇总报表中考勤项目浏览按钮类新增 sy 2024-04-19 10:09:43 +0800
3298c0166b Merge remote-tracking branch 'origin/main' sy 2024-04-18 10:28:00 +0800
d325c96872 考勤，出勤津贴数据生成功能优化 sy 2024-04-18 10:27:34 +0800

Commit Graph Select branches Hide Pull Requests main zm_dev Mono Color

Commit Graph

Select branches

Hide Pull Requests

main

zm_dev