 钱涛
|
187e60ec15
|
薪资项目分权
|
2023-02-21 16:39:17 +08:00 |
|
钱涛
|
8e31cec138
|
Merge branch 'feature/公式改造' into release/2.6.2.2302.02
|
2023-02-21 14:48:43 +08:00 |
|
钱涛
|
eee39ae972
|
jar引用变更
|
2023-02-21 14:33:15 +08:00 |
|
钱涛
|
84e63d4d40
|
加密日志
|
2023-02-21 13:58:30 +08:00 |
|
钱涛
|
4f22df09f0
|
支持6位小数
|
2023-02-20 14:40:18 +08:00 |
|
钱涛
|
73dcd3a53a
|
fix账套删除人员信息字段
|
2023-02-20 11:54:44 +08:00 |
|
钱涛
|
77cff0ba24
|
档案字段被公式引用不允许删除
|
2023-02-17 18:03:46 +08:00 |
|
钱涛
|
bccdd07ba0
|
修改名称对应修改公式
|
2023-02-17 17:52:29 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
钱涛
|
b57bdcc7eb
|
接口报错时打印参数
|
2023-02-16 10:47:30 +08:00 |
|
钱涛
|
91bd28d21a
|
清除公式
|
2023-02-16 10:44:13 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
53c767b239
|
还原脚本
|
2023-02-15 17:36:29 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +08:00 |
|
钱涛
|
4f0dc060ee
|
Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02
|
2023-02-14 16:00:05 +08:00 |
|
钱涛
|
1c93dab9f0
|
获取人员档案
|
2023-02-14 15:41:03 +08:00 |
|
钱涛
|
0337db02df
|
Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02
|
2023-02-14 15:37:17 +08:00 |
|
钱涛
|
dee7c11eda
|
修复账套新增异常
|
2023-02-14 10:53:58 +08:00 |
|
钱涛
|
44819a0903
|
工资单后台校验
|
2023-02-13 17:25:13 +08:00 |
|
钱涛
|
2748f04d0a
|
档案为空不生效
|
2023-02-13 17:23:05 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
钱涛
|
78cb59f07f
|
暂存
|
2023-02-13 13:27:44 +08:00 |
|
钱涛
|
602051e1ed
|
Merge branch 'release/2.6.1.2301.02' into release/2.6.2.2302.02
|
2023-02-13 11:02:00 +08:00 |
|
钱涛
|
49894ad6a2
|
修复申报表总数
|
2023-02-13 10:59:09 +08:00 |
|
钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |
|
钱涛
|
d1b4ae4a0b
|
过滤
|
2023-02-10 16:38:43 +08:00 |
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
Harryxzy
|
510a2e7d29
|
处理工资单发放历史数据执行时间提前
|
2023-02-09 19:43:43 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +08:00 |
|
钱涛
|
4186526743
|
Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02
|
2023-02-09 19:04:02 +08:00 |
|
钱涛
|
0f9222e1e4
|
fix年终奖申报备注为0
|
2023-02-09 19:03:53 +08:00 |
fcli
|
5b50903b55
|
Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 18:48:35 +08:00 |
|
fcli
|
e99abfddcd
|
feat: 保存更新判断薪资档案引用
|
2023-02-09 18:47:48 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
995689bb1d
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-09 17:31:42 +08:00 |
|
钱涛
|
5feed81803
|
Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02
|
2023-02-09 17:31:34 +08:00 |
sy
|
ba267d9dce
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02
|
2023-02-09 17:24:29 +08:00 |
|
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
fcli
|
5ee8097b3e
|
Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02
|
2023-02-09 17:22:53 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
fcli
|
fdf343dbbd
|
fix: 字段管理可以切换薪资引用
|
2023-02-09 11:08:03 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
sy
|
390d2d7851
|
薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空
|
2023-02-08 14:50:45 +08:00 |
|
sy
|
5657d5cc64
|
薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份
|
2023-02-08 13:04:23 +08:00 |