 钱涛
|
ab87e5cf08
|
劳务申报表列表
|
2022-08-02 10:59:12 +08:00 |
|
钱涛
|
a252d055ab
|
1、核算接口代理
2、获取异常真实信息
|
2022-08-01 14:15:09 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
92e7ac17c1
|
档案状态
|
2022-07-25 15:56:21 +08:00 |
|
钱涛
|
3ced92cfc5
|
修复福利核算
|
2022-07-21 17:28:47 +08:00 |
|
钱涛
|
77ca4c2848
|
Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2022-07-21 09:43:02 +08:00 |
 liuliang
|
32c15c1c35
|
Merge branch 'feature_liuliang_20220705' into develop
|
2022-07-20 15:58:49 +08:00 |
|
钱涛
|
a721898d3d
|
薪资档案增加起始发薪和最后发薪
|
2022-07-18 18:08:59 +08:00 |
|
liuliang
|
b9528442f9
|
薪酬档案导入对接流程-liuliang
|
2022-07-18 16:19:15 +08:00 |
|
liuliang
|
758a78996d
|
导入薪酬档案对接流程功能
|
2022-07-13 18:59:30 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
3c3c679757
|
获取个税扣缴义务人下的实际人员配置接口
|
2022-07-06 10:52:37 +08:00 |
|
钱涛
|
9bd1074258
|
1、档案限制应为个税扣缴义务人下的人员
2、个税扣缴义务人未开启分权的情况下显示管理员
|
2022-07-06 10:13:06 +08:00 |
|
钱涛
|
053c436d49
|
获取薪酬版本信息
|
2022-07-05 16:56:09 +08:00 |
|
钱涛
|
190d6da1b2
|
操作实际管理的个税扣缴人
|
2022-07-05 15:31:18 +08:00 |
|
钱涛
|
c2c4149442
|
报表接口
|
2022-07-04 15:34:04 +08:00 |
|
钱涛
|
4be0d70c4d
|
fix
|
2022-06-28 16:46:42 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
b357bd18a6
|
fix
|
2022-06-23 14:08:55 +08:00 |
|
钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |
|
钱涛
|
e1629a021e
|
oracle错误和薪资项目错误
|
2022-06-21 15:08:23 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
|
钱涛
|
081747b334
|
考勤引用修复
|
2022-06-13 10:52:32 +08:00 |
|
钱涛
|
33914eae1d
|
解密
|
2022-06-10 18:07:25 +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 |
|
钱涛
|
ec3838a292
|
申报表
|
2022-06-10 13:33:48 +08:00 |
|
钱涛
|
382620c589
|
申报表
|
2022-06-09 19:02:18 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
7f8d317846
|
冲突
|
2022-06-08 18:53:30 +08:00 |
|
钱涛
|
b832910af9
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2022-06-08 18:48:23 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
MustangDeng
|
bfcb9a78f8
|
bug修改
|
2022-06-06 21:21:10 +08:00 |
|
MustangDeng
|
958ffc5aa0
|
福利台账解密问题
|
2022-06-06 20:05:37 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
|
MustangDeng
|
3a1ac7ca93
|
工资单部分分页调整
|
2022-06-06 11:43:46 +08:00 |
|
MustangDeng
|
d0869e5daa
|
工资单部分分页调整
|
2022-06-06 11:40:24 +08:00 |
|
钱涛
|
88a0d08b1f
|
Merge branch 'auth-2' into release
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
|
2022-06-06 10:37:07 +08:00 |
|
钱涛
|
2bfd6c90a0
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
|
2022-06-06 10:23:19 +08:00 |
|
钱涛
|
6646a2e481
|
申报表的分权
|
2022-06-02 18:02:27 +08:00 |
|
钱涛
|
be88b90f56
|
核算的分权
|
2022-06-02 17:10:54 +08:00 |
|
MustangDeng
|
a24cb2e6d6
|
加解密自测问题处理
|
2022-06-02 17:01:26 +08:00 |
|
MustangDeng
|
f80365ddd5
|
Merge branch 'develop' into feature/encrypt
|
2022-06-02 10:35:07 +08:00 |
|
MustangDeng
|
c55cd2d85d
|
工资单详情高级搜索样式优化
|
2022-06-02 10:34:24 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +08:00 |
|
MustangDeng
|
4430d50492
|
工资单及福利问题修复
|
2022-06-01 14:53:16 +08:00 |
|
钱涛
|
7ffc241b0a
|
管理
|
2022-05-31 21:48:00 +08:00 |