Harryxzy
|
4e04b6e268
|
薪资核算导入，选择表单字段获取未分类
|
2023-06-01 10:30:33 +08:00 |
|
Harryxzy
|
0ec6e740d3
|
Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01
|
2023-05-29 16:48:18 +08:00 |
|
Harryxzy
|
a2f4653411
|
当薪资档案列表为0时，由于查询了全量数据，导致速度慢
|
2023-05-29 16:17:13 +08:00 |
|
Harryxzy
|
7e841f6fd3
|
修复回算工资单合计列
|
2023-05-26 15:13:56 +08:00 |
 钱涛
|
fef828ef1d
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 11:17:25 +08:00 |
|
Harryxzy
|
b26e6069ad
|
Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01
|
2023-05-25 17:11:58 +08:00 |
|
Harryxzy
|
25ffd06dd4
|
修复编辑薪资核算没有未分类
|
2023-05-25 17:06:03 +08:00 |
|
钱涛
|
74c4305b9d
|
优化核算异常提示
|
2023-05-23 15:15:55 +08:00 |
|
Harryxzy
|
a916e061d8
|
Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02
|
2023-05-22 14:03:22 +08:00 |
|
Harryxzy
|
c7bdbe7b85
|
Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-05-22 14:03:07 +08:00 |
|
Harryxzy
|
20262169c9
|
Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02
|
2023-05-22 14:02:28 +08:00 |
|
Harryxzy
|
ebf966517b
|
修复保存日志获取不到id
|
2023-05-18 14:28:31 +08:00 |
|
钱涛
|
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 |
|
Harryxzy
|
72f2ca4439
|
修复核算编辑保存
|
2023-05-17 14:49:53 +08:00 |
|
钱涛
|
8ad88b1e97
|
我的工资接口修改
|
2023-05-17 14:10:12 +08:00 |
|
钱涛
|
a7cc99fdd3
|
公式异常信息
|
2023-05-16 18:01:38 +08:00 |
|
Harryxzy
|
083916eb0c
|
薪资核算编辑 带上公式
|
2023-05-16 15:41:11 +08:00 |
|
Harryxzy
|
a3ee91db15
|
回算后不允许删除薪资核算记录
|
2023-05-16 15:05:02 +08:00 |
|
Harryxzy
|
7c74149184
|
薪资核算导入 选择字段根据分类分组
|
2023-05-15 18:02:22 +08:00 |
|
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +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 |
|
Harryxzy
|
b0084cad9c
|
薪资核算编辑 手动编辑后自动锁定
|
2023-05-11 14:40:10 +08:00 |
|
Harryxzy
|
54ca46c653
|
薪资核算导入项自动锁定
|
2023-05-11 10:51:43 +08:00 |
|
钱涛
|
53f2c1ebb6
|
修复提示行号
|
2023-05-11 10:21:21 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
sy
|
bbba7f314d
|
薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整
|
2023-05-08 17:58:17 +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 |
|
钱涛
|
7e940b4db4
|
减少单次核算的人员
|
2023-05-05 17:15:25 +08:00 |
|
钱涛
|
0f38b6cbaa
|
去除mock校验
|
2023-05-04 19:43:35 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +08:00 |
|
钱涛
|
9dc41706b2
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-05-04 14:40:50 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +08:00 |
|
Harryxzy
|
0d6355ca4a
|
修复回算工资单的合计列
|
2023-04-28 16:04:52 +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 |
|
钱涛
|
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 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +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 |
|
sy
|
1f7c271519
|
薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤
|
2023-04-24 14:47:28 +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 |
|
sy
|
c686f52153
|
薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化
|
2023-04-23 18:05:32 +08:00 |
|
sy
|
37310f02f6
|
薪酬系统-福利台账，补差导入相关合计项计算逻辑优化
|
2023-04-23 16:35:52 +08:00 |
|
sy
|
c9a5228f3e
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-23 13:36:28 +08:00 |