 钱涛
|
8326f3ae6f
|
导入参数
|
2022-04-01 10:26:28 +08:00 |
|
钱涛
|
e9e03880d9
|
Merge branch 'feature/qt' into develop
|
2022-03-31 18:42:06 +08:00 |
|
钱涛
|
163963d463
|
fix bug
|
2022-03-31 18:41:41 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +08:00 |
|
钱涛
|
cd6ad5f4be
|
Merge branch 'feature/qt' into develop
|
2022-03-30 20:27:33 +08:00 |
|
钱涛
|
4167cb55ee
|
限制薪资项目的删除
|
2022-03-30 20:27:17 +08:00 |
|
钱涛
|
b30bcb8453
|
Merge branch 'feature/qt' into develop
|
2022-03-30 18:32:55 +08:00 |
|
钱涛
|
93686e38c5
|
bug
|
2022-03-30 18:32:44 +08:00 |
|
钱涛
|
94bef09608
|
Merge branch 'feature/qt' into develop
|
2022-03-30 14:56:45 +08:00 |
|
钱涛
|
6d61297dd1
|
sql修改
|
2022-03-30 14:56:31 +08:00 |
|
钱涛
|
50a62e3b29
|
Merge branch 'feature/qt' into develop
|
2022-03-30 12:16:07 +08:00 |
|
钱涛
|
a3604a28f0
|
校驗規則列表
|
2022-03-30 12:15:49 +08:00 |
|
钱涛
|
f8a704e66c
|
修改sql
|
2022-03-30 11:29:48 +08:00 |
|
钱涛
|
cf39049530
|
Merge branch 'feature/qt' into develop
|
2022-03-29 17:11:15 +08:00 |
|
钱涛
|
5c550365f1
|
薪资档案
|
2022-03-29 17:10:59 +08:00 |
|
钱涛
|
2a5a72f6ab
|
Merge branch 'feature/qt' into develop
|
2022-03-28 20:04:51 +08:00 |
|
钱涛
|
ba707878fc
|
薪资档案
|
2022-03-28 20:04:27 +08:00 |
|
钱涛
|
019cdd9968
|
Merge branch 'feature/qt' into develop
|
2022-03-28 16:37:03 +08:00 |
|
钱涛
|
5ae4eb5fc8
|
项目id
|
2022-03-28 16:36:40 +08:00 |
|
钱涛
|
faca2d4d1b
|
Merge branch 'feature/qt' into develop
|
2022-03-28 11:38:46 +08:00 |
|
钱涛
|
045293426c
|
账套校验规则
|
2022-03-28 11:38:33 +08:00 |
|
钱涛
|
c9281bd6db
|
Merge branch 'feature/qt' into develop
|
2022-03-25 18:05:18 +08:00 |
|
钱涛
|
1db71a97ff
|
薪资账套
|
2022-03-25 18:05:07 +08:00 |
|
钱涛
|
cc13dd5c7b
|
Merge branch 'feature/qt' into develop
|
2022-03-25 10:31:45 +08:00 |
|
钱涛
|
980415c8ca
|
账套
|
2022-03-25 10:31:31 +08:00 |
|
钱涛
|
c4142801bc
|
Merge branch 'feature/qt' into develop
|
2022-03-24 20:01:56 +08:00 |
|
钱涛
|
f2cf03ebbf
|
departmentIds
|
2022-03-24 20:01:25 +08:00 |
|
钱涛
|
5ad46ffabd
|
Merge branch 'feature/qt' into develop
|
2022-03-24 19:42:11 +08:00 |
|
钱涛
|
a9d486bef6
|
相对更新
|
2022-03-24 19:42:03 +08:00 |
|
钱涛
|
466966dac6
|
Merge branch 'feature/qt' into develop
|
2022-03-24 17:00:08 +08:00 |
|
钱涛
|
83e1cf2805
|
相对更新
|
2022-03-24 16:59:52 +08:00 |
|
钱涛
|
288c274aaf
|
Merge branch 'feature/qt' into develop
|
2022-03-23 20:54:22 +08:00 |
|
钱涛
|
79f9e010af
|
账套薪资项目
|
2022-03-23 20:54:08 +08:00 |
|
钱涛
|
00150f1696
|
Merge branch 'feature/qt' into develop
|
2022-03-23 18:41:52 +08:00 |
|
钱涛
|
b3d7123401
|
列表添加id
|
2022-03-23 18:41:38 +08:00 |
|
钱涛
|
2c65022174
|
Merge branch 'feature/qt' into develop
|
2022-03-23 13:52:58 +08:00 |
|
钱涛
|
e66445ce20
|
人员sql
|
2022-03-23 13:52:43 +08:00 |
|
钱涛
|
578b8f7aaa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-23 09:26:33 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
 reset
|
24a5b0b48d
|
!12 福利档案接口
Merge pull request !12 from reset/archive
|
2022-03-22 11:48:54 +00:00 |
|
Chengliang
|
56036bf9cb
|
福利方案getSearchCondition接口
|
2022-03-22 19:47:46 +08:00 |
|
钱涛
|
2f8b56e4ac
|
参数验证类
|
2022-03-21 20:09:10 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |