Commit Graph

2397 Commits

Author SHA1 Message Date
Harryxzy f80bb620dd 返聘action 2023-11-02 14:21:33 +08:00
钱涛 4c11c54973 统一解密位置 2023-10-31 17:16:48 +08:00
钱涛 3d8919da25 账套增加证件号码字段 2023-10-31 15:08:43 +08:00
钱涛 e70a17cd19 捕获社保模块导出异常 2023-10-31 11:21:48 +08:00
钱涛 4bf60c0370 公式负数符号特殊处理 2023-10-31 09:41:02 +08:00
钱涛 2b4ded9dd0 修复合计没有根据自定义字段过滤 2023-10-30 19:19:07 +08:00
钱涛 872ca0a805 恢复档案pageid 2023-10-26 13:45:38 +08:00
钱涛 16f46ae2da 报表人员维度增加部门和工号 2023-10-25 14:33:19 +08:00
钱涛 b08d3bdd2c 修复报表多部门查询 2023-10-25 11:19:47 +08:00
钱涛 adc8bce395 薪资档案改个pageid 2023-10-25 10:14:33 +08:00
钱涛 cf2d2552a2 Merge branch 'feature/假期余额' into release/3.0.0.2311.01 2023-10-24 11:44:01 +08:00
钱涛 bf67fe17fc 年假余额 2023-10-24 11:43:14 +08:00
钱涛 7249c749c0 年假余额 2023-10-24 10:24:10 +08:00
钱涛 05b9a2a57e Merge branch 'feature/公式短路' into release/2.9.6.2310.01 2023-10-20 14:19:54 +08:00
钱涛 35550aa788 假期余额 2023-10-20 13:26:25 +08:00
钱涛 a19f86c624 一键累计bug修复 2023-10-20 10:29:46 +08:00
sy 1db16d6fa6 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复,档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-20 09:51:39 +08:00
sy f8f5ea7782 薪酬系统-福利档案,薪资核算时调用福利核算数据查询时人员ids分片 2023-10-20 09:50:44 +08:00
钱涛 83e16cedf6 一键累计bug修复 2023-10-20 09:43:04 +08:00
钱涛 0dd9040408 一键累计bug修复 2023-10-19 17:35:33 +08:00
钱涛 81b9d65a22 过滤== 2023-10-19 16:26:23 +08:00
钱涛 6bbfc10c34 过滤== 2023-10-19 16:25:30 +08:00
钱涛 3745be2c5c 状态编码 2023-10-19 15:52:52 +08:00
sy d247353530 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复,档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-19 14:31:49 +08:00
sy d0e0195709 薪酬系统-福利档案,导入时档案主表查询时人员ids分片 2023-10-19 14:30:58 +08:00
钱涛 18527f745e 修复自定义核算条件 2023-10-19 14:21:22 +08:00
钱涛 0d5f1ce6c7 Merge branch 'release/2.9.6.2310.01' into feature/公式短路 2023-10-18 17:12:22 +08:00
钱涛 213deb731c 调薪记录bug 2023-10-18 17:01:37 +08:00
钱涛 0ecb3a3977 短路处理 2023-10-18 16:01:37 +08:00
钱涛 dafde8451e 调薪记录bug 2023-10-18 14:20:32 +08:00
sy e68359ef50 Merge branch 'fix/231001-福利台账,导入模板下载接口由get改为post' into release/2.9.6.2310.01 2023-10-18 09:48:19 +08:00
钱涛 5d7a6bc241 调薪记录 2023-10-17 18:04:47 +08:00
Harryxzy a34a5b9aa6 同步义务人人员范围到账套人员范围 2023-10-16 16:59:18 +08:00
钱涛 7e22c9836f 调整原因接口 2023-10-16 15:01:29 +08:00
钱涛 4a59859fa8 调薪记录 2023-10-12 17:34:09 +08:00
Harryxzy f70a7e6c96 Merge branch 'fix/231002_变量返回双引号或0' into release/2.9.6.2310.01 2023-10-12 14:28:10 +08:00
Harryxzy 07c1785714 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-12 14:27:57 +08:00
钱涛 db71ba0e5f fix null 2023-10-12 14:13:25 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
sy 6ae953c723 薪酬系统-福利台账,补缴、补差导入模板下载接口改为post类型 2023-10-12 11:45:21 +08:00
Harryxzy c83539460c 薪酬token 2023-10-11 15:54:08 +08:00
Harryxzy b71633d744 token 2023-10-11 15:28:58 +08:00
Harryxzy 03d3befbdd token 2023-10-11 14:07:23 +08:00
sy 92a7daa9fa 薪酬系统-福利台账,正常缴纳导入模板下载接口改为post类型 2023-10-10 16:17:44 +08:00
钱涛 e570c1879e 账套保存异常 2023-10-09 15:35:20 +08:00
Harryxzy e25ea296e8 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:34:32 +08:00
Harryxzy 2766ceb276 自动同步考勤定时任务 2023-10-09 14:34:18 +08:00
钱涛 61b80e3ad1 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:17:25 +08:00
钱涛 39520346dc 解密 2023-10-09 14:17:15 +08:00
Harryxzy d69aa46e33 自动同步考勤定时任务 2023-10-09 14:10:09 +08:00