 钱涛
|
2fe7b7dc03
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
|
2024-11-20 18:43:59 +08:00 |
Harryxzy
|
05c0995841
|
工资单导出增加查看、确认状态
|
2024-11-19 10:02:33 +08:00 |
|
钱涛
|
84aa4caf54
|
解决冲突
|
2024-11-13 11:24:19 +08:00 |
|
钱涛
|
5a520a367a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# resource/wiki/常用查询.md
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-11-13 11:10:27 +08:00 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
Harryxzy
|
02de1e4444
|
工资单发放预览，兼容很早之前新建的工资单模板
|
2024-11-11 15:02:21 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
钱涛
|
63928ddc59
|
解决人员状态null问题
|
2024-10-28 15:08:10 +08:00 |
|
钱涛
|
f884e3ff25
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 16:04:43 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
钱涛
|
94bb1ede32
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-24 10:34:56 +08:00 |
|
钱涛
|
77d8c8168c
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-22 17:10:47 +08:00 |
|
钱涛
|
ce8356f9b2
|
分部id字段
|
2024-10-22 16:12:30 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
钱涛
|
a0fb036bce
|
业务线配置
|
2024-09-09 19:10:40 +08:00 |
|
钱涛
|
4b0eee4798
|
工资单跨扣缴义务人发放
|
2024-09-04 15:39:54 +08:00 |
|
钱涛
|
e7eb2e3459
|
支持跨扣缴义务人兼容性
|
2024-09-03 15:48:20 +08:00 |
|
钱涛
|
0b90f4890e
|
工资单支持跨扣缴义务人
|
2024-09-03 14:30:57 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +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 |
|
钱涛
|
2be7ec31de
|
修改工资单预览
|
2024-06-20 16:39:35 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
钱涛
|
238438897b
|
处理工资单证件号码不显示
|
2024-05-29 14:04:16 +08:00 |
|
钱涛
|
6a1b28c555
|
解决工资单null
|
2024-05-17 17:11:51 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
Harryxzy
|
93f9e9aca7
|
1、修复工资单员工信息分部显示问题
2、修复日志功能查询参数超1000导致的报错
|
2024-04-07 13:56:00 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
Harryxzy
|
08b2c240ab
|
提示修复
|
2024-03-15 10:14:59 +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 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
c64e9b4b76
|
工资单确认反馈sql
|
2024-02-19 14:01:30 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +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
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
Harryxzy
|
fe00f5c0e7
|
工资单发送action
|
2024-01-02 14:40:33 +08:00 |
|
钱涛
|
182e90676c
|
Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:24:33 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
4c5bc5dda7
|
增加状态
|
2023-09-28 17:05:42 +08:00 |
|
钱涛
|
4ed4edc9ed
|
pdf按钮控制
|
2023-09-27 14:19:52 +08:00 |