Harryxzy
|
0d6355ca4a
|
修复回算工资单的合计列
|
2023-04-28 16:04:52 +08:00 |
 钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +08:00 |
|
钱涛
|
9f6950d8ae
|
工资单发放
|
2023-03-20 17:36:29 +08:00 |
|
Harryxzy
|
1ab7fcc7b8
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02
|
2023-03-16 17:20:43 +08:00 |
|
Harryxzy
|
ca03e0785e
|
工资单发放详情导出没有部门信息
|
2023-03-15 17:09:02 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
Harryxzy
|
4ce79438e6
|
工资单没有工号BUG
|
2023-03-07 17:43:51 +08:00 |
|
钱涛
|
26b8996d42
|
公司名
|
2023-03-02 17:59:58 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
钱涛
|
fd9b592384
|
修复核算未分类项目不显示
|
2023-03-02 11:25:25 +08:00 |
|
钱涛
|
44819a0903
|
工资单后台校验
|
2023-02-13 17:25:13 +08:00 |
|
Harryxzy
|
22027cde6b
|
Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02
|
2023-02-08 12:14:39 +08:00 |
|
Harryxzy
|
091221d0d4
|
我的薪资福利分页BUG
|
2023-02-08 12:12:45 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
Harryxzy
|
07292531db
|
重新回算提示
|
2022-12-19 18:03:17 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
Harryxzy
|
eaa9b7515f
|
工资单发放详情模板名称调整
|
2022-12-16 15:53:34 +08:00 |
|
Harryxzy
|
41a3583d61
|
修复回算按钮
|
2022-12-15 11:12:36 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +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
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +08:00 |
|
fcli
|
fcca6950ac
|
feat: 修复bug
|
2022-12-08 15:45:15 +08:00 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +08:00 |
|
Harryxzy
|
aed596523f
|
公司单发放详情报错
|
2022-12-07 18:00:31 +08:00 |
|
Harryxzy
|
ecda5027de
|
fix 回算归档
|
2022-12-07 15:27:20 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
fcli
|
ff7b1047bc
|
feat: 发放异常拦截
|
2022-12-05 14:06:22 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
fcli
|
4f9e2d8f80
|
feat: 路径修改接近e10
|
2022-11-29 14:36:37 +08:00 |
|
fcli
|
fc81955b15
|
feat: 全部范围部分发放撤回功能
|
2022-11-25 10:53:23 +08:00 |
|
钱涛
|
33e2e0e933
|
修复冲突
|
2022-11-02 17:36:34 +08:00 |
|
fcli
|
8873224123
|
Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01
|
2022-11-02 17:33:26 +08:00 |
|
钱涛
|
73c24bcac5
|
工资单发放合并计税bug
|
2022-11-02 17:20:34 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
|
钱涛
|
63c7577ef8
|
工资单不显示空项功能
|
2022-09-21 19:13:17 +08:00 |
|
钱涛
|
f779b1bb11
|
工资单不显示空项功能
|
2022-09-21 19:08:44 +08:00 |
 liuliang
|
12d6f733a6
|
工资单发放范围修正
|
2022-07-27 09:27:47 +08:00 |
|
钱涛
|
27c84676b7
|
修复工资单撤回
|
2022-07-20 11:50:09 +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 |
MustangDeng
|
62054871ce
|
发送工资单
|
2022-06-15 17:03:48 +08:00 |
|
钱涛
|
e83714ba4f
|
Merge branch 'feature/encrypt' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
# src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
# src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2022-06-10 15:26:43 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
|
MustangDeng
|
d3c82acac1
|
发送撤回工资单
|
2022-06-06 13:56:47 +08:00 |