Commit Graph

61 Commits

Author SHA1 Message Date
钱涛 3f0bbd3160 剔除主账号 2022-06-06 10:19:11 +08:00
MustangDeng da2a0e5d22 工资单及福利问题修复 2022-06-01 19:13:20 +08:00
钱涛 76b05e3d38 fix 2022-05-31 09:59:32 +08:00
MustangDeng 4e4c190f31 bug修改 2022-05-30 17:31:29 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +08:00
MustangDeng d48ef0aeec oracle 适配 2022-05-30 09:14:12 +08:00
MustangDeng 224c823590 oracle 自增返回 2022-05-27 15:01:44 +08:00
钱涛 99fda7ecc3 修复调薪记录 2022-05-25 11:09:48 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
钱涛 0b523846d7 日期类型处理 2022-05-06 16:54:58 +08:00
钱涛 d2a564cb92 sql兼容性处理 2022-05-06 16:01:33 +08:00
钱涛 ba67612e40 sql兼容性处理 2022-05-06 13:22:16 +08:00
钱涛 dff9657c3d 核算字段 2022-04-29 14:17:31 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 16a4f32ec1 sqlserver的批量插入bug 2022-04-22 18:00:35 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
Chengliang 9813012249 福利台账相关接口 2022-04-15 19:01:09 +08:00
reset ac86ad0d62
!16 台账
Merge pull request !16 from reset/archive
2022-04-12 11:31:07 +00:00
Chengliang 985456ed14 社保台账 2022-04-12 19:29:19 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00
钱涛 23adb455fd 核算v1 2022-04-08 16:30:10 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00
钱涛 90335032fd 调整原因 2022-04-07 11:39:22 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 59fc1ded4e Merge branch 'feature/qt' into develop 2022-03-16 14:30:54 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00
Chengliang 88c0cc67e6 福利档案获取baseForm 2022-03-15 17:39:19 +08:00
钱涛 1a49dd331d 考勤字段相关接口 2022-03-15 14:18:04 +08:00
钱涛 eb4ca765d7 考勤相关接口 2022-03-15 09:55:58 +08:00
钱涛 fe14008e39 sql适配 2022-03-12 17:45:39 +08:00
钱涛 3a09014291 bug 2022-03-11 19:00:58 +08:00
钱涛 dded82ac7c Merge branch 'feature/qt' into develop 2022-03-11 17:15:43 +08:00
钱涛 7f3b381e5c 导出过滤 2022-03-11 17:15:33 +08:00
钱涛 333af1c924 Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 16:20:05 +08:00
钱涛 1c46bd28f7 累计bug 2022-03-11 16:19:47 +08:00
钱涛 8aabe78182 Merge branch 'feature/qt' into develop 2022-03-11 13:45:03 +08:00
钱涛 d748f3733a 累计bug 2022-03-11 13:44:47 +08:00
钱涛 2ba52fe82b Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 13:20:17 +08:00
钱涛 4a15c5614b 累计bug 2022-03-11 13:20:00 +08:00
钱涛 e3c602a8a0 Merge branch 'feature/qt' into develop 2022-03-10 18:00:21 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00
钱涛 8a7251c076 Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/web/AddUpDeductionController.java
2022-03-10 11:10:40 +08:00
钱涛 d55fca8eeb 导出明细 2022-03-10 11:09:08 +08:00
钱涛 8da28ec05f Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/init.sql
2022-03-09 19:00:21 +08:00