 钱涛
|
3a59187162
|
Merge branch 'release/3.0.2.2504.01' into custom/领悦业务线
|
2025-10-13 16:40:12 +08:00 |
Harryxzy
|
1751dae127
|
领悦4张报表增加搜索框；删除往期累计数据action
|
2025-09-18 15:15:48 +08:00 |
Harryxzy
|
3775dbe686
|
修复业务线版本 报表分享问题
|
2025-08-26 16:04:27 +08:00 |
|
Harryxzy
|
cbdc483c4c
|
薪酬报表浏览框根据业务线分权
|
2025-07-07 14:01:05 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
22077f431e
|
权限改造
|
2025-02-17 09:49:01 +08:00 |
|
钱涛
|
1bb5dd63fb
|
优化申报提示
|
2024-09-23 13:20:59 +08:00 |
|
钱涛
|
383562c9cf
|
工资单、数据采集权限功能
|
2024-09-12 11:50:18 +08:00 |
|
钱涛
|
09fb9898e7
|
完成账套和扣缴义务人接口
|
2024-09-09 11:13:10 +08:00 |
|
钱涛
|
7f77f4cb12
|
获取账套关联扣缴义务人
|
2024-09-03 09:21:57 +08:00 |
|
钱涛
|
25321bb357
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-21 15:49:12 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
钱涛
|
dd257ec53e
|
xml文件
|
2024-08-09 09:22:27 +08:00 |
|
钱涛
|
080a69c929
|
全量迁移
|
2024-08-08 09:50:04 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
98d45ebd32
|
处理内存溢出
|
2024-05-27 11:36:05 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
Harryxzy
|
0048001c54
|
返聘
|
2023-11-03 16:53:23 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
Harryxzy
|
79ef1941b2
|
删除个税扣缴义务人时校验社保福利
|
2023-07-20 15:14:43 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
Harryxzy
|
57f75d36a0
|
fix个税扣缴义务人保存过滤前后空格
|
2023-07-19 11:10:27 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
Harryxzy
|
1f9597195f
|
外部人员-个税扣缴义务人service获取人员信息改变写法
|
2023-03-15 15:49:20 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
2c1421999b
|
Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01
|
2022-12-08 11:32:03 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
钱涛
|
23dd15a568
|
批量调薪action
|
2022-12-05 16:01:08 +08:00 |
|
Harryxzy
|
1b570fe1aa
|
放开管理员限制
|
2022-12-05 10:34:25 +08:00 |
|
Harryxzy
|
6fe28ec41c
|
定薪流程，放开个税扣缴义务人限制
|
2022-12-05 09:57:27 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
钱涛
|
7a817af154
|
档案导入
|
2022-10-26 13:46:36 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
钱涛
|
b2704a84a4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-08-18 15:05:46 +08:00 |
|
钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
Harryxzy
|
4d0a73e030
|
xzy-解决社保福利方案删除时校验问题
|
2022-08-18 12:26:53 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +08:00 |
|
钱涛
|
eab3e9a6a9
|
1、福利列表显示扣税扣缴义务人
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
|
2022-07-07 18:29:52 +08:00 |
|
钱涛
|
7301ee1033
|
1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
|
2022-07-06 16:42:13 +08:00 |
|
钱涛
|
190d6da1b2
|
操作实际管理的个税扣缴人
|
2022-07-05 15:31:18 +08:00 |
|
钱涛
|
7b468045c8
|
1、限制核算的人员范围
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
|
2022-06-29 17:38:00 +08:00 |
|
钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |