sy
|
28fff1f519
|
薪酬系统-薪资档案，非系统人员导入模板带出数据中部门为null处理为空字符串
|
2023-08-29 11:46:06 +08:00 |
|
sy
|
d94ee07de6
|
薪酬系统-福利方案，处理合并冲突
|
2023-08-24 09:17:39 +08:00 |
|
sy
|
f925943b31
|
Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action
|
2023-08-24 09:15:48 +08:00 |
|
sy
|
a3b67ab091
|
薪酬系统-福利方案，福利方案明细数据修改接口，明细表更细sql优化
|
2023-08-23 18:39:02 +08:00 |
|
sy
|
770074ba23
|
薪酬系统-薪资核算，非系统人员查询问题修复
|
2023-08-23 17:48:52 +08:00 |
|
sy
|
2048e9c489
|
薪酬系统-福利档案，福利档案减员、增员action
|
2023-08-23 16:52:32 +08:00 |
|
sy
|
c94f1b24a4
|
薪酬系统-福利档案，新增和编辑福利档案action、福利档案导入逻辑优化（仅修改设置值的数据）
|
2023-08-22 14:47:48 +08:00 |
|
sy
|
5f9fbde35a
|
薪酬系统-福利方案，福利方案明细数据修改接口，更新明细修改时间
|
2023-08-21 16:48:17 +08:00 |
|
sy
|
299284872f
|
薪酬系统-福利方案，福利方案明细数据修改接口
|
2023-08-21 14:58:01 +08:00 |
|
sy
|
4ffca1872a
|
薪酬系统-福利台账，核算明细列表合计行导出
|
2023-08-18 17:58:36 +08:00 |
Harryxzy
|
ea1a46839d
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-17 16:07:24 +08:00 |
|
Harryxzy
|
343edd2df7
|
sql
|
2023-08-17 16:06:55 +08:00 |
|
sy
|
f60eae5af2
|
薪酬系统-福利台账，列表导出取消对档案状态的过滤
|
2023-08-17 15:24:15 +08:00 |
|
sy
|
63023ae8e6
|
薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示
|
2023-08-17 11:31:38 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
165c777919
|
Merge remote-tracking branch 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' into release/2.9.3.2308.01
|
2023-08-09 18:20:17 +08:00 |
|
sy
|
6f9deed908
|
薪酬系统-福利档案，修改社保、公积金、其他福利表结构
|
2023-08-09 18:19:42 +08:00 |
|
sy
|
536465fbae
|
Merge remote-tracking branches 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' and 'remotes/origin/fix/230801-福利台账-导入的年月格式校验逻辑优化' into release/2.9.3.2308.01
|
2023-08-09 18:08:40 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
a85e887356
|
sql
|
2023-08-08 11:42:24 +08:00 |
|
Harryxzy
|
fa7eb0ee60
|
Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造
|
2023-08-08 11:06:06 +08:00 |
|
Harryxzy
|
c977109cb7
|
sql
|
2023-08-08 11:05:52 +08:00 |
|
sy
|
9d0194acd3
|
薪酬系统-福利台账，优化福利台账补缴模板中账单月份和补缴月份校验逻辑
|
2023-08-07 16:46:17 +08:00 |
|
sy
|
95525d42d8
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:55:56 +08:00 |
|
sy
|
14a944c60b
|
薪酬系统-非系统人员管理，非系统人员导入时，部门名称为null则置为空字符串
|
2023-08-04 16:55:19 +08:00 |
|
sy
|
d9caedbe5b
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:34:16 +08:00 |
|
sy
|
2f6e221c9b
|
薪酬系统-非系统人员管理，非系统人员导入新增添加status值设置
|
2023-08-04 16:14:00 +08:00 |
|
sy
|
98e1574914
|
Merge remote-tracking branch 'remotes/origin/fix/230801-社保福利-停用自定义福利不显示在档案导入模板和台账导入自定义字段中' into release/2.9.3.2308.01
|
2023-08-04 15:27:34 +08:00 |
|
sy
|
8c9049f1f7
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 15:26:24 +08:00 |
|
sy
|
4048d0998c
|
Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.3.2308.01
|
2023-08-04 15:18:56 +08:00 |
|
sy
|
cedb49833c
|
Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.2.2307.02
|
2023-08-04 15:18:10 +08:00 |
|
sy
|
6dd6eca3bf
|
薪酬系统-人员匹配，优化全量人力表人员查询sql
|
2023-08-04 15:07:41 +08:00 |
|
sy
|
d219d129a5
|
薪酬系统-福利台账，台账明细导入模板自定义导入字段列表优化
|
2023-08-04 14:14:44 +08:00 |
|
sy
|
c623d32609
|
Merge remote-tracking branch 'remotes/origin/fix/230801-福利档案-增量处理逻辑添加日志' into release/2.9.3.2308.01
|
2023-08-04 10:55:27 +08:00 |
|
sy
|
07eb966c18
|
薪酬系统-非系统人员管理，非系统人员导入逻辑优化
|
2023-08-04 10:02:06 +08:00 |
|
Harryxzy
|
190771037e
|
fixbug
|
2023-08-04 09:33:17 +08:00 |
|
sy
|
9488823307
|
Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.2.2307.02
|
2023-08-04 09:11:26 +08:00 |
|
Harryxzy
|
ebd2e8651f
|
Merge remote-tracking branch 'origin/release/2.9.3.2308.01' into release/2.9.3.2308.01
|
2023-08-03 09:27:05 +08:00 |
|
sy
|
5925bd5600
|
薪酬系统-福利档案，增量数据处理-新增福利档案相关日志添加开关
|
2023-08-02 16:39:20 +08:00 |
|
sy
|
0749ab9d5b
|
薪酬系统-福利档案，增量数据处理中相关日志添加开关
|
2023-08-02 16:31:59 +08:00 |
|
sy
|
109028e645
|
薪酬系统-福利档案，增量数据处理添加日志若干
|
2023-08-02 16:08:12 +08:00 |
|
sy
|
3f10c8eb96
|
Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01
|
2023-08-02 15:41:33 +08:00 |
|
sy
|
f566193dcb
|
Merge remote-tracking branch 'remotes/origin/feature/230702-福利方案-自定义福利项删除功能' into release/2.9.3.2308.01
|
2023-08-02 15:41:00 +08:00 |
|
Harryxzy
|
f6dc6d9257
|
fix个税扣缴义务人删除人员范围，档案不跳到停薪
|
2023-08-02 14:47:40 +08:00 |
|
Harryxzy
|
e655daf018
|
fix个税扣缴义务人人员范围，无法根据部门、分部维度生成数据
|
2023-08-02 10:34:04 +08:00 |
|
sy
|
293297ad7f
|
薪酬系统-福利台账，线下对比导入分批,列表逻辑优化
|
2023-08-01 15:37:32 +08:00 |
|
sy
|
98bbac3236
|
薪酬系统-福利台账，线下对比导入分批
|
2023-08-01 13:53:22 +08:00 |
|
Harryxzy
|
3827c8963d
|
fix补发模板问题
|
2023-07-31 17:07:21 +08:00 |