 钱涛
|
6ce7ef0b7e
|
Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03
|
2022-12-16 17:58:03 +08:00 |
fcli
|
4b2549f420
|
Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03
|
2022-12-16 17:57:17 +08:00 |
|
钱涛
|
2fbd66ac19
|
操作者
|
2022-12-16 10:32:45 +08:00 |
|
fcli
|
c70964a8e2
|
feat: 继承类问题修改
|
2022-12-16 10:18:26 +08:00 |
|
fcli
|
bf870cc9aa
|
feat: 继承类问题修改
|
2022-12-16 10:11:41 +08:00 |
|
fcli
|
8f39d5d12a
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 10:01:09 +08:00 |
|
fcli
|
78447c002b
|
feat: 继承类问题修改
|
2022-12-16 10:01:00 +08:00 |
|
fcli
|
5295821dc1
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 09:46:55 +08:00 |
|
fcli
|
68f9c8b9db
|
feat: 继承类问题修改
|
2022-12-16 09:46:39 +08:00 |
|
钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
|
fcli
|
7f7f4442ca
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 14:56:24 +08:00 |
|
fcli
|
beeadfc35c
|
feat: 加解密处理
|
2022-12-14 14:55:57 +08:00 |
|
fcli
|
b162afcbdd
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 13:51:22 +08:00 |
|
fcli
|
ad3f7595bd
|
feat: 空指针处理
|
2022-12-14 13:51:01 +08:00 |
|
fcli
|
d039781b74
|
feat: develop处理合并
|
2022-12-14 11:03:33 +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
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
钱涛
|
5e893160b4
|
加密方法
|
2022-12-12 10:36:06 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
钱涛
|
77d3046966
|
所有个税扣缴义务人的树形
|
2022-12-08 17:48:46 +08:00 |
|
钱涛
|
30e8fd3733
|
流程中个税扣缴义务人已处理
|
2022-12-08 16:48:37 +08:00 |
|
fcli
|
8e2e85a986
|
Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01
|
2022-12-08 16:43:06 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +08:00 |
sy
|
0399731b9b
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01
|
2022-12-08 16:25:28 +08:00 |
|
fcli
|
fcca6950ac
|
feat: 修复bug
|
2022-12-08 15:45:15 +08:00 |
|
钱涛
|
2c1421999b
|
Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01
|
2022-12-08 11:32:03 +08:00 |
|
钱涛
|
ea20dfb9ff
|
fix调薪action
|
2022-12-08 10:53:51 +08:00 |
|
钱涛
|
399563088d
|
流程生成人员范围
|
2022-12-08 10:49:51 +08:00 |
|
sy
|
979bb82661
|
薪酬系统-福利台账，调差数据保存时，增加新数据id信息的返回
|
2022-12-08 10:18:27 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +08:00 |
|
钱涛
|
fb39dbe0c4
|
流程生成人员范围
|
2022-12-07 20:16:14 +08:00 |
|
钱涛
|
0d417f1e49
|
流程生成人员范围
|
2022-12-07 20:15:52 +08:00 |
|
钱涛
|
5079753c34
|
sql测试
|
2022-12-07 16:19:22 +08:00 |
|
钱涛
|
f20cecf042
|
sql测试
|
2022-12-07 16:17:29 +08:00 |
|
钱涛
|
cdb7f3a0a2
|
sql测试
|
2022-12-07 15:47:35 +08:00 |
|
钱涛
|
1e03eca738
|
单独调薪检查action
|
2022-12-07 09:17:31 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
sy
|
70a5854dc7
|
薪酬系统-福利台账，调差数据保存时，增加公司费用数值字段的校验
|
2022-12-06 15:40:40 +08:00 |
|
钱涛
|
11d1ee1a21
|
批量调薪action
|
2022-12-06 10:26:36 +08:00 |
|
钱涛
|
2f8f5f299e
|
批量调薪action
|
2022-12-06 09:52:55 +08:00 |
|
钱涛
|
5b1615675d
|
批量调薪action
|
2022-12-06 09:41:26 +08:00 |
|
fcli
|
2877d58a1f
|
feat: sqlserver bug修复
|
2022-12-05 17:51:28 +08:00 |