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

3033 Commits

Author SHA1 Message Date
Harryxzy 560fabe075 账套人员范围导入增加了一列，导致导入校验没通过 2024-06-20 16:28:48 +08:00
Harryxzy caf5f5161e 宁波精华fix 2024-06-20 16:22:34 +08:00
Harryxzy fbc3ab008a Merge branch 'release/2.14.4.2406.02' into custom/宁波精华 2024-06-20 15:22:09 +08:00
Harryxzy e0060227c8 宁波精华报表1、2、3、4 2024-06-20 15:21:48 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
Harryxzy 3f9bb23e80 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 11:44:15 +08:00
Harryxzy e13c2b0cd0 薪资项目同步默认值 2024-06-20 11:43:57 +08:00
Harryxzy 4fbd7d7418 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 10:44:41 +08:00
Harryxzy 5459729da2 Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2024-06-20 10:44:12 +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
钱涛 fe8dcd0ccd 核算默认值 2024-06-19 11:21:00 +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
Harryxzy 7e7ff97e7a Merge remote-tracking branch 'origin/feature/人员信息快照' into custom/宁波精华 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties
 2024-06-18 17:41:51 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
Harryxzy a65098bfa1 宁波精华薪酬二开 2024-06-18 15:26:24 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
Harryxzy 216c4cee84 默认值temp 2024-06-17 17:58:01 +08:00
钱涛 5b7533e908 同步假期余额字段 2024-06-14 13:46:59 +08:00
钱涛 5c13f80034 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 17:46:55 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
Harryxzy a27716ae72 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 14:14:38 +08:00
Harryxzy 6513c2b6e6 Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02 2024-06-13 14:14:21 +08:00
Harryxzy 1dd3439ce3 社保福利台账小数位优化 2024-06-13 13:59:43 +08:00
钱涛 db391f01c4 处理大数据内存溢出 2024-06-13 13:39:24 +08:00
钱涛 4798f5d4a6 处理大数据内存溢出 2024-06-12 17:35:06 +08:00
Harryxzy e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
钱涛 1983ba968c 去除日志 
系统薪资项目配置不需要重启
 2024-06-12 15:35:40 +08:00
钱涛 7e988193c6 公式扩展获取月有多少天 2024-06-12 14:31:50 +08:00
钱涛 853482141f 小数位支持10位 2024-06-12 10:45:32 +08:00
钱涛 f073f6d90c 处理刷新非正常人员问题 2024-06-11 15:48:07 +08:00
钱涛 a1e7ec160c 处理复制异常 2024-06-11 10:10:45 +08:00
钱涛 789b77ba0b 档案导入模板注释 2024-06-06 14:54:58 +08:00
Harryxzy 91444e9495 修复薪资核算高级搜索ISNOTEMPTY 中文显示 2024-06-05 16:54:53 +08:00
Harryxzy 16f5ffcf29 优化 - 社保福利台账小数位数 2024-06-05 15:30:57 +08:00
Harryxzy 91b8809c03 修复薪资核算搜索，合并计税bug 2024-06-05 13:43:49 +08:00
Harryxzy b6331b952c 修复 
1、社保福利台账补差下载导入模板，显示的是补差数据；
2、报表分享不设置起始日期时oracle数据库兼容问题；
 2024-06-05 11:02:59 +08:00
钱涛 abba78ead3 处理隐藏bug 2024-05-31 11:36:56 +08:00
钱涛 07f08336d6 Merge branch 'release/2.14.3.2406.01' into custom/宁波精华 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties
#	src/com/engine/salary/service/SalaryAcctEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2024-05-30 17:14:37 +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
钱涛 3569519b12 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 12:02:18 +08:00
钱涛 18a4f7c3e7 隐藏数据迁移 2024-05-30 12:01:53 +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
钱涛 98d45ebd32 处理内存溢出 2024-05-27 11:36:05 +08:00
钱涛 e2dec06735 隐藏身份证号 2024-05-27 10:52:26 +08:00
钱涛 24b2154cb3 隐藏身份证号 2024-05-27 10:48:46 +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 51b4a3198c 修复报表数值项目出现文本值 2024-05-21 15:04:52 +08:00
Harryxzy c098dc1d1f Merge branch 'release/2.14.2.2405.02' into custom/宁波精华 2024-05-20 15:39:09 +08:00
Harryxzy b52534d14b 宁波精华二开-删除离职账套人员 2024-05-20 15:35:50 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
Harryxzy 336bb1fc9d 宁波精华 - 删除离职账套中存在的核算人员temp 2024-05-20 13:25:24 +08:00
钱涛 6a1b28c555 解决工资单null 2024-05-17 17:11:51 +08:00
钱涛 26d6efd827 pdf日志 2024-05-17 10:58:38 +08:00
Harryxzy b76a87b125 社保福利编辑保存改造 2024-05-17 09:40:52 +08:00
钱涛 c146537684 修改计时说明 2024-05-16 15:56:49 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 0f1473801e 维护工具效率 2024-05-14 14:12:14 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
Harryxzy dd54a10433 核算固定列头数优化 2024-05-11 16:19:25 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 8d18c0e5cb 优化“薪资项目同步至账套”，薪酬总管理员能选到所有义务人下账套 2024-05-10 18:25:32 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00
Harryxzy 845586cba2 test 2024-05-10 14:54:02 +08:00
钱涛 6d4265acf1 职称显示为中午 2024-05-08 15:31:36 +08:00
钱涛 c97618bd97 修复社保福利修改时没有小数位问题 2024-05-08 11:15:52 +08:00
钱涛 6f2d65a4be 修复社保福利新建时没有小数位和进位规则对应问题 2024-05-08 10:49:08 +08:00
钱涛 bb32bdfe11 核算详细信息 2024-05-07 18:48:38 +08:00
钱涛 6b0606f5a4 自适应 2024-05-07 17:37:02 +08:00
钱涛 5c90909c0e 账套快照-解决导入、公式、详细详细不对应问题 2024-05-07 15:25:43 +08:00
钱涛 1cb89a9d1b 账套快照-工资单模板 2024-05-06 17:41:39 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy b5b2c9ef1e 累计专项附加扣除一键累计，能根据义务人进行累计 2024-04-30 15:00:43 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计，能根据义务人进行累计 2024-04-30 14:43:37 +08:00
钱涛 7d7d2dc309 处理公式数组问题 2024-04-28 16:21:44 +08:00
Harryxzy e7c46bc5e8 优化同步离职日期 2024-04-26 15:13:54 +08:00
Harryxzy ea968c316e 解决数据透视薪资项目排序问题 2024-04-25 14:04:13 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
钱涛 c206538aa6 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-25 11:45:53 +08:00
钱涛 d802d890d6 处理解密问题 2024-04-25 11:45:37 +08:00
Harryxzy 0bf4b8ed09 修复往期累计导入时未加密 2024-04-23 15:45:24 +08:00
钱涛 95a7f26d60 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-16 16:05:53 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
Harryxzy 916baf623c fix导出文本 2024-04-16 09:57:12 +08:00
Harryxzy 8d7d3c3ec3 非系统人员部门id、分部id删除失败 2024-04-12 15:06:32 +08:00
钱涛 23eba4950b 处理pdf生成 2024-04-11 15:23:23 +08:00
钱涛 6a05269b2d 处理LIKE函数 2024-04-10 14:20:30 +08:00
Harryxzy 44ed332ed5 修复ecology的多语言导致乱码 2024-04-08 17:57:59 +08:00
Harryxzy ff19e46ac2 fix 2024-04-07 15:52:07 +08:00
Harryxzy 93f9e9aca7 1、修复工资单员工信息分部显示问题 
2、修复日志功能查询参数超1000导致的报错
 2024-04-07 13:56:00 +08:00
Harryxzy 2242723d3f Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02 2024-04-03 11:39:30 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy f9d7c05190 核算导出模板修改表名 2024-04-01 10:17:45 +08:00
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
Harryxzy 47e0f5da52 fix冲突 2024-03-29 10:52:46 +08:00
Harryxzy 330d1363fc Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02 2024-03-29 10:49:58 +08:00
Harryxzy 5d2cc92bf8 Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-03-29 10:49:39 +08:00
Harryxzy 4e25dd4f0d Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02 2024-03-29 10:47:44 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 130be31d99 薪资核算导出模板 2024-03-27 11:33:56 +08:00
Harryxzy 3c8d1dc6ee 薪资明细表 2024-03-27 09:35:47 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy 92ba8e8fcf 薪资明细合计接口 2024-03-26 13:49:37 +08:00
Harryxzy ccc2744bee 薪资明细 2024-03-26 09:12:59 +08:00
Harryxzy faabf1dad3 薪酬报表-人事状态 2024-03-25 17:29:40 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
Harryxzy 25c2e2f1c1 其他维度 2024-03-22 15:23:03 +08:00
Harryxzy 18c496c009 多部门多分部筛选 2024-03-21 14:19:36 +08:00
Harryxzy 0c444acd38 多部门多分部筛选 2024-03-21 14:19:03 +08:00
Harryxzy 216a2c67d3 社保福利编辑保存改造 2024-03-20 14:47:41 +08:00
Harryxzy 2691b1e099 调薪显示位数前端优化 2024-03-19 17:36:58 +08:00
Harryxzy 649dd8f7d5 社保福利台账补缴新增 2024-03-19 17:23:53 +08:00
Harryxzy 1a4059f7ba 报表数据透视导出 2024-03-19 13:35:37 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
Harryxzy 69d94731a0 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 10:15:12 +08:00
Harryxzy 08b2c240ab 提示修复 2024-03-15 10:14:59 +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
钱涛 9e8fbbef89 去除pagehelper jar包 2024-02-26 16:25:17 +08:00
钱涛 f11d6a035c 去除pagehelper jar包 2024-02-26 15:40:52 +08:00
sy 4ea2499d85 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-23 16:11:18 +08:00
sy 624c7db09f 薪酬系统-福利台账，核算功能操作日志逻辑添加 2024-02-23 16:11:11 +08:00
Harryxzy 093cb34f77 操作日志fix some bugs 2024-02-23 15:11:56 +08:00
sy 721f6046da Merge remote-tracking branch 'remotes/origin/fix/240101-福利台账列表分权问题修复' into release/2.11.1.2402.01 2024-02-23 14:07:08 +08:00
Harryxzy 4775d8683a fix调薪原因value值相同 2024-02-23 11:42:36 +08:00
sy dce7f684a5 薪酬系统-福利台账，列表分权问题修复 2024-02-23 11:34:48 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
sy e4cbcdd400 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 15:24:12 +08:00
sy 1654e041b9 薪酬系统-福利档案，相关功能操作日志逻辑优化 2024-02-22 15:23:59 +08:00
钱涛 a78c45f8f9 Merge branch 'master' into feature/操作日志组件 
# Conflicts:
#	src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
 2024-02-22 15:20:14 +08:00
Harryxzy 5c5dcdabb2 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:44:02 +08:00
Harryxzy f591074fc1 日志 2024-02-22 09:43:47 +08:00
sy f7eb698c4c Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:34:09 +08:00
sy 75dd4235af 薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加 2024-02-22 09:33:35 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
钱涛 1e12138ca1 Merge branch 'feature/报表维度' into release/2.10.1.2401.01 2024-02-21 14:17:30 +08:00
sy e813a195f5 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-20 17:05:04 +08:00
sy 4f372645ec Merge remote-tracking branch 'remotes/origin/fix/240101-福利方案，自定义福利详情获取接口增加返回参数' into release/2.10.1.2401.01 2024-02-20 17:00:25 +08:00
sy 7804936e52 薪酬系统-福利方案，自定义福利列表返回结果优化 2024-02-20 16:59:18 +08:00
sy 088a5c1d72 薪酬系统-福利台账，正常缴纳页相关功能操作日志添加 2024-02-20 16:50:45 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy 400d22cc93 修复考勤引用查看报错 2024-02-20 10:06:17 +08:00
Harryxzy 4158f9f708 Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01 2024-02-20 09:51:17 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
sy cfb82cb9b2 薪酬系统-福利方案、档案、台账，相关实现类代码梳理，去除sqlsession形式的mpper调用 2024-02-19 17:27:42 +08:00
Harryxzy ee82d1cb9a 工资单确认反馈优化 2024-02-19 14:16:47 +08:00
Harryxzy c64e9b4b76 工资单确认反馈sql 2024-02-19 14:01:30 +08:00
sy 5525d9881c 薪酬系统-福利方案，自定义福利项详情获取接口增加返回参数 2024-02-19 10:33:48 +08:00
Harryxzy 7fe03ac7a1 工资单确认反馈优化 2024-02-19 10:09:49 +08:00
钱涛 b2972e8aca 增加操作日志类型 2024-02-18 11:40:59 +08:00
钱涛 8f8bc5256d 增加操作日志类型 2024-02-18 11:39:49 +08:00
sy 69513fa148 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-07 17:39:57 +08:00
sy 6a79b22c17 薪酬系统-福利档案，增加操作日志 2024-02-07 17:39:26 +08:00
钱涛 405fe226d9 删除elog 2024-02-05 16:33:43 +08:00
sy 146a21a377 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-05 15:13:21 +08:00
sy 1c61c0004d 薪酬系统-福利方案，方案明细编辑并保存，主表增加操作日志 2024-02-05 15:04:39 +08:00
钱涛 395d3f567f sqlserver字段类型改成nvarchar(max) 2024-02-05 14:48:29 +08:00
钱涛 1c252b79da sqlserver字段类型改成nvarchar(max) 2024-02-05 14:34:16 +08:00
sy 43d10c4ba0 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-05 14:07:08 +08:00
sy 5783342b01 薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志 2024-02-05 14:06:52 +08:00
钱涛 133933e287 修改sqlserver批量插入和oracle类型 2024-02-05 14:04:47 +08:00
sy 6efbd9deb0 薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位 2024-02-04 15:10:35 +08:00
sy 306af48291 薪酬系统-福利档案，SICategoryBiz、SISchemeBiz方法迁移到对应是实现类，并修改调用方相关代码 2024-02-04 10:11:10 +08:00
sy 9074fb46fc 薪酬系统-福利档案，SIArchivesBiz方法迁移到对应是实现类，并修改调用方相关代码 2024-02-02 15:23:26 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
sy f5d21042c8 Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01 2024-01-31 16:32:45 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy a502cd84a2 Merge branch 'fix/240101_回算工资单发放后不能再次回算' into release/2.10.1.2401.01 2024-01-31 16:12:52 +08:00
钱涛 335964e2df 去除无效代码 2024-01-30 17:21:13 +08:00
sy 3281b138fa 薪酬系统-福利档案，复制action功能优化 2024-01-30 15:58:42 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
钱涛 336aaeabea 文本维度，无分组排序放到末尾 2024-01-30 15:45:48 +08:00
sy 8237ed48a6 Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01 2024-01-30 14:32:59 +08:00
sy b1d3d2c445 薪酬系统-福利档案，复制action开发 2024-01-30 14:31:21 +08:00
钱涛 b6f7281cbd 记录日志 2024-01-30 14:17:06 +08:00
Harryxzy 12f66512df 工资单反馈区分pc和移动端 2024-01-30 13:50:05 +08:00
钱涛 60616e8462 Merge branch 'release/2.10.1.2401.01' into feature/报表维度 2024-01-30 11:39:44 +08:00
钱涛 e5a0a85179 增加调薪原因，晋升、降职、调岗 2024-01-30 11:18:54 +08:00
钱涛 65f972846f 处理id超过2100 2024-01-30 10:26:44 +08:00
钱涛 a8bfe83030 操作日志 2024-01-30 09:58:13 +08:00
钱涛 3a0646df9c 修复日志分页问题 2024-01-29 16:21:17 +08:00
钱涛 a78a10cad6 合并 2024-01-29 15:12:12 +08:00
钱涛 d2216eee13 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
 2024-01-29 15:07:58 +08:00
sy c4adecf436 薪酬系统-福利档案，减员action优化 2024-01-29 11:30:04 +08:00
钱涛 9c9a8e2661 Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01 2024-01-29 10:05:45 +08:00
钱涛 6a8c9aebe3 修复考勤引用数据失败bug 2024-01-29 10:05:30 +08:00
Harryxzy 5e9956fbbf 修复新建工资单模板时没有模板id，导致添加薪资项目时取到了其他模板的重命名的信息。 2024-01-26 14:56:58 +08:00
sy f215b45afa 薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造 2024-01-26 10:04:53 +08:00
钱涛 2aa4ed05d8 去除达梦驱动 2024-01-25 13:56:18 +08:00
sy 78f96c5008 薪酬系统，拉取20240101分支更新内容，并处理冲突 2024-01-25 13:37:35 +08:00
sy 56c9557b3a Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-01-25 11:43:11 +08:00
sy 8eeb358dcc Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-25 11:41:44 +08:00
sy e92e134d21 薪酬系统-工资单模板，复制功能改造，补发工资单模板名称更改 2024-01-25 11:41:35 +08:00