Commit Graph

1647 Commits

Author SHA1 Message Date
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
钱涛 2ce8d8ca5d Merge branch 'feature/qt' into develop 2022-03-11 18:14:35 +08:00
钱涛 502450baab bug 2022-03-11 18:14:19 +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
钱涛 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
Chengliang 0474872ab5 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-03-11 14:29:08 +08:00
Chengliang f09c6d197c 福利台账listPage 2022-03-11 14:28:39 +08:00
钱涛 d601f2fd59 Merge branch 'feature/qt' into develop 2022-03-11 11:09:16 +08:00
钱涛 9676102894 累计bug 2022-03-11 11:08:50 +08:00
Chengliang 843900882b listPage 2022-03-10 18:24:08 +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
钱涛 7ee952e63c 累计 2022-03-09 16:40:14 +08:00
Chengliang 7d245e786e 社保自定义福利控制器 getForm 2022-03-09 16:12:47 +08:00
Chengliang 0c3322796f solve conflict 2022-03-09 10:09:07 +08:00
钱涛 880cf9ef66 excel导入导出 2022-03-09 09:58:36 +08:00
Chengliang 91958201e5 福利模块insert getForm delete update copy接口 2022-03-09 09:42:10 +08:00
钱涛 9de0f08415 日期转换 2022-03-08 15:40:26 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00
Chengliang 2b61b030d7 福利模块getForm接口 2022-03-07 22:22:09 +08:00
钱涛 0759628eb2 excel导入导出 2022-03-07 15:08:56 +08:00
钱涛 97cc5d154f 累计附加扣除-条件接口 2022-03-04 10:10:38 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 87d278448c 暂存税率表接口 2022-03-02 09:54:55 +08:00
钱涛 fb42a5f041 删除接口ids改为json入参 2022-03-01 18:49:22 +08:00
钱涛 b56a48c885 税率接口 2022-03-01 18:31:29 +08:00
钱涛 8922047306 税率接口及相关基础类 2022-03-01 16:45:57 +08:00
MustangDeng 9685f03db4 删除demoController相关接口 2022-03-01 11:13:17 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口(6) 2022-02-28 17:19:07 +08:00
钱涛 4a081d6ad9 初始化项目结构、demo样例、mybatis使用样例 2022-02-25 19:41:22 +08:00