Commit Graph

1428 Commits

Author SHA1 Message Date
fcli ad3f7595bd feat: 空指针处理 2022-12-14 13:51:01 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
fcli 1c6acb497c feat: 加密统一,累计附加扣除详细 2022-12-13 10:49:51 +08:00
fcli eabc983100 feat: 加密统一,社保福利档案&薪资核算结果 2022-12-13 10:15:31 +08:00
fcli 1431308cc5 feat: 加密统一,薪资核算结果 2022-12-12 16:42:44 +08:00
fcli 93db32b758 feat: 加密统一,累计附加扣除&社保福利模块 2022-12-12 15:40:01 +08:00
钱涛 5e893160b4 加密方法 2022-12-12 10:36:06 +08:00
钱涛 8dc2ddc3c8 加密方法 2022-12-12 09:37:15 +08:00
钱涛 389022e0ea 配置文件 2022-12-09 10:12:25 +08:00
钱涛 77d3046966 所有个税扣缴义务人的树形 2022-12-08 17:48:46 +08:00
钱涛 30e8fd3733 流程中个税扣缴义务人已处理 2022-12-08 16:48:37 +08:00
fcli 8e2e85a986 Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01 2022-12-08 16:43:06 +08:00
fcli cc105ca051 Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01 2022-12-08 16:41:04 +08:00
fcli 269bfeee18 feat: 查询列表加快 2022-12-08 16:39:57 +08:00
fcli 89574f278b feat: 查询列表加快 2022-12-08 16:31:16 +08:00
sy 0399731b9b Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01 2022-12-08 16:25:28 +08:00
fcli fcca6950ac feat: 修复bug 2022-12-08 15:45:15 +08:00
钱涛 2c1421999b Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01 2022-12-08 11:32:03 +08:00
钱涛 ea20dfb9ff fix调薪action 2022-12-08 10:53:51 +08:00
钱涛 399563088d 流程生成人员范围 2022-12-08 10:49:51 +08:00
sy 979bb82661 薪酬系统-福利台账,调差数据保存时,增加新数据id信息的返回 2022-12-08 10:18:27 +08:00
sy c94e28e68c 薪酬系统-福利台账,核算功能相关临时表数据删除逻辑优化 2022-12-08 10:10:48 +08:00
钱涛 fb39dbe0c4 流程生成人员范围 2022-12-07 20:16:14 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
钱涛 5079753c34 sql测试 2022-12-07 16:19:22 +08:00
钱涛 f20cecf042 sql测试 2022-12-07 16:17:29 +08:00
钱涛 cdb7f3a0a2 sql测试 2022-12-07 15:47:35 +08:00
钱涛 1e03eca738 单独调薪检查action 2022-12-07 09:17:31 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
sy 70a5854dc7 薪酬系统-福利台账,调差数据保存时,增加公司费用数值字段的校验 2022-12-06 15:40:40 +08:00
钱涛 11d1ee1a21 批量调薪action 2022-12-06 10:26:36 +08:00
钱涛 2f8f5f299e 批量调薪action 2022-12-06 09:52:55 +08:00
钱涛 5b1615675d 批量调薪action 2022-12-06 09:41:26 +08:00
fcli 2877d58a1f feat: sqlserver bug修复 2022-12-05 17:51:28 +08:00
sy bea06f1d88 薪酬系统-福利台账,可调差人员列表功能返回格式增加target字段 2022-12-05 16:56:05 +08:00
fcli acab57aa36 feat: 撤回范围修复 2022-12-05 16:05:38 +08:00
钱涛 23dd15a568 批量调薪action 2022-12-05 16:01:08 +08:00
sy a04f4a915f 薪酬系统-福利台账,可调差人员列表功能取消分页逻辑 2022-12-05 15:42:49 +08:00
fcli ff7b1047bc feat: 发放异常拦截 2022-12-05 14:06:22 +08:00
Harryxzy fa6e41d62e Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01 2022-12-05 10:43:09 +08:00
Harryxzy 1b570fe1aa 放开管理员限制 2022-12-05 10:34:25 +08:00
Harryxzy 012d8dfb07 社保福利流程,放开个税扣缴义务人限制 2022-12-05 10:13:16 +08:00
sy 014190f6d0 薪酬系统-福利台账,补缴列表查询优化,增加缴纳状态筛选 2022-12-05 10:09:43 +08:00
Harryxzy 6fe28ec41c 定薪流程,放开个税扣缴义务人限制 2022-12-05 09:57:27 +08:00
fcli 4fa64c6a8f feat: mapper异常修复 2022-12-05 09:52:05 +08:00
sy 33aa8ea507 薪酬系统-福利档案,档案数据通过导入excel入库前,根据人员id和个税扣缴义务人进行去重 2022-12-02 17:57:09 +08:00
sy 22a7258229 薪酬系统-福利台账,福利核算添加核算进度查询逻辑 2022-12-02 17:08:35 +08:00
钱涛 991338a10e 合计行异步处理 2022-12-02 16:58:19 +08:00
fcli c7b3341a13 feat: 查询异常问题修改 2022-12-01 17:41:10 +08:00
钱涛 013f67469e 显示定制列的入职日期和离职日期 2022-12-01 14:33:21 +08:00