Harryxzy
|
0eb638decd
|
返聘调整
|
2025-07-23 16:11:45 +08:00 |
|
Harryxzy
|
068d4d5633
|
银盛返聘action调整
|
2025-07-22 09:11:50 +08:00 |
|
Harryxzy
|
bbec04096d
|
Merge branch 'feature/重置排序' into custom/银盛科技服务集团有限公司
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-05-28 16:12:00 +08:00 |
|
Harryxzy
|
49777193ff
|
银盛科技 提供调薪前的变量
|
2025-03-27 16:57:14 +08:00 |
 钱涛
|
5ce2834772
|
Merge branch 'release/2.19.1.2501.01' into feature/重置排序
|
2025-03-27 16:36:31 +08:00 |
|
Harryxzy
|
454f035310
|
银盛科技 考勤引用表名修改
|
2025-03-25 14:22:48 +08:00 |
|
钱涛
|
eea9093cfd
|
Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01
|
2025-03-24 15:03:09 +08:00 |
|
钱涛
|
b128f219f7
|
处理敏感信息泄露
|
2025-03-24 14:57:00 +08:00 |
|
Harryxzy
|
8bea1405dc
|
银盛科技 考勤引用薪酬二开
|
2025-03-21 13:28:01 +08:00 |
|
Harryxzy
|
04bb4433ff
|
Merge branch 'release/2.19.1.2501.01' into custom/银盛科技服务集团有限公司
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2025-03-20 15:35:40 +08:00 |
|
钱涛
|
8910183e7f
|
核算是否采用线程池配置
|
2025-03-19 18:08:19 +08:00 |
|
钱涛
|
fe4b8b1fb3
|
核算是否采用线程池配置
|
2025-03-19 17:18:09 +08:00 |
|
Harryxzy
|
bdba2158b0
|
银盛科技薪酬二开
|
2025-03-19 10:10:43 +08:00 |
|
钱涛
|
c8f281613b
|
薪资明细增加人员浏览按钮多选搜索
|
2025-03-18 17:45:00 +08:00 |
|
钱涛
|
3b520fcf62
|
社保和档案执行标识
|
2025-03-18 17:31:32 +08:00 |
|
钱涛
|
a29f8b3da9
|
薪资明细模板导出根据项目类型设置单元格格式
|
2025-03-17 11:03:42 +08:00 |
|
Harryxzy
|
3fb29b2c3d
|
停薪action 增加日志
|
2025-03-12 18:21:04 +08:00 |
|
钱涛
|
9cee19397d
|
记录核算具体操作日志
|
2025-03-06 17:35:25 +08:00 |
|
Harryxzy
|
9c419f09bf
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-11 09:23:15 +08:00 |
|
钱涛
|
903cfb781a
|
Merge branch 'release/2.19.1.2501.01' into feature/重置排序
|
2025-02-10 11:15:12 +08:00 |
|
钱涛
|
54559b198b
|
处理模板示例列合并问题
|
2025-02-08 15:12:42 +08:00 |
|
钱涛
|
e48c74b2e2
|
处理模板示例列合并问题
|
2025-02-08 15:12:21 +08:00 |
|
Harryxzy
|
06e117f3aa
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-08 11:29:23 +08:00 |
|
Harryxzy
|
be59482fc8
|
fix社保福利台账核算人员bug
|
2025-02-08 11:28:36 +08:00 |
|
钱涛
|
0988dd6d5a
|
下载excel模板示例
|
2025-02-08 09:52:32 +08:00 |
|
钱涛
|
5916cd63ef
|
支持根据税款所属期进行申报
|
2025-02-07 16:58:58 +08:00 |
|
钱涛
|
3394c92964
|
修复导出模板附件删除问题
|
2025-02-07 11:44:17 +08:00 |
|
钱涛
|
20f06e07da
|
修复导出模板附件删除问题
|
2025-02-07 11:42:31 +08:00 |
|
钱涛
|
8425a30aa0
|
模板显示附件名称
|
2025-02-07 10:13:29 +08:00 |
|
Harryxzy
|
c77ecf8d69
|
Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01
|
2025-02-07 09:16:18 +08:00 |
|
钱涛
|
d75979ed45
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-06 16:11:50 +08:00 |
|
钱涛
|
0dd98cf616
|
薪资excel模板导出
|
2025-02-06 16:11:39 +08:00 |
|
Harryxzy
|
d63702891d
|
fix 社保福利台账核算人数大于1000时sqlbug
|
2025-02-06 13:51:22 +08:00 |
|
Harryxzy
|
4875bd327c
|
社保福利台账勾选了暂不缴纳的不出现在台账中
|
2025-02-05 15:52:34 +08:00 |
|
Harryxzy
|
872dcf866b
|
Merge branch 'release/2.19.1.2501.01' into feature/重置排序
|
2025-01-22 18:00:44 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +08:00 |
|
钱涛
|
076e3029b1
|
获取已归档的正常工资薪金所得人员
|
2025-01-21 15:03:36 +08:00 |
|
钱涛
|
7195dc7618
|
兼容0状态档案
|
2025-01-21 10:20:16 +08:00 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
a002e16f3c
|
去除消息类型
|
2025-01-16 16:21:53 +08:00 |
|
钱涛
|
044964e2b8
|
处理oracle插入问题
|
2025-01-16 16:18:34 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +08:00 |
|
钱涛
|
678aafde1f
|
Merge branch 'release/2.19.1.2501.01' into feature/重置排序
|
2025-01-09 13:37:12 +08:00 |
|
钱涛
|
790f9f0175
|
核算执行状态sql
|
2025-01-08 16:58:59 +08:00 |
|
钱涛
|
1113a4f27f
|
批量导出考勤数据
|
2025-01-08 16:24:16 +08:00 |
|
钱涛
|
a96a19b07f
|
1、核算账套增加多选框，选择多个账套后批量发起核算;
2、核算记录下核算状态，显示在核算列表中。核算中，核算完成;
3、全部核算完成后，提醒当前操作人员薪资数据全部核算完成;
|
2025-01-07 18:07:56 +08:00 |
|
Harryxzy
|
575c885229
|
Merge branch 'release/2.18.2.2412.02' into feature/重置排序
|
2025-01-03 15:40:43 +08:00 |
|
钱涛
|
5a0ef67816
|
版本
|
2025-01-03 09:14:08 +08:00 |
|
钱涛
|
8f697eba36
|
版本
|
2025-01-02 15:00:21 +08:00 |
|
Harryxzy
|
d4a42e0ed6
|
修复人员确认页面“环比上月减少人员”搜索后，显示数据错误
|
2024-12-25 11:27:06 +08:00 |