 钱涛
|
353a007149
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
|
2024-04-25 13:46:13 +08:00 |
|
钱涛
|
c9075058d5
|
跳过人员范围校验
|
2024-04-25 13:45:59 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
1496745488
|
作废人员接口
|
2024-04-16 20:12:48 +08:00 |
|
钱涛
|
6cfeb70f9c
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-12 17:47:40 +08:00 |
|
钱涛
|
4aa66ea587
|
外籍人员更新
|
2024-04-11 18:57:56 +08:00 |
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
钱涛
|
e994a61037
|
申报状态拆分
|
2024-04-08 14:40:47 +08:00 |
|
钱涛
|
fbc9c1a187
|
申报表状态更新主记录
|
2024-04-07 11:29:09 +08:00 |
|
Harryxzy
|
2242723d3f
|
Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02
|
2024-04-03 11:39:30 +08:00 |
|
钱涛
|
7f965c41c9
|
申报表状态更新主记录
|
2024-04-02 15:50:33 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
钱涛
|
57a0030cc8
|
处理外籍人员
|
2024-04-01 17:07:36 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
钱涛
|
5f64acc269
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
# src/com/engine/salary/service/ExtEmpService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 14:37:00 +08:00 |
|
钱涛
|
8e2ff975a9
|
暂存
|
2024-03-29 14:01:12 +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
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +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 |
|
钱涛
|
3a79ed9574
|
Merge branch 'release/2.11.2.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2024-03-15 15:44:15 +08:00 |
|
Harryxzy
|
b17d2b70de
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:19:03 +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 |
|
钱涛
|
1d8a1b91c0
|
解决冲突
|
2024-03-12 18:58:36 +08:00 |
|
钱涛
|
452d7bc57c
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2024-03-12 18:56:12 +08:00 |
|
Harryxzy
|
b5afaa54df
|
Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚
|
2024-03-12 15:13:34 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
6aef2856e8
|
个税日志
|
2024-03-08 11:14:00 +08:00 |
|
钱涛
|
8516a23bba
|
修改人员报送刷新逻辑
刷新人员会集成上月所有人员
|
2024-03-07 21:12:09 +08:00 |
|
钱涛
|
72861b9a93
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
|
2024-03-07 16:57:03 +08:00 |
|
钱涛
|
729c6c7d3a
|
处理空指针
|
2024-03-07 14:12:16 +08:00 |
|
钱涛
|
427ce223e7
|
核算闭环提醒
|
2024-03-07 09:43:22 +08:00 |
|
钱涛
|
a52788aa1b
|
往期累计日志调整
|
2024-03-06 16:12:15 +08:00 |
|
钱涛
|
5a9d45f92b
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2024-03-06 15:54:07 +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
|
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 |
|
Harryxzy
|
3f76b5bbbf
|
非系统人员管理日志
|
2024-03-04 16:12:30 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
Harryxzy
|
bcfcd1de9a
|
个税申报-在线对比显示列定制
|
2024-03-01 13:52:27 +08:00 |
|
Harryxzy
|
54823f2fbd
|
个税申报-在线对比
|
2024-02-29 18:09:58 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
|
Harryxzy
|
1261194d88
|
操作日志优化
|
2024-02-27 11:30:14 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04: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 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
079b7de258
|
合并240101
|
2024-02-21 15:35:08 +08:00 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +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
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +08:00 |
|
sy
|
6a79b22c17
|
薪酬系统-福利档案，增加操作日志
|
2024-02-07 17:39:26 +08:00 |
|
sy
|
5783342b01
|
薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志
|
2024-02-05 14:06:52 +08:00 |
|
Harryxzy
|
3dd1c44459
|
核算时核算校验bug
|
2024-02-04 10:55:40 +08:00 |
|
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +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 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +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 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
|
钱涛
|
65f972846f
|
处理id超过2100
|
2024-01-30 10:26:44 +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 |
|
钱涛
|
6a8c9aebe3
|
修复考勤引用数据失败bug
|
2024-01-29 10:05:30 +08:00 |
|
sy
|
f215b45afa
|
薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造
|
2024-01-26 10:04:53 +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 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
sy
|
b84b5d1d6e
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:37:46 +08:00 |
|
钱涛
|
a5303b42a8
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-01-23 14:08:14 +08:00 |
|
Harryxzy
|
2d24fbfa23
|
回算工资单发放后不能再次回算
|
2024-01-23 11:34:36 +08:00 |
|
钱涛
|
ce5c106845
|
对比功能添加筛选是否显示差异人员和差异项
|
2024-01-23 11:23:50 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
钱涛
|
6ee8b5f044
|
解决短信不换行问题
|
2024-01-22 15:41:38 +08:00 |
|
钱涛
|
a168aeef53
|
对比线下结果，分页显示
|
2024-01-22 14:15:36 +08:00 |
|
sy
|
56651196fa
|
Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档
|
2024-01-22 11:03:37 +08:00 |
|
sy
|
29e5c27ffb
|
薪酬系统-福利台账，自动核算并归档任务类开发
|
2024-01-17 16:07:27 +08:00 |
|
钱涛
|
4846cfcf18
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-17 14:14:32 +08:00 |
|
Harryxzy
|
e38fd9be99
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 10:51:53 +08:00 |