Commit Graph

1014 Commits

Author SHA1 Message Date
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
Harryxzy 8d057e2706 Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01 2024-08-01 10:53:29 +08:00
Harryxzy 8bbf8f3ff6 核算时编辑职称bug 2024-08-01 10:52:44 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
Harryxzy c1c8bae9da Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 10:37:51 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
2024-06-26 10:35:05 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-06-21 14:17:36 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
钱涛 0961071980 Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
2024-06-19 11:23:43 +08:00
钱涛 f0fce26e8a Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
2024-06-19 11:14:31 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
Harryxzy 216c4cee84 默认值temp 2024-06-17 17:58:01 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
钱涛 1983ba968c 去除日志
系统薪资项目配置不需要重启
2024-06-12 15:35:40 +08:00
钱涛 853482141f 小数位支持10位 2024-06-12 10:45:32 +08:00
钱涛 f073f6d90c 处理刷新非正常人员问题 2024-06-11 15:48:07 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 9aa2a03425 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 14:41:45 +08:00
钱涛 9e8e7f1f09 删除隐藏 2024-05-30 14:41:28 +08:00
钱涛 7952e93d01 考勤引用显示证件号码 2024-05-29 16:53:51 +08:00
钱涛 63851a1fe7 社保福利通过证件号码导入 2024-05-29 15:32:19 +08:00
钱涛 238438897b 处理工资单证件号码不显示 2024-05-29 14:04:16 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 bc5735135c Merge branch 'feature/身份证导入' into release/2.14.3.2406.01 2024-05-28 11:28:18 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
Harryxzy bf50976849 Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02 2024-05-23 10:58:30 +08:00
钱涛 1b3da7dfc0 身份证 2024-05-23 09:16:28 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00