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 |
|
钱涛
|
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
|
163c436b3d
|
Merge remote-tracking branch 'remotes/origin/fix/231202-福利档案编辑页详情返回参数缺失' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:38:11 +08:00 |
|
sy
|
b84b5d1d6e
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:37:46 +08:00 |
|
sy
|
ead242cdb6
|
Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into release/2.10.1.2401.01
|
2024-01-23 15:29:14 +08:00 |
|
sy
|
56bb9a5af3
|
薪酬系统-福利档案，编辑页详情返回编辑框对应参数缺失问题修复
|
2024-01-23 15:08:53 +08:00 |
|
sy
|
60e792d481
|
薪酬系统-福利台账，自动核算并归档功能优化
|
2024-01-23 14:46:29 +08:00 |
|
钱涛
|
a5303b42a8
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-01-23 14:08:14 +08:00 |
|
钱涛
|
70b7e556af
|
Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-01-23 14:07:02 +08:00 |
|
钱涛
|
887ec2084a
|
导出excel工具类
|
2024-01-23 14:06:56 +08:00 |
|
sy
|
2a67ca9238
|
薪酬系统-工资单模板，复制功能改造2
|
2024-01-23 13:55:49 +08:00 |
|
Harryxzy
|
2d24fbfa23
|
回算工资单发放后不能再次回算
|
2024-01-23 11:34:36 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
Harryxzy
|
c9220d62e1
|
Merge branch 'fix/240101_非系统人员搜索不生效' into release/2.10.1.2401.01
|
2024-01-23 10:01:53 +08:00 |
|
Harryxzy
|
a3e281b3fe
|
修复非系统人员搜索不生效
|
2024-01-23 10:00:26 +08:00 |
|
钱涛
|
6ee8b5f044
|
解决短信不换行问题
|
2024-01-22 15:41:38 +08:00 |
|
钱涛
|
5d3a371f56
|
报表支持文本
|
2024-01-22 11:45:40 +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 |
|
钱涛
|
d09034b17b
|
报表支持文本
|
2024-01-22 10:38:18 +08:00 |
|
sy
|
e8aee9ab64
|
薪酬系统-福利档案，档案编辑页详情接口增加返回缺失福利项数值
|
2024-01-19 17:32:52 +08:00 |
|
sy
|
f236b8e655
|
薪酬系统-福利台账，核算相关方法梳理和优化
|
2024-01-19 11:35:11 +08:00 |
|
钱涛
|
40013d698b
|
暂存
|
2024-01-18 15:12:00 +08:00 |
|
sy
|
29e5c27ffb
|
薪酬系统-福利台账，自动核算并归档任务类开发
|
2024-01-17 16:07:27 +08:00 |
|
钱涛
|
a3aa0f5ca1
|
自适应文字长度
|
2024-01-17 10:55:42 +08:00 |
|
钱涛
|
3f49076a19
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-16 16:35:45 +08:00 |
|
钱涛
|
db4b44e62c
|
修复非系统人员状态bug
|
2024-01-16 16:35:37 +08:00 |
|
Harryxzy
|
f4bb757538
|
Merge branch 'feature/240101_薪资档案增加起始、结束发薪筛选' into release/2.9.10.2312.02
|
2024-01-15 18:48:16 +08:00 |
|
Harryxzy
|
0a6467aaa6
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 18:48:05 +08:00 |
|
Harryxzy
|
e38fd9be99
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 10:51:53 +08:00 |
|
sy
|
e9aba73172
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利档案导入基数值自动调整' into release/2.9.10.2312.02
|
2024-01-15 09:46:29 +08:00 |
|
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
Harryxzy
|
f5aa425f2c
|
fix公式，人员状态变量没有值bug
|
2024-01-09 13:21:45 +08:00 |
|
Harryxzy
|
8164660ebf
|
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
|
2024-01-08 15:34:32 +08:00 |
|
Harryxzy
|
5ecf069a79
|
Merge branch 'feature/240101_工资单发送action' into release/2.9.10.2312.02
|
2024-01-08 15:33:16 +08:00 |
|
Harryxzy
|
5f7c1c641b
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
Harryxzy
|
9232dedbbf
|
Merge branch 'feature/240101_薪资项目宽度' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
|
sy
|
681c0fb18e
|
薪酬系统-福利档案，档案编辑中更新档案主表和子表的关联关系
|
2024-01-08 10:57:55 +08:00 |
|
Harryxzy
|
9ca420b5e6
|
fix删除义务人时，没分片
|
2024-01-04 10:39:41 +08:00 |
|
Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
|
Harryxzy
|
fe00f5c0e7
|
工资单发送action
|
2024-01-02 14:40:33 +08:00 |
|
Harryxzy
|
f03c0d0147
|
薪资项目同步至账套功能，过滤没有权限的账套
|
2023-12-29 10:27:35 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
06fe3144ba
|
导入模板
|
2023-12-28 15:37:01 +08:00 |
|
Harryxzy
|
e976c7aaec
|
oracle工资单模板保存异常
|
2023-12-27 09:32:31 +08:00 |
|
钱涛
|
ed29be3701
|
日志
|
2023-12-26 18:47:45 +08:00 |
|
钱涛
|
7d1ce983dd
|
日志
|
2023-12-26 17:49:50 +08:00 |
|
钱涛
|
b7435554e8
|
操作日志前端接口
|
2023-12-26 16:12:44 +08:00 |
|
Harryxzy
|
2ed856ac18
|
Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02
|
2023-12-25 16:32:11 +08:00 |
|
Harryxzy
|
e67cb5bf83
|
个税扣缴义务人like分成3个
|
2023-12-25 16:31:36 +08:00 |
|
钱涛
|
8b5703c894
|
薪资项目操作日志
|
2023-12-25 09:36:23 +08:00 |
|
钱涛
|
ea8d51c493
|
薪资项目操作日志
|
2023-12-22 16:36:11 +08:00 |
|
钱涛
|
7a23324744
|
修改elog版本表名
|
2023-12-22 14:52:09 +08:00 |
|
钱涛
|
bd0edcf8e2
|
日志组件
|
2023-12-22 14:50:16 +08:00 |
|
钱涛
|
7e980db4b3
|
日志组件
|
2023-12-21 20:25:00 +08:00 |
|
钱涛
|
83a41da11d
|
日志组件
|
2023-12-21 14:30:21 +08:00 |
|
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
钱涛
|
b20a3ef103
|
暂存
|
2023-12-20 21:00:48 +08:00 |
|
钱涛
|
e8223a832b
|
缓存识别条件
|
2023-12-16 12:40:33 +08:00 |
|
钱涛
|
bda3d7080b
|
缓存识别条件
|
2023-12-16 12:36:56 +08:00 |
|
钱涛
|
4f8606b00e
|
缓存识别条件
|
2023-12-16 12:35:24 +08:00 |
|
sy
|
7cb0e68623
|
薪酬系统-福利档案，福利档案编辑页公司基数信息返回逻辑优化
|
2023-12-15 09:50:20 +08:00 |
|
Harryxzy
|
14cb45f4bc
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 16:00:46 +08:00 |