Commit Graph

149 Commits

Author SHA1 Message Date
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 93686e38c5 bug 2022-03-30 18:32:44 +08:00
钱涛 922a055f97 统一sql 2022-03-30 18:00:56 +08:00
钱涛 d6ed96e891 sql修改 2022-03-30 15:58:29 +08:00
钱涛 6d61297dd1 sql修改 2022-03-30 14:56:31 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 93154ada71 薪资账套项目保存 2022-03-28 13:48:43 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 00c0fe477e 税率 2022-03-28 10:49:23 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 24c50f7f17 名称模糊查询 2022-03-25 10:45:53 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +08:00
钱涛 f2cf03ebbf departmentIds 2022-03-24 20:01:25 +08:00
钱涛 a9d486bef6 相对更新 2022-03-24 19:42:03 +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
钱涛 f94e64b492 Merge branch 'feature/qt' into develop 2022-03-22 10:42:47 +08:00
钱涛 0b3b971ecd 参数验证,运行期功能 2022-03-22 10:42:26 +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
钱涛 994a1dbd16 分页 2022-03-21 10:08:39 +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
钱涛 dc567d9463 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/com/api/salary/web/DemoController.java
2022-03-21 09:35:11 +08:00
钱涛 d2ce25550e demo 2022-03-21 09:34:30 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
reset 620193471c
!9 社保档案动态列接口
Merge pull request !9 from reset/archive
2022-03-18 10:04:59 +00:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +08:00
钱涛 54925dc51e Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:47:42 +08:00
钱涛 eaaf69b09c Merge branch 'feature/qt' into develop 2022-03-17 15:47:31 +08:00
钱涛 5b0374ca42 分页 2022-03-17 15:47:14 +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
reset 2c23c05dee
!7 批量保存,批量删除社保档案
Merge pull request !7 from reset/archive
2022-03-16 10:28:32 +00: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