qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,838 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

2708 Commits

Author SHA1 Message Date
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
Harryxzy 0f8b16d473 Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01 2024-03-15 09:19:17 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
Harryxzy d28321bcad Merge branch 'fix/240302_加密解密社保福利错误' into release/3.0.0.2403.01 
# Conflicts:
#	src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
 2024-03-15 09:18:57 +08:00
Harryxzy ea2a8540ef Merge branch 'fix/240301-加解密开关后社保台账线下对比bug' into release/3.0.0.2403.01 2024-03-15 09:18:30 +08:00
钱涛 0a7334ddef 考勤导入，多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
Harryxzy 0c42e1cb35 同步社保、薪资档案起始发薪日为入职日定时任务 2024-03-14 14:05:36 +08:00
钱涛 a70a2061a5 部门改多选 2024-03-14 11:19:02 +08:00
Harryxzy 8543d70a66 社保加解密 2024-03-14 11:07:01 +08:00
钱涛 f23b23cd92 优化IF解释 2024-03-14 10:25:39 +08:00
Harryxzy 26a3199b1e 社保线下对比加解密 2024-03-13 17:58:24 +08:00
Harryxzy dca445810d Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into fix/240302_加密解密社保福利错误 2024-03-12 18:31:30 +08:00
Harryxzy 43c57cb10b 阅后即焚功能 2024-03-12 16:17:24 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
Harryxzy af57e8ecf4 Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01 2024-03-12 14:58:21 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy 83624be06e Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01 2024-03-12 14:26:42 +08:00
Harryxzy a44d42e9d2 修复加密解密：社保档案、社保台账加解密失败问题 2024-03-12 11:27:13 +08:00
Harryxzy afb4bfd7ad 修复bug： 
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
 2024-03-11 17:23:20 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
Harryxzy 0f82b8ce10 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-07 14:23:46 +08:00
Harryxzy 17428c621e 非系统人员范围操作日志 2024-03-07 14:23:12 +08:00
钱涛 729c6c7d3a 处理空指针 2024-03-07 14:12:16 +08:00
钱涛 3b1edddf00 优化薪资账套项目保存逻辑 2024-03-07 10:21:06 +08:00
钱涛 e187ee57e0 获取所有账套列表接口 2024-03-07 09:52:21 +08:00
钱涛 78c1d6f51c 项目日志字段解释 2024-03-06 15:20:21 +08:00
Harryxzy 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-03-06 13:50:56 +08:00
Harryxzy 0ac291d83d Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-06 09:23:21 +08:00
Harryxzy 8984369343 薪资档案、社保档案查看日志 2024-03-05 15:15:20 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
钱涛 2fc387cc40 账套条件 2024-03-05 13:44:34 +08:00
Harryxzy 3f76b5bbbf 非系统人员管理日志 2024-03-04 16:12:30 +08:00
Harryxzy 8c6c6a4966 社保福利台账，非系统人员导入报错 2024-03-04 14:30:25 +08:00
钱涛 c081581ba7 Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01 2024-03-04 14:01:33 +08:00
钱涛 f325674673 Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件 2024-03-04 09:41:35 +08:00
Harryxzy 28f7c57e12 社保福利台账导入，表单字段缓存 2024-03-04 09:18:00 +08:00
Harryxzy 5485f7d260 社保福利台账导入，表单字段缓存 2024-03-01 17:40:19 +08:00
钱涛 34f6b76fb1 修复核算数据为null 2024-03-01 16:55:40 +08:00
钱涛 8ae06f27b8 fix导入性能，导入方法类型改完外层引用 2024-02-29 15:53:22 +08:00
Harryxzy efa556ddd9 操作日志修复 2024-02-29 11:31:18 +08:00
Harryxzy 89787332e3 操作日志修复 2024-02-28 18:03:55 +08:00
Harryxzy 066222400b 操作日志修复 2024-02-28 16:44:52 +08:00
Harryxzy adff178a7c 义务人日志优化 2024-02-28 15:01:44 +08:00
钱涛 a1ab3c79f4 添加账套筛选条件 2024-02-28 14:43:27 +08:00
Harryxzy f9163340e5 分片 2024-02-28 09:17:28 +08:00
Harryxzy 1261194d88 操作日志优化 2024-02-27 11:30:14 +08:00