Commit-Graf

5995f31 (main) 1.考勤和年假添加日志 by wangqiang 2025-08-14 09:24:40 +0800
18e7349 1.考勤和年假添加日志 by wangqiang 2025-08-14 09:21:05 +0800
f9d1537 1.无用类删除 2.添加修改考勤历史功能 3.考勤历史查询日期和状态同时检索失效的bug处理 4.考勤历史添加考勤组查询 5.导出国内模板加班计算规则修改 by wangqiang 2025-08-13 17:39:47 +0800
3bbf876 1.非空判断 by wangqiang 2025-08-01 17:02:18 +0800
70ac5f0 1.打卡优化 by wangqiang 2025-07-29 11:34:26 +0800
4622b51 1.时区时间格式修改 by wangqiang 2025-07-29 10:53:16 +0800
fbe34cb 1.考勤组新增时区字段 2.新增获取时区时间接口 3.迟到早退备注被覆盖问题处理 by wangqiang 2025-07-29 10:47:19 +0800
8e751aa 1.用户信息添加语言脚本提交 by wangqiang 2025-07-24 18:36:47 +0800
fad38ce 1.用户信息添加语言 2.考勤模板-日本去掉部门 by wangqiang 2025-07-24 18:34:34 +0800
11a9a49 1.考勤导出excel 日本模板修改 by wangqiang 2025-07-23 15:24:49 +0800
b61ebd6 1.打卡定时任务设置成可配置 by wangqiang 2025-07-23 14:57:13 +0800
c57274e 1.考勤组与用户关联表新增部门id 2.导出bug处理 by wangqiang 2025-07-23 14:51:20 +0800
a1caca0 1.星期计算bug修改 by wangqiang 2025-07-23 14:02:53 +0800
67eadde 1.打卡考勤组逻辑修改 by wangqiang 2025-07-23 13:50:25 +0800
6e084fa 1.年假bug处理 by wangqiang 2025-07-23 09:45:28 +0800
8211ce0 1.统计分析分类报表添加品牌 by wangqiang 2025-07-22 17:09:19 +0800
f6f49e4 1.考勤导出excel添加年假逻辑 by wangqiang 2025-07-22 15:10:01 +0800
361e2de 1.年假 by wangqiang 2025-07-22 14:06:50 +0800
32fa3f3 1.日历查询和删除 2.年假规则保存方法修改 by wangqiang 2025-07-22 10:26:23 +0800
3e62c2e 1.修改颜色 by wangqiang 2025-07-22 10:24:49 +0800
b39d4b4 1.考勤国内模板修改 2.导出逻辑修改 3.年假规则新增录入逻辑修改 by wangqiang 2025-07-18 17:32:12 +0800
65c2b54 1.年假提交 by wangqiang 2025-07-18 16:26:16 +0800
a2cb25b 1.考勤午休bug处理 by wangqiang 2025-07-16 16:49:36 +0800
7c61934 1.销售统计功能脚本提交 by wangqiang 2025-07-15 11:14:53 +0800
ddd7e69 1.午休脚本提交 2.销售统计功能提交 by wangqiang 2025-07-15 11:08:40 +0800
007202d 1.考勤组添加午休设置 by wangqiang 2025-07-14 09:13:01 +0800
c727ae8 1.考勤国内模板修改 by wangqiang 2025-07-09 17:39:19 +0800
d79f1e5 1.添加注释 2.去掉无用代码 3.考勤打卡excel导出修改 by wangqiang 2025-07-09 17:33:52 +0800
a027f24 去掉加班注释 by 1341924763@qq.com 2025-07-08 10:28:06 +0800
c6d94e9 导出模版格式化日期 by 1341924763@qq.com 2025-07-08 10:21:00 +0800
3457474 添加历史和我的标识区数据权限 by 1341924763@qq.com 2025-07-08 10:20:18 +0800
38dbcf9 添加日历工具类 by 1341924763@qq.com 2025-07-08 10:19:33 +0800
7f77a1e 假期向下取整 by 1341924763@qq.com 2025-07-07 17:36:54 +0800
5477180 修改年末时间为当前时间 by 1341924763@qq.com 2025-07-07 17:25:14 +0800
635ed0e 权限进行判断 by 1341924763@qq.com 2025-07-07 16:21:02 +0800
fe234ef 修改配置 by 1341924763@qq.com 2025-07-07 15:44:47 +0800
b3b22c4 手动生成年假数据 by 1341924763@qq.com 2025-07-07 15:11:49 +0800
164a087 添加出生日期属性 by 1341924763@qq.com 2025-07-07 09:30:25 +0800
9dc5f0d 添加注释 by 1341924763@qq.com 2025-07-07 09:17:08 +0800
f11cb3d 去掉无用的引用 by 1341924763@qq.com 2025-07-04 14:43:32 +0800
765f801 分页展示 by 1341924763@qq.com 2025-07-04 13:25:12 +0800
97d0e48 根据年假规则生成年假余额 by 1341924763@qq.com 2025-07-04 13:07:20 +0800
6be1523 添加入职时间属性 by 1341924763@qq.com 2025-07-04 13:06:16 +0800
9a8379e 添加天数常量 by 1341924763@qq.com 2025-07-04 13:05:54 +0800
5f966ad 配置请求白名单 by 1341924763@qq.com 2025-07-04 13:05:11 +0800
c5f14f8 修改打卡状态查询方式 by 1341924763@qq.com 2025-07-04 09:07:05 +0800
b5f7a0b Merge branch 'main' of http://dev.sohomall.jp:3000/lizhuang/DOAS-BACKEND by wangqiang 2025-07-04 09:05:54 +0800
eeca17d 1.取消测试时间代码 by wangqiang 2025-07-04 09:03:19 +0800
c20303d Merge remote-tracking branch 'origin/main' by 1341924763@qq.com 2025-07-04 09:02:54 +0800
8211539 启动执行器 by 1341924763@qq.com 2025-07-04 09:02:34 +0800
f6b4e9c 1.测试时间 by wangqiang 2025-07-04 08:37:06 +0800
ea2aa06 修改数据获取方式 by 1341924763@qq.com 2025-07-03 17:41:54 +0800
13838d3 年假规则新增 by 1341924763@qq.com 2025-07-03 17:41:08 +0800
4977383 修改日期类型 by 1341924763@qq.com 2025-07-02 11:12:53 +0800
55aa0ab 展示时间数据 by 1341924763@qq.com 2025-07-01 17:40:07 +0800
69aea99 去掉多余逗号 by 1341924763@qq.com 2025-07-01 17:26:44 +0800
a5a4330 用户管理新建添加入职时间字段 by 1341924763@qq.com 2025-07-01 17:18:17 +0800
b5da52c 导出数据赋值修改 by 1341924763@qq.com 2025-06-27 17:43:10 +0800
369887b 修改模版样式 by 1341924763@qq.com 2025-06-27 17:41:06 +0800
a0b45b4 非空校验判断 by 1341924763@qq.com 2025-06-27 13:32:54 +0800
0e4d50e 添加注释 by 1341924763@qq.com 2025-06-27 13:14:47 +0800
c24fdec 修改打卡逻辑 by 1341924763@qq.com 2025-06-26 15:05:08 +0800
886413a 增加创建时间查询条件 by 1341924763@qq.com 2025-06-26 13:21:25 +0800
97905f8 修改查询时间的方式 by 1341924763@qq.com 2025-06-26 11:30:32 +0800
f537082 判断是否为节假日 by 1341924763@qq.com 2025-06-26 11:29:09 +0800
a189ed9 1.xss 过滤掉招聘管理功能的 put和post 方法 by wangqiang 2025-06-26 09:41:41 +0800
70287f3 导出数据的时候添加考勤组条件 by 1341924763@qq.com 2025-06-25 16:19:35 +0800
f8203c6 添加导出汇总 by 1341924763@qq.com 2025-06-25 14:51:07 +0800
0231bcf 导出模版增加汇总sheet by 1341924763@qq.com 2025-06-24 17:12:29 +0800
efb15e3 修改模版样式 by 1341924763@qq.com 2025-06-24 17:11:56 +0800
7355370 1.招聘管理-职位管理功能开发 by wangqiang 2025-06-24 13:07:29 +0800
eb7f894 定时同步打卡数据 by 1341924763@qq.com 2025-06-24 09:41:33 +0800
2cee97a 启动定时任务 by 1341924763@qq.com 2025-06-24 09:40:39 +0800
ea136a7 添加钉钉定时同步任务 by 1341924763@qq.com 2025-06-24 09:39:56 +0800
a6c1b43 修改模版类型为xlsx by 1341924763@qq.com 2025-06-24 09:39:15 +0800
4ffdec3 添加分组字段 by 1341924763@qq.com 2025-06-23 13:35:50 +0800
ed27c09 去除掉模版多余数据 by 1341924763@qq.com 2025-06-23 13:35:13 +0800
66bcb18 打卡状态查询条件修改成上下班打卡查询 by 1341924763@qq.com 2025-06-23 10:37:09 +0800
0e4758e 添加返回考勤组id by 1341924763@qq.com 2025-06-23 10:21:31 +0800
49e98d9 保存打卡记录的时候保存考勤组名称字段 by 1341924763@qq.com 2025-06-23 10:08:53 +0800
656e86f 调整模版单元格距离 by 1341924763@qq.com 2025-06-23 10:07:49 +0800
30fa6db 添加考勤组id 和用户昵称属性 by 1341924763@qq.com 2025-06-23 10:07:05 +0800
3e8768f 修改下载模版路径 by 1341924763@qq.com 2025-06-23 08:52:30 +0800
df2d63e 添加注释 by 1341924763@qq.com 2025-06-23 08:51:35 +0800
e5ab388 增加查询当天查询条件 by 1341924763@qq.com 2025-06-23 08:51:00 +0800
b0542f8 查询当天的打卡记录 by 1341924763@qq.com 2025-06-20 13:17:31 +0800
417ebe5 修改考勤打卡方法 by 1341924763@qq.com 2025-06-20 11:42:55 +0800
e3db1c1 修改打卡考勤状态值 by 1341924763@qq.com 2025-06-20 08:48:54 +0800
d313c5c 新增导出模版 by 1341924763@qq.com 2025-06-20 08:48:12 +0800
17b85c4 修改模版名称 by 1341924763@qq.com 2025-06-20 08:40:07 +0800
6c873e2 修改模版样式 by 1341924763@qq.com 2025-06-19 16:36:39 +0800
b26b09c 导出保留一位小数 by 1341924763@qq.com 2025-06-19 16:36:11 +0800
802ab7b 添加areaName workDays 属性 by 1341924763@qq.com 2025-06-19 16:33:15 +0800
81270e3 修改考勤组方法和添加打卡记录导出功能 by 1341924763@qq.com 2025-06-19 14:41:20 +0800
996b598 添加alibaba.fastjson依赖 by 1341924763@qq.com 2025-06-19 14:38:40 +0800
3d595da 注释掉测试方法 by 1341924763@qq.com 2025-06-19 14:37:57 +0800
2e12858 配置修改 by 1341924763@qq.com 2025-06-16 17:29:08 +0800
0be8488 参数修改 by 1341924763@qq.com 2025-06-16 17:28:03 +0800
c8d1422 初始化提交 by 1341924763@qq.com 2025-06-16 17:27:07 +0800
dbcd93e Merge remote-tracking branch 'origin/main' by 1341924763@qq.com 2025-06-12 15:07:11 +0800