Commit Graph

222 Commits

Author SHA1 Message Date
钱涛 fd856e0750 入职日期 2022-05-09 14:24:40 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +08:00
MustangDeng 22de36ce59 Merge branch '20220505' into develop 2022-05-09 11:19:35 +08:00
MustangDeng 2200d0c793 工资单撤回 2022-05-09 11:18:54 +08:00
钱涛 525fcc49a7 公式模拟运行 2022-05-08 12:34:05 +08:00
钱涛 c852211b0e 核算log 2022-05-07 15:20:39 +08:00
钱涛 88b94b7aac 薪资项目列表优化 2022-05-05 15:02:12 +08:00
钱涛 231961663f 核算结果导出 2022-05-05 14:10:19 +08:00
钱涛 a530532a45 去除run方法 2022-05-05 10:35:58 +08:00
钱涛 dff9657c3d 核算字段 2022-04-29 14:17:31 +08:00
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +08:00
钱涛 23da0fb5e4 sql公式 2022-04-28 15:02:11 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
钱涛 e74931aa54 人员字段默认删除 2022-04-27 18:48:41 +08:00
钱涛 6ca41e8e59 字段分类 2022-04-27 18:29:38 +08:00
钱涛 c899d370a9 默认员工字段不可删除 2022-04-27 17:20:33 +08:00
钱涛 01354b2be9 fix线下对比404 2022-04-27 13:33:44 +08:00
钱涛 8abfb7631e fix线下对比404 2022-04-27 09:43:24 +08:00
钱涛 151fa2b575 线下对比 2022-04-26 16:39:41 +08:00
钱涛 d521bf5bf7 账套周期 2022-04-26 14:44:42 +08:00
钱涛 12efa69503 同步考勤字段值 2022-04-25 15:51:35 +08:00
钱涛 416ccd57a6 同步考勤字段值 2022-04-25 14:51:30 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 3b342d4ec7 我的薪资福利 2022-04-22 19:22:40 +08:00
reset df5fa147e1
!28 修复xml报错
Merge pull request !28 from reset/archive
2022-04-22 08:43:04 +00:00
Chengliang 9dc29b2b3c 修复xml文件报错 2022-04-22 16:42:06 +08:00
钱涛 5347c70809 Merge remote-tracking branch 'origin/develop' into develop 2022-04-22 15:46:14 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
reset ef4ffacbcc
!27 修复方案列表
Merge pull request !27 from reset/archive
2022-04-22 07:19:56 +00:00
Chengliang c2c7d2dee5 修复方案列表 2022-04-22 15:17:31 +08:00
MustangDeng ee9116ae2b 工资单列表问题处理 2022-04-22 11:02:15 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +08:00
reset 926b132d50
!26 导出
Merge pull request !26 from reset/archive
2022-04-21 07:05:43 +00:00
Chengliang d0f12c2faf 6个列表页导出完成 2022-04-21 15:04:35 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
18895359881@163.com 21e4afcbbb Merge branch 'test_xxy' into develop 2022-04-20 21:37:39 +08:00
18895359881@163.com d15cccca8d 申报表生成 2022-04-20 21:36:27 +08:00
reset 5320e0b4f8
!25 福利台账
Merge pull request !25 from reset/archive
2022-04-20 11:14:23 +00:00
Chengliang 72e9e152d6 福利台账相关 2022-04-20 19:12:01 +08:00
钱涛 d2ba2c3afe 公式参数 2022-04-20 11:31:55 +08:00
18895359881@163.com 4fd63c1999 Merge remote-tracking branch 'origin/develop' into develop 2022-04-19 20:59:33 +08:00
18895359881@163.com bfdb9a33d5 个税申报表接口 2022-04-19 20:58:30 +08:00
钱涛 c4c757d055 Merge branch 'feature/v1' into develop 2022-04-19 15:13:23 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
reset 37830fc89e
!22 增加datakey
Merge pull request !22 from reset/archive
2022-04-19 04:20:18 +00:00
Chengliang 9c02c9c9fd 列表增加datakey 2022-04-19 12:19:06 +08:00
钱涛 982fffeb73 Merge branch 'feature/v1' into develop 2022-04-19 10:42:01 +08:00
钱涛 51e816ab56 补充列 2022-04-19 10:40:47 +08:00
reset 8ed7bbb3b6
!21 福利台账导出各接口
Merge pull request !21 from reset/archive
2022-04-18 12:26:02 +00:00
Chengliang 651df1842e 福利台账导出 2022-04-18 20:24:43 +08:00