Commit Graph

71 Commits

Author SHA1 Message Date
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
钱涛 87d304d63e Merge remote-tracking branch 'origin/develop' into develop 2022-03-21 20:10:28 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
reset 7fa5f12f6e
!10 优化listpage接口
Merge pull request !10 from reset/archive
2022-03-21 08:14:47 +00:00
Chengliang e9ee672a66 社保档案listPage优化 2022-03-21 16:13:08 +08:00
钱涛 f0a0680bdc Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/common/BaseQueryParam.java
#	src/com/engine/salary/demo/DemoPageCmd.java
2022-03-21 09:36:56 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +08:00
reset 4749bdbdc4
!8 社保档案详情-保存等接口
Merge pull request !8 from reset/archive
2022-03-17 07:28:29 +00:00
Chengliang 7194ae4026 社保档案详情-保存等接口 2022-03-17 15:26:33 +08:00
钱涛 a6bd9f38de Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:15:00 +08:00
钱涛 2a6f3a10ce Merge branch 'feature/qt' into develop 2022-03-17 15:14:53 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00
Chengliang cc9a650b92 批量保存,批量删除社保档案 2022-03-16 18:26:49 +08:00
reset 23519e2050
!6 payform 及表单组件
Merge pull request !6 from reset/archive
2022-03-16 09:06:09 +00:00
Chengliang b0124e250d 福利档案payForm及表单组件 2022-03-16 17:04:21 +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
钱涛 27c9d669f7 Merge remote-tracking branch 'origin/develop' into develop 2022-03-15 09:56:30 +08:00
钱涛 eb4ca765d7 考勤相关接口 2022-03-15 09:55:58 +08:00
reset 64eff51ab2
!4 福利方案表单接口
Merge pull request !4 from reset/archive
2022-03-15 01:39:24 +00:00
Chengliang 69a1b4d5ae 福利项目表单接口修复 2022-03-15 09:34:53 +08:00
钱涛 fe14008e39 sql适配 2022-03-12 17:45:39 +08:00
钱涛 3a09014291 bug 2022-03-11 19:00:58 +08:00
reset 7c30485b88
!3 bug修复
Merge pull request !3 from reset/archive
2022-03-11 10:06:47 +00:00
Chengliang 99c9ad807f 福利方案bug修复 2022-03-11 17:46:26 +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
Chengliang 04cf94e498 自定义福利接口 getCustomCategoryForm createSICategory.... 2022-03-10 15:23:56 +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
钱涛 1319543251 累计接口 2022-03-09 18:58:30 +08:00
Chengliang 5cb2f02e69 福利方案修复更新操作 2022-03-09 17:46:03 +08:00