MustangDeng
|
5534a4689a
|
Merge branch 'feature/djp' into develop
|
2022-04-01 15:06:45 +08:00 |
|
MustangDeng
|
3631a67ebf
|
福利方案列表公司,个人 显示
|
2022-04-01 15:06:14 +08:00 |
 钱涛
|
77229d18a0
|
列表
|
2022-04-01 14:13:04 +08:00 |
|
钱涛
|
63e414e5d7
|
Merge branch 'develop' into feature/qt
# Conflicts:
# src/com/engine/salary/enums/UserStatusEnum.java
|
2022-04-01 13:54:27 +08:00 |
|
钱涛
|
f95d8a7d0d
|
暂存
|
2022-04-01 13:50:24 +08:00 |
|
钱涛
|
036b6fea96
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-01 10:26:55 +08:00 |
|
钱涛
|
c03078cb12
|
Merge branch 'feature/qt' into develop
|
2022-04-01 10:26:44 +08:00 |
|
钱涛
|
8326f3ae6f
|
导入参数
|
2022-04-01 10:26:28 +08:00 |
|
MustangDeng
|
266745c241
|
Merge branch 'feature/djp' into develop
|
2022-04-01 09:21:19 +08:00 |
|
MustangDeng
|
e5100c8f44
|
福利方案列表
|
2022-04-01 09:20:44 +08:00 |
|
钱涛
|
e8de53d51f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-31 18:42:23 +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 |
|
MustangDeng
|
13b69c76eb
|
档案列表快捷搜索
|
2022-03-31 14:22:42 +08:00 |
|
MustangDeng
|
b10c09f0c4
|
档案列表列表问题
|
2022-03-31 13:41:40 +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 |
|
钱涛
|
fbfb5f5005
|
Merge branch 'feature/qt' into develop
|
2022-03-30 18:01:07 +08:00 |
|
钱涛
|
922a055f97
|
统一sql
|
2022-03-30 18:00:56 +08:00 |
|
钱涛
|
b573118641
|
Merge branch 'feature/qt' into develop
|
2022-03-30 15:58:40 +08:00 |
|
钱涛
|
d6ed96e891
|
sql修改
|
2022-03-30 15:58:29 +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 |
|
钱涛
|
dc6ebdb4df
|
Merge branch 'feature/qt' into develop
|
2022-03-28 13:48:55 +08:00 |
|
钱涛
|
93154ada71
|
薪资账套项目保存
|
2022-03-28 13:48:43 +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 |
|
钱涛
|
00c0fe477e
|
税率
|
2022-03-28 10:49:23 +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 |
|
钱涛
|
cc233e82a5
|
Merge branch 'feature/qt' into develop
|
2022-03-25 10:46:05 +08:00 |
|
钱涛
|
24c50f7f17
|
名称模糊查询
|
2022-03-25 10:45:53 +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 |
|
钱涛
|
48f1497f96
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-24 17:00:19 +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 |
 reset
|
8df72164cc
|
!13 福利方案高级搜索接口
Merge pull request !13 from reset/archive
|
2022-03-23 13:07:37 +00:00 |
|
Chengliang
|
d82e3e9e6f
|
福利方按高级搜索接口
|
2022-03-23 21:05:01 +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 |
|
reset
|
0789b1c7a9
|
!11 福利档案getSearchCondition接口
Merge pull request !11 from reset/archive
|
2022-03-22 11:46:35 +00:00 |
|
Chengliang
|
b0982f7d7f
|
福利台账getSearch接口
|
2022-03-22 19:44:35 +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 |
|
钱涛
|
f8d68fa7bc
|
分页
|
2022-03-21 09:33:21 +08: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 |
|
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 |
|
Chengliang
|
67fe45cd2a
|
bug修复
|
2022-03-15 09:56:56 +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 |
|
钱涛
|
4e9d103021
|
fix bug
|
2022-03-12 14:20:39 +08:00 |
|
钱涛
|
3abcf90ee2
|
连表查询
|
2022-03-12 13:21:27 +08:00 |
|
钱涛
|
3a09014291
|
bug
|
2022-03-11 19:00:58 +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 |
|
钱涛
|
5c1adf9774
|
Merge branch 'feature/qt' into develop
|
2022-03-11 17:27:34 +08:00 |
|
钱涛
|
298d432152
|
预览
|
2022-03-11 17:27:15 +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 |
|
钱涛
|
07979a5c00
|
Merge branch 'feature/qt' into develop
|
2022-03-11 16:29:47 +08:00 |
|
钱涛
|
cae1b1062e
|
申报月份
|
2022-03-11 16:28:37 +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 |
|
钱涛
|
9c8238d218
|
Merge branch 'feature/qt' into develop
|
2022-03-11 15:47:35 +08:00 |
|
钱涛
|
692a57ae63
|
累计bug
|
2022-03-11 15:47:08 +08:00 |
|
钱涛
|
1a7478ff57
|
Merge branch 'feature/qt' into develop
|
2022-03-11 15:15:14 +08:00 |
|
钱涛
|
822f9d4289
|
删除本地代码
|
2022-03-11 15:14:32 +08:00 |
|
Chengliang
|
c4e63e101b
|
表增加自增
|
2022-03-11 14:33:35 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
3f32fa98d6
|
累计实体错误
|
2022-03-11 10:18:30 +08:00 |
|
钱涛
|
934e9b1729
|
Merge branch 'feature/qt' into develop
|
2022-03-11 10:06:47 +08:00 |
|
钱涛
|
92fc902fba
|
明细表加checkbox
|
2022-03-11 10:06:13 +08:00 |
|
钱涛
|
628253ed0c
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/init.sql
|
2022-03-10 19:02:28 +08:00 |
|
钱涛
|
882665ff09
|
明细表加checkbox
|
2022-03-10 19:01:58 +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
|
0957528179
|
更新自定义福利状态接口
|
2022-03-10 15:26:09 +08:00 |
|
Chengliang
|
04cf94e498
|
自定义福利接口 getCustomCategoryForm createSICategory....
|
2022-03-10 15:23:56 +08:00 |
|
钱涛
|
784f58533a
|
导出明细
|
2022-03-10 11:12:13 +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 |
|
Chengliang
|
927b25908e
|
solve conflict
|
2022-03-09 17:02:36 +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 |
|
Chengliang
|
a090937930
|
solove conflict
|
2022-03-09 10:00:51 +08:00 |
|
Chengliang
|
da98b66700
|
rebase
|
2022-03-09 09:58:39 +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 |
|
钱涛
|
0e3412ad44
|
列表checkbox
|
2022-03-08 18:14:20 +08:00 |
|
钱涛
|
e860b30567
|
累计附加接口
|
2022-03-08 18:10:03 +08:00 |
|
钱涛
|
a190dc439d
|
日期转换
|
2022-03-08 16:35:05 +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 |
|
钱涛
|
daee5b4c35
|
添加泛型
|
2022-03-07 19:34:02 +08:00 |
|
钱涛
|
382781fa26
|
列表注解
|
2022-03-07 19:27:32 +08:00 |
|
钱涛
|
0759628eb2
|
excel导入导出
|
2022-03-07 15:08:56 +08:00 |
|
钱涛
|
97cc5d154f
|
累计附加扣除-条件接口
|
2022-03-04 10:10:38 +08:00 |
|
钱涛
|
b028ad6845
|
税率修改接口bug
|
2022-03-03 14:52:50 +08:00 |
|
钱涛
|
c183a11cba
|
统一税率保存参数
|
2022-03-03 13:50:03 +08:00 |
|
钱涛
|
aa528eccd8
|
sql异常
|
2022-03-02 14:07:18 +08:00 |
|
MustangDeng
|
2bef264ce1
|
Merge branch 'master' of https://gitee.com/qlmr/weaver-hrm-salary
|
2022-03-02 11:12:41 +08:00 |
|
MustangDeng
|
d83d945c19
|
列表转化和选择框权限
|
2022-03-02 11:12:22 +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 |
|
MustangDeng
|
a41d76d0ab
|
Merge branch 'master' of https://gitee.com/qlmr/weaver-hrm-salary
|
2022-03-01 17:24:24 +08:00 |
|
MustangDeng
|
ee93ab4b35
|
编辑删除按钮
|
2022-03-01 17:23:42 +08:00 |
|
钱涛
|
8922047306
|
税率接口及相关基础类
|
2022-03-01 16:45:57 +08:00 |
|
钱涛
|
7dc77d0dab
|
sql拼接异常
|
2022-03-01 15:00:09 +08:00 |
|
钱涛
|
363325b3af
|
软删除bug
|
2022-03-01 14:13:02 +08:00 |
|
钱涛
|
fb56c4d379
|
Merge remote-tracking branch 'origin/master'
|
2022-03-01 13:45:19 +08:00 |
|
钱涛
|
51b42bb726
|
sql bug
|
2022-03-01 13:45:01 +08:00 |
|
钱涛
|
1519c0a79c
|
mysql查询语句拼接
|
2022-03-01 13:44:38 +08:00 |
|
MustangDeng
|
9685f03db4
|
删除demoController相关接口
|
2022-03-01 11:13:17 +08:00 |
|
钱涛
|
8876390719
|
前端名称对应
|
2022-03-01 10:28:40 +08:00 |
|
钱涛
|
f591c09dc9
|
个税扣缴义务人相关接口（6）
|
2022-02-28 17:19:07 +08:00 |
|
钱涛
|
a35259c1ef
|
异常处理框架
|
2022-02-28 11:12:55 +08:00 |
|
钱涛
|
b4a60e00da
|
修复mybatis版本不支持locadatatime的bug
|
2022-02-25 20:00:00 +08:00 |
|
钱涛
|
4a081d6ad9
|
初始化项目结构、demo样例、mybatis使用样例
|
2022-02-25 19:41:22 +08:00 |