 钱涛
|
ff8dcf1769
|
核算异常信息
|
2023-05-17 17:38:12 +08:00 |
|
钱涛
|
404db31695
|
薪资项目系统项目排序靠后
|
2023-05-17 16:57:37 +08:00 |
|
钱涛
|
1534b0257d
|
Merge branch 'feature/公式v2' into release/2.8.2.2305.02
|
2023-05-17 15:08:16 +08:00 |
|
钱涛
|
7ccf8cf607
|
字段管理不显示默认使用列
|
2023-05-17 14:59:12 +08:00 |
|
钱涛
|
df07a8c9d1
|
Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02
|
2023-05-17 14:10:25 +08:00 |
|
钱涛
|
8ad88b1e97
|
我的工资接口修改
|
2023-05-17 14:10:12 +08:00 |
|
钱涛
|
a7cc99fdd3
|
公式异常信息
|
2023-05-16 18:01:38 +08:00 |
sy
|
e28ca6a2d0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据v2
|
2023-05-15 14:45:06 +08:00 |
|
sy
|
cf6b35f6a0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据
|
2023-05-15 13:58:06 +08:00 |
|
钱涛
|
fb271f435a
|
公式方法改造
|
2023-05-15 10:00:59 +08:00 |
|
钱涛
|
d0e5a3a643
|
Merge branch 'feature/报表v2' into release/2.8.2.2305.02
|
2023-05-15 09:29:00 +08:00 |
|
钱涛
|
d51c89bb82
|
公式方法改造
|
2023-05-15 09:28:22 +08:00 |
|
钱涛
|
f848b74f28
|
薪酬流程日志
|
2023-05-12 11:51:42 +08:00 |
|
钱涛
|
eaaf6359af
|
Merge branch 'feature/公式' into release/2.8.2.2305.02
|
2023-05-12 09:16:54 +08:00 |
|
钱涛
|
53f2c1ebb6
|
修复提示行号
|
2023-05-11 10:21:21 +08:00 |
Harryxzy
|
d08a329000
|
Merge branch 'feature/维护工具' into release/2.8.2.2305.02
|
2023-05-11 10:09:10 +08:00 |
|
钱涛
|
6ec0b53fe5
|
默认档案起始发薪是入职时间
|
2023-05-11 10:00:21 +08:00 |
|
钱涛
|
3840f26464
|
公式异常处理
|
2023-05-10 18:55:23 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
|
钱涛
|
ecd037424b
|
去除异常分页
|
2023-05-09 14:28:46 +08:00 |
|
钱涛
|
797d5095eb
|
适配if
|
2023-05-09 10:43:51 +08:00 |
|
sy
|
bbba7f314d
|
薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整
|
2023-05-08 17:58:17 +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 |