 钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
197506b72b
|
适配if
|
2023-05-08 14:12:33 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
ccec800a75
|
公式升级
|
2023-05-08 11:21:09 +08:00 |
|
钱涛
|
7e940b4db4
|
减少单次核算的人员
|
2023-05-05 17:15:25 +08:00 |
|
钱涛
|
41e95ceadf
|
字段管理不显示id
|
2023-05-05 15:32:55 +08:00 |
|
钱涛
|
aa8f46e84f
|
删除sql，修改签名
|
2023-05-05 14:08:37 +08:00 |
|
钱涛
|
159b5811f6
|
Merge branch 'feature/报表' into release/2.7.4.2304.02
|
2023-05-05 09:26:29 +08:00 |
|
钱涛
|
0f38b6cbaa
|
去除mock校验
|
2023-05-04 19:43:35 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +08:00 |
sy
|
02e0d5a089
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-05-04 16:42:26 +08:00 |
|
sy
|
59b64b48ae
|
薪酬系统-福利档案，编辑保存日期格式校验逻辑优化
|
2023-05-04 16:14:00 +08:00 |
|
钱涛
|
9dc41706b2
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-05-04 14:40:50 +08:00 |
|
钱涛
|
85bf7e0036
|
数据库删除null
|
2023-05-04 14:36:49 +08:00 |
|
钱涛
|
2d609ef49d
|
删除报表
|
2023-05-04 13:57:55 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +08:00 |
|
钱涛
|
790d24b7db
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:38:11 +08:00 |
|
钱涛
|
0aabcd0471
|
将除重新核算的项目外的所有的值都锁定
|
2023-04-28 14:37:59 +08:00 |
|
钱涛
|
0bd16c3f25
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:07:32 +08:00 |
|
钱涛
|
20e4856c23
|
人员全部显示
|
2023-04-28 11:18:01 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
1641b70764
|
权限控制
|
2023-04-27 17:31:43 +08:00 |
|
钱涛
|
c7286fbae4
|
定量-组距式分组、定量-单项式分组
|
2023-04-27 17:18:20 +08:00 |
|
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
|
钱涛
|
1529a30768
|
薪资项目取消过滤档案，使得导入功能一页面为准
|
2023-04-27 09:22:20 +08:00 |
|
钱涛
|
433ce6cf91
|
暂存
|
2023-04-26 16:04:33 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
f47ad2a7a3
|
注释接口
|
2023-04-25 18:04:05 +08:00 |
|
sy
|
6ad8c84a04
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 17:40:05 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
sy
|
cb36dc2904
|
薪酬系统-福利档案，档案编辑功能增加对年月的格式校验
|
2023-04-25 17:38:54 +08:00 |
|
钱涛
|
59c32b24e6
|
补算
|
2023-04-25 17:08:42 +08:00 |
|
钱涛
|
77ce806b37
|
sysadmin不显示申报记录
|
2023-04-25 10:43:40 +08:00 |
|
钱涛
|
a611301651
|
Merge remote-tracking branch 'origin/release/2.7.4.2304.02' into release/2.7.4.2304.02
|
2023-04-25 10:12:01 +08:00 |
|
钱涛
|
c0060ba358
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-25 10:11:40 +08:00 |
|
sy
|
cea8d14c18
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 09:22:03 +08:00 |
|
钱涛
|
17785b3c2b
|
导出报表
|
2023-04-24 18:08:06 +08:00 |
|
钱涛
|
7b4ebd788c
|
导出报表
|
2023-04-24 16:34:23 +08:00 |
|
钱涛
|
8d00e6ad45
|
报表年月
|
2023-04-24 14:57:54 +08:00 |
|
钱涛
|
cef3d26693
|
维护工具
|
2023-04-24 14:55:32 +08:00 |
|
sy
|
1f7c271519
|
薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤
|
2023-04-24 14:47:28 +08:00 |
|
钱涛
|
24dfa57850
|
报表
|
2023-04-24 14:09:27 +08:00 |
|
sy
|
61326928df
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-24 14:07:28 +08:00 |
Harryxzy
|
e2570dc520
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02
|
2023-04-24 11:03:17 +08:00 |
|
sy
|
27969cff80
|
薪酬系统-福利台账，补差导入处理合计值为null的情况
|
2023-04-24 10:11:02 +08:00 |
|
钱涛
|
4034c5cdb0
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-24 09:26:46 +08:00 |
|
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +08:00 |
|
sy
|
c686f52153
|
薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化
|
2023-04-23 18:05:32 +08:00 |
|
钱涛
|
598ff0cf9a
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 18:00:41 +08:00 |
|
钱涛
|
5c936a0334
|
补算
|
2023-04-23 18:00:30 +08:00 |