Commit Graph

3010 Commits

Author SHA1 Message Date
钱涛 0634a139b9 显示字符统计规则 2023-11-02 18:41:58 +08:00
Harryxzy f85f0af44a 下载核算导入模板,直接从缓存拿选的字段 2023-11-02 16:39:58 +08:00
Harryxzy 5d2218b8f0 返聘action 2023-11-02 16:22:24 +08:00
钱涛 83f38d1d74 显示字符统计规则 2023-11-02 14:43:15 +08:00
Harryxzy f80bb620dd 返聘action 2023-11-02 14:21:33 +08:00
钱涛 8f333c4ad4 优化核算校验日期提示 2023-11-01 16:44:37 +08:00
钱涛 22a946d9ad 报表支持文本 2023-11-01 16:09:19 +08:00
钱涛 7fa3c31aac 报表支持文本 2023-11-01 09:54:09 +08:00
钱涛 b050888b7b Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-10-31 17:19:09 +08:00
钱涛 4c11c54973 统一解密位置 2023-10-31 17:16:48 +08:00
钱涛 0c77031e46 报表功能暂存 2023-10-31 17:08:28 +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
钱涛 49f949b673 Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-10-30 10:34:33 +08:00
钱涛 321a565c35 fix个税sql错误 2023-10-26 14:40:56 +08:00
钱涛 872ca0a805 恢复档案pageid 2023-10-26 13:45:38 +08:00
sy da04a951d2 薪酬系统-福利档案,福利档案基数调整记录列表排序优化 2023-10-26 10:00:14 +08:00
sy 267cced46b 薪酬系统-福利档案,福利档案基数调整记录列表功能优化,可展示非系统人员姓名 2023-10-25 19:14:02 +08:00
钱涛 16f46ae2da 报表人员维度增加部门和工号 2023-10-25 14:33:19 +08:00
钱涛 b08d3bdd2c 修复报表多部门查询 2023-10-25 11:19:47 +08:00
sy dba2f48785 薪酬系统-福利档案,福利档案基数调整记录生成逻辑优化,过滤空值变更 2023-10-25 11:18:10 +08:00
钱涛 adc8bce395 薪资档案改个pageid 2023-10-25 10:14:33 +08:00
sy 5b2609d93f 薪酬系统-福利档案,福利档案基数调整记录表新建sql脚本 2023-10-25 09:49:16 +08:00
钱涛 61c72a2587 Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-10-24 17:33:49 +08:00
sy 05b2c1868b Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01 2023-10-24 14:11:22 +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
sy 1c0b00d163 薪酬系统-福利档案,福利档案基数调整记录列表查询入参调整 2023-10-23 18:07:37 +08:00
钱涛 fe4e138317 个税调差累计字段对应 2023-10-23 14:44:26 +08:00
钱涛 026fa54a0e Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-23 10:07:24 +08:00
钱涛 328158204d 个税调差累计字段对应 2023-10-23 10:03:04 +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
钱涛 1f5edd039a Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-20 10:56:07 +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
钱涛 e19f00c44d Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-20 09:43:24 +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