sy
|
3abffc2ee9
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 17:24:55 +08:00 |
|
sy
|
28d515b41a
|
薪酬系统-福利台账，补缴导入空值时处理逻辑优化
|
2023-01-12 17:23:26 +08:00 |
 钱涛
|
77dadfab4d
|
账套项目去重
|
2023-01-12 14:09:04 +08:00 |
|
sy
|
0feacffa11
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 13:44:30 +08:00 |
Harryxzy
|
2b3752a554
|
Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01
|
2023-01-12 09:25:06 +08:00 |
|
Harryxzy
|
6460edc013
|
去重
|
2023-01-11 09:47:57 +08:00 |
|
sy
|
97230052b3
|
薪酬系统-福利档案，导入和导出的excel表头添加导入或导出，并且后缀添加tab页标签
|
2023-01-09 17:30:49 +08:00 |
|
Harryxzy
|
fd5048bd2d
|
fixBug
|
2023-01-09 15:20:26 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |
|
钱涛
|
9dac777d5f
|
Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01
# Conflicts:
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2023-01-06 14:41:42 +08:00 |
fcli
|
d1f62e8b49
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-06 09:06:41 +08:00 |
|
fcli
|
d700d7a300
|
Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01
|
2023-01-06 09:06:20 +08:00 |
|
sy
|
b0436236eb
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 17:24:33 +08:00 |
|
sy
|
6c730669c7
|
薪酬系统-福利台账，补缴新增方式二，按照指定核算月获取缴纳基数功能问题修复
|
2023-01-05 17:21:31 +08:00 |
|
钱涛
|
6d3c2ca856
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-05 16:24:51 +08:00 |
|
钱涛
|
dfd8f90df1
|
考勤同步日志控制
|
2023-01-05 16:24:40 +08:00 |
|
sy
|
d807b72ee7
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 16:16:17 +08:00 |
|
sy
|
f1a123dfa4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229
|
2023-01-05 16:12:47 +08:00 |
|
Harryxzy
|
708f1c396a
|
Merge branch 'fix/V3-can'tReCalcBug-0105' into release/2.5.3.2301.01
|
2023-01-05 15:44:21 +08:00 |
|
fcli
|
143de10689
|
Merge remote-tracking branch 'origin/fix/addUpSituationValidation' into release/2.5.3.2301.01
|
2023-01-05 15:42:39 +08:00 |
|
Harryxzy
|
dc08340c73
|
fix个税申报后无法重新核算bug
|
2023-01-05 11:50:01 +08:00 |
|
fcli
|
2d9ce61d5d
|
feat: 往期累计一键清空校验bug修复,分页解密时机修改
|
2023-01-05 09:49:25 +08:00 |
|
fcli
|
eb3c75197b
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:40:43 +08:00 |
|
fcli
|
8e0bf2b693
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:25:07 +08:00 |
|
sy
|
d25fc4a579
|
薪酬系统-福利台账，调差默认配置数据获取逻辑优化
|
2023-01-04 17:41:09 +08:00 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +08:00 |
|
钱涛
|
4a0a18bb07
|
修复考勤引用超出人员范围异常
|
2023-01-03 10:22:42 +08:00 |
|
sy
|
17e6e9d934
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，增加技术字符串判空，增加所属社保类字段
|
2023-01-03 10:09:14 +08:00 |
|
sy
|
19cca7a156
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，优化空数据处理
|
2022-12-30 18:20:10 +08:00 |
|
sy
|
e6e1637119
|
薪酬系统-福利台账，调差新增增加时判断是否已有调差数据的
|
2022-12-29 17:35:58 +08:00 |
|
sy
|
ee72dcd3f0
|
薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化
|
2022-12-29 14:43:54 +08:00 |
|
sy
|
84aeb5059f
|
薪酬系统-福利台账，调差方式3时的福利项
|
2022-12-28 17:01:15 +08:00 |
|
sy
|
2f4d580793
|
薪酬系统-福利台账，调差列表优化，默认配置带出单位缴费数据
|
2022-12-28 11:58:38 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
sy
|
fe5847aed6
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 17:51:30 +08:00 |
|
sy
|
df2ac4754d
|
薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过
|
2022-12-23 17:50:12 +08:00 |
|
sy
|
cea78e6594
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 16:35:33 +08:00 |
|
sy
|
5f4ddeabd4
|
薪酬系统-福利台账，补差数据待编辑数据过滤空值字段
|
2022-12-23 16:34:12 +08:00 |
|
sy
|
d2be8e86ea
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-22 09:09:00 +08:00 |
|
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
钱涛
|
85739933a5
|
单次核算5000
|
2022-12-20 16:45:09 +08:00 |
|
sy
|
e75d0c5872
|
薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项
|
2022-12-20 15:20:42 +08:00 |
|
sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
Harryxzy
|
07292531db
|
重新回算提示
|
2022-12-19 18:03:17 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |