 钱涛
|
258c880543
|
申报表字段缺失
|
2023-02-03 15:14:04 +08:00 |
sy
|
9a4b58b2ee
|
薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-03 13:38:12 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |
|
钱涛
|
abdd85effd
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-02 16:12:41 +08:00 |
fcli
|
003dfe0d35
|
feat: 请求方式修改
|
2023-02-02 15:47:17 +08:00 |
|
sy
|
2e7ea046f2
|
薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-02 14:47:39 +08:00 |
|
钱涛
|
810cfe7f5e
|
考勤引用本身报表
|
2023-02-01 14:03:13 +08:00 |
|
fcli
|
3f145e133b
|
feat: 添加是否补发参数
|
2023-02-01 13:39:14 +08:00 |
|
fcli
|
5851ea20be
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 13:10:05 +08:00 |
|
fcli
|
78f8630465
|
feat: 薪资账套项目列表分权
|
2023-02-01 11:23:43 +08:00 |
|
fcli
|
dec7c89856
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 11:22:38 +08:00 |
|
钱涛
|
f76ac415ba
|
修复年终奖备注字符不对应
|
2023-02-01 10:05:02 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
Harryxzy
|
ced891c3c0
|
薪资账套-人员范围导入（下载模板BUG）
|
2023-01-31 09:41:14 +08:00 |
|
钱涛
|
857c39bd2d
|
年终奖
|
2023-01-30 17:32:58 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
sy
|
63ae86978f
|
薪酬系统-福利档案，导出excel文件名添加日期信息
|
2023-01-30 09:31:31 +08:00 |
|
钱涛
|
d881b63327
|
年终奖
|
2023-01-29 14:58:51 +08:00 |
|
fcli
|
80019a029c
|
feat: 获取部分字段
|
2023-01-28 13:56:02 +08:00 |
|
Harryxzy
|
5bdb3ca0fe
|
Merge branch 'fix/setSendStatusBUG' into release/2.6.1.2301.02
|
2023-01-18 10:20:19 +08:00 |
|
钱涛
|
570065330b
|
修复考勤导入异常
|
2023-01-18 10:02:23 +08:00 |
|
fcli
|
bd2597541d
|
feat: 字段管理
|
2023-01-18 09:38:43 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
sy
|
57753bfb4a
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 18:32:11 +08:00 |
|
sy
|
3ed6c43a93
|
薪酬系统-福利台账，补缴原方式新增时，未设置基数情况下的逻辑优化
|
2023-01-12 18:31:36 +08:00 |
|
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 |
|
钱涛
|
2a52671451
|
支持钉钉打开工资单
|
2023-01-12 15:47:20 +08:00 |
|
fcli
|
24e0e180be
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:20:09 +08:00 |
|
fcli
|
5aff04c834
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:54 +08:00 |
|
fcli
|
3ec5c34589
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:50 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
4bcd355254
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:19:43 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +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
|
197dbd8c8a
|
薪酬系统-福利档案，导入模板下载功能入参调整
|
2023-01-10 15:42:24 +08:00 |
|
sy
|
884da3dfb3
|
薪酬系统-福利档案，导入模板下载接口优化
|
2023-01-09 17:51:54 +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 |
|
sy
|
b33771d9e4
|
薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段
|
2023-01-09 14:49:58 +08:00 |
|
钱涛
|
830304fabb
|
系统配置
|
2023-01-09 14:41:10 +08:00 |
|
Harryxzy
|
c47d3f4ade
|
下载模板改为get请求
|
2023-01-09 10:30:26 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |