 cwchen
|
7b5948b531
|
考勤修改审核流程配置
|
2025-02-23 22:06:19 +08:00 |
|
cwchen
|
bc0dbfced0
|
考勤修改审核流程配置
|
2025-02-21 17:18:11 +08:00 |
 fl
|
902a63dcf2
|
过滤掉没有组织的人员
|
2025-02-21 16:24:49 +08:00 |
|
cwchen
|
24422301eb
|
审核流程配置
|
2025-02-21 16:08:11 +08:00 |
|
cwchen
|
073b63682b
|
文件路径配置
|
2025-02-21 10:41:54 +08:00 |
 lSun
|
c494111a4e
|
考勤明细修改审核数据隔离
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-21 10:19:51 +08:00 |
|
cwchen
|
368fb1f49b
|
考勤修改 审核流程修改
|
2025-02-20 20:15:26 +08:00 |
|
fl
|
e969b1ccc8
|
黔送云数据拉取外勤状态添加
|
2025-02-20 20:12:55 +08:00 |
|
fl
|
50c07bc162
|
项目部考勤明细导出打卡变“工”或“外”
|
2025-02-20 19:59:01 +08:00 |
|
lSun
|
8f4251d31d
|
数据同步
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-20 19:49:45 +08:00 |
|
fl
|
c8fed6540d
|
小程序表结构修改，考勤数据同步问题修改
请假同步数据修改
删除废弃的功能
|
2025-02-20 19:43:38 +08:00 |
|
fl
|
b37c6af313
|
请假数据同步添加字段，更新同步流程
|
2025-02-20 16:11:11 +08:00 |
|
fl
|
6ccabe57b4
|
历史推送简化修改
|
2025-02-20 09:26:04 +08:00 |
|
cwchen
|
266d36561e
|
考勤修改 审核流程修改
|
2025-02-20 09:13:36 +08:00 |
|
cwchen
|
d9edbae9ff
|
考勤修改 审核流程修改
|
2025-02-19 19:32:31 +08:00 |
|
cwchen
|
de0c0e02b8
|
文件上传修改
|
2025-02-19 19:01:59 +08:00 |
|
cwchen
|
5080048bdd
|
考勤修改
|
2025-02-19 17:50:25 +08:00 |
|
cwchen
|
57e40f546f
|
考勤修改
|
2025-02-19 17:26:41 +08:00 |
|
cwchen
|
ebe462f21a
|
考勤修改
|
2025-02-19 16:48:51 +08:00 |
|
cwchen
|
eedb654f32
|
考勤修改
|
2025-02-19 16:48:01 +08:00 |
|
cwchen
|
9fcefb3573
|
考勤规则
|
2025-02-19 14:45:19 +08:00 |
|
cwchen
|
45593bceb0
|
文件上传
|
2025-02-19 14:00:31 +08:00 |
|
fl
|
835d70b126
|
历史推送简化修改
|
2025-02-19 13:59:03 +08:00 |
|
fl
|
2c24ba58a8
|
考勤流程定时器规则设置
历史考勤接口调试
|
2025-02-19 11:29:56 +08:00 |
|
fl
|
df41b0f7d9
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java
|
2025-02-18 21:02:23 +08:00 |
|
fl
|
01208754a4
|
日月报表生成
|
2025-02-18 21:01:41 +08:00 |
|
fl
|
5f76423d4c
|
历史考勤推送步骤
|
2025-02-18 21:01:09 +08:00 |
|
cwchen
|
96194bd879
|
月报表、月异常报表导出修改
|
2025-02-18 20:22:03 +08:00 |
|
cwchen
|
d5757a7e05
|
当天新增人员-生成当天考勤模板数据
|
2025-02-18 14:04:52 +08:00 |
|
fl
|
64dcc34d46
|
考勤请假数据重构
|
2025-02-18 11:11:38 +08:00 |
|
cwchen
|
a0df3e03f6
|
当天新增人员-生成当天考勤模板数据
|
2025-02-18 11:02:15 +08:00 |
|
fl
|
c0332b2548
|
考勤逻辑重构代码
|
2025-02-18 10:56:59 +08:00 |
|
fl
|
908dd61ff7
|
专用考勤计算时间差工具类
|
2025-02-18 10:56:58 +08:00 |
|
fl
|
37bedd187d
|
考勤计算重构
|
2025-02-18 10:56:55 +08:00 |
|
fl
|
5bbbc22e30
|
修改,添加一个重载方法，可以返回省
|
2025-02-18 10:53:16 +08:00 |
|
cwchen
|
bf1e35a4d8
|
人员信息删除-同步删除考勤信息
|
2025-02-18 10:46:42 +08:00 |
|
cwchen
|
d9a74f6cd1
|
考勤规则-添加是否有法定节假日
|
2025-02-18 10:27:25 +08:00 |
|
cwchen
|
80f13e68c7
|
考勤规则-人员树修改
|
2025-02-18 09:30:42 +08:00 |
|
lSun
|
a0713ca6d3
|
出差报备
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-14 18:11:34 +08:00 |
|
fl
|
830e77d4bf
|
修改考勤规则记录所在时间
|
2025-02-13 16:49:21 +08:00 |
|
cwchen
|
bd059632ce
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-13 10:34:26 +08:00 |
|
cwchen
|
23d865fe9f
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-12 16:00:14 +08:00 |
|
cwchen
|
52b6da1b53
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-12 15:18:11 +08:00 |
|
fl
|
960d9cd6f1
|
月计划天数按当月最后所在的组织决定
|
2025-02-12 10:59:17 +08:00 |
|
fl
|
de8a9f61aa
|
月计划与月计划异常导出添加头部条件
|
2025-02-12 09:56:53 +08:00 |
|
fl
|
803298ae60
|
人员数据同步调换一下先后顺序
|
2025-02-12 09:38:59 +08:00 |
|
fl
|
9117c69c1b
|
月报表导出问题修改
人员考勤组时间生成修改
|
2025-02-12 09:37:48 +08:00 |
|
fl
|
9bf8a8b7c8
|
月报表生成先删除在生成
导出考勤状态问题修改
|
2025-02-12 09:36:00 +08:00 |
|
lSun
|
cf2ab9c5ca
|
put 改成post
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-11 19:14:05 +08:00 |
|
cwchen
|
4ffee47816
|
八大员缺员兼职查询接口修改、一键审批
|
2025-02-11 17:47:18 +08:00 |
|
cwchen
|
dfa1d87787
|
八大员缺员兼职查询接口修改、一键审批
|
2025-02-11 15:01:39 +08:00 |
|
cwchen
|
aaae74c9b6
|
八大员缺员兼职查询接口修改
|
2025-02-11 12:34:37 +08:00 |
|
cwchen
|
9f582413c2
|
八大员缺员兼职查询
|
2025-02-11 11:13:48 +08:00 |
|
lSun
|
f02d86e801
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-10 09:58:38 +08:00 |
|
fl
|
c9e4a817b4
|
导出问题修改
组织问题修改
|
2025-02-06 18:04:41 +08:00 |
 史宗金
|
692d9d5a86
|
修改假期，节假日定时器
|
2025-01-24 10:22:34 +08:00 |
|
史宗金
|
8eb2c081c0
|
修改假期，节假日定时器
|
2025-01-24 09:17:10 +08:00 |
|
史宗金
|
3a049d808e
|
修改假期，节假日定时器
|
2025-01-23 19:05:40 +08:00 |
|
史宗金
|
619f89d0bf
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 19:05:00 +08:00 |
|
fl
|
358707fc28
|
考勤规则问题修改
|
2025-01-23 19:03:25 +08:00 |
|
史宗金
|
f49269d24c
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 18:22:45 +08:00 |
|
fl
|
d71f4140ce
|
备注添加
|
2025-01-23 18:22:02 +08:00 |
|
史宗金
|
b4c6ee242f
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 18:13:38 +08:00 |
|
fl
|
db672df75b
|
人脸未通过重新授权录入
|
2025-01-23 18:03:33 +08:00 |
|
fl
|
fb6b728a4b
|
人员同步先同步人脸，在同步数据
|
2025-01-23 17:52:09 +08:00 |
|
史宗金
|
5c504b6208
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 17:01:16 +08:00 |
|
fl
|
e315ab5d5d
|
同步考勤数据问题
|
2025-01-23 16:59:18 +08:00 |
|
fl
|
2d868cd5c0
|
同步考勤数据问题
|
2025-01-23 16:59:16 +08:00 |
|
史宗金
|
4e97676ed8
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 16:59:05 +08:00 |
|
lSun
|
60827c41da
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-23 16:47:30 +08:00 |
|
史宗金
|
d157580622
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 13:01:46 +08:00 |
|
fl
|
a61a8a3715
|
同步考勤数据不能超过当天
|
2025-01-23 09:18:04 +08:00 |
|
fl
|
57539edda8
|
导出修改
组织删除修改
考勤相关历史组织查询修改
|
2025-01-22 16:32:25 +08:00 |
|
史宗金
|
37416e2539
|
Merge remote-tracking branch 'origin/main'
|
2025-01-22 13:08:43 +08:00 |
|
fl
|
ee8b14b27c
|
人员请假等根据公司或项目部区分是否去除周六日
|
2025-01-22 09:49:23 +08:00 |
|
fl
|
ac54c8abda
|
月报表导出添加组织权限
|
2025-01-22 09:48:34 +08:00 |
|
史宗金
|
b6e499c4d0
|
修改假期，节假日定时器
|
2025-01-22 09:08:03 +08:00 |
|
lSun
|
61935d5704
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-21 19:45:51 +08:00 |
|
fl
|
a6cd511905
|
考勤添加时间
|
2025-01-20 13:41:32 +08:00 |
|
lSun
|
fd75c8b95b
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-17 18:01:41 +08:00 |
|
fl
|
6aa7e58525
|
八大员bug修改完毕
|
2025-01-17 14:39:30 +08:00 |
|
lSun
|
0bfdd406cd
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-15 19:02:05 +08:00 |
|
lSun
|
4b1b2e65d2
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-15 15:08:37 +08:00 |
|
史宗金
|
2d9fe0e148
|
修改假期，节假日定时器
|
2025-01-15 10:50:08 +08:00 |
|
史宗金
|
7fb6106716
|
修改假期，节假日定时器
|
2025-01-14 13:02:34 +08:00 |
|
fl
|
c800cdaeca
|
考勤bug修改完毕
|
2025-01-13 21:56:42 +08:00 |
|
lSun
|
3f9a4bc07c
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-13 21:46:02 +08:00 |
|
fl
|
8d318628e0
|
考勤bug修改完毕
|
2025-01-13 20:55:58 +08:00 |
|
lSun
|
22060187c8
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-11 22:06:53 +08:00 |
|
lSun
|
652e492770
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-11 21:06:33 +08:00 |
|
史宗金
|
7ed73c85bd
|
修改假期，节假日定时器
|
2025-01-11 19:22:03 +08:00 |
|
史宗金
|
f4e3872bd8
|
修改假期，节假日定时器
|
2025-01-11 18:41:17 +08:00 |
|
lSun
|
9457ff7b21
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-11 18:39:59 +08:00 |
|
史宗金
|
c119c328b4
|
Merge branch 'main' of http://192.168.0.56:3000/bonus/gz_att
|
2025-01-11 18:03:27 +08:00 |
|
史宗金
|
47777bc006
|
修改假期，节假日定时器
|
2025-01-11 18:02:58 +08:00 |
|
lSun
|
c1310a2415
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-11 15:44:36 +08:00 |
|
lSun
|
42f81f9c7b
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-11 14:00:40 +08:00 |
|
fl
|
5090ce5bb2
|
考勤bug修改完毕
|
2025-01-10 23:18:13 +08:00 |
|
史宗金
|
c3007d0f5b
|
修改假期，节假日定时器
|
2025-01-10 13:42:02 +08:00 |
|
史宗金
|
a743cb9cd1
|
修改假期，节假日定时器
|
2025-01-10 13:36:27 +08:00 |