 钱涛
|
1c2f0f516a
|
删除重复sql
|
2024-04-23 11:39:41 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
a27ad1f070
|
并档案接口
|
2024-04-16 20:26:56 +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 |
|
钱涛
|
0e6449e1e2
|
外籍人员
|
2024-04-12 17:46:53 +08:00 |
Harryxzy
|
8d7d3c3ec3
|
非系统人员部门id、分部id删除失败
|
2024-04-12 15:06:32 +08:00 |
|
钱涛
|
4aa66ea587
|
外籍人员更新
|
2024-04-11 18:57:56 +08:00 |
|
钱涛
|
23eba4950b
|
处理pdf生成
|
2024-04-11 15:23:23 +08:00 |
|
钱涛
|
a2a18245bd
|
处理缴款反馈
|
2024-04-11 10:59:36 +08:00 |
|
钱涛
|
691f4c42ce
|
内置算税结果
|
2024-04-10 14:48:58 +08:00 |
|
钱涛
|
6a05269b2d
|
处理LIKE函数
|
2024-04-10 14:20:30 +08:00 |
|
钱涛
|
917c9f87c1
|
个税申报
|
2024-04-10 09:18:05 +08:00 |
|
钱涛
|
d1b6a78238
|
人员报送
|
2024-04-10 09:08:24 +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 |
|
钱涛
|
be85c47a68
|
申报表状态更新主记录
|
2024-04-07 15:59:36 +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 |
|
钱涛
|
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
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
Harryxzy
|
f9d7c05190
|
核算导出模板修改表名
|
2024-04-01 10:17:45 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
钱涛
|
b3cde42f31
|
解决冲突
|
2024-03-29 14:41:31 +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
|
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 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +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
|
2691b1e099
|
调薪显示位数前端优化
|
2024-03-19 17:36:58 +08:00 |
|
Harryxzy
|
649dd8f7d5
|
社保福利台账补缴新增
|
2024-03-19 17:23:53 +08:00 |