 钱涛
|
c8aa08fc9f
|
档案列表显示扣缴义务人
|
2022-07-14 14:32:59 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +08:00 |
 liuliang
|
758a78996d
|
导入薪酬档案对接流程功能
|
2022-07-13 18:59:30 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
91f1fda342
|
核算档案项不可编辑
|
2022-07-11 18:24:12 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
eab3e9a6a9
|
1、福利列表显示扣税扣缴义务人
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
|
2022-07-07 18:29:52 +08:00 |
|
钱涛
|
9bd1074258
|
1、档案限制应为个税扣缴义务人下的人员
2、个税扣缴义务人未开启分权的情况下显示管理员
|
2022-07-06 10:13:06 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
4fe3a61d5d
|
修复核算工号不显示的问题
|
2022-07-04 18:58:49 +08:00 |
|
钱涛
|
c2c4149442
|
报表接口
|
2022-07-04 15:34:04 +08:00 |
|
钱涛
|
6262aeeb01
|
1、合并计税处理
2、考勤引用不生成空记录
|
2022-06-30 16:15:19 +08:00 |
|
钱涛
|
3e300e62eb
|
修复福利台账补缴功能异常
|
2022-06-29 14:13:23 +08:00 |
|
钱涛
|
f34eaa7c6f
|
修复福利台账总览数据
|
2022-06-28 18:21:44 +08:00 |
|
钱涛
|
4be0d70c4d
|
fix
|
2022-06-28 16:46:42 +08:00 |
|
钱涛
|
e7dc9e1a57
|
限制个税扣缴名字个备注字符数量
|
2022-06-27 13:17:15 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
3682ebd4f2
|
fix
|
2022-06-24 15:18:00 +08:00 |
|
钱涛
|
f680aa27d9
|
fix
|
2022-06-23 18:05:48 +08:00 |
|
钱涛
|
31a8b4bff9
|
fix
|
2022-06-23 17:15:39 +08:00 |
|
钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
MustangDeng
|
c701314f15
|
fix bug 福利方案删除多余的编辑
|
2022-06-16 22:09:50 +08:00 |
|
钱涛
|
dfe8fdf57c
|
fixbug
|
2022-06-16 19:06:45 +08:00 |
|
钱涛
|
17dbef3ef2
|
sql
|
2022-06-15 17:53:12 +08:00 |
|
钱涛
|
b42586600a
|
fix申报表
|
2022-06-15 12:03:17 +08:00 |
|
钱涛
|
cfe2d3c1dc
|
fix申报表
|
2022-06-15 11:02:44 +08:00 |
|
钱涛
|
7955d67da6
|
fix申报表
|
2022-06-15 10:24:46 +08:00 |
|
钱涛
|
0e8c916262
|
保存
|
2022-06-14 16:05:47 +08:00 |
|
钱涛
|
811a90f50d
|
账套项目的顺序性
|
2022-06-14 11:13:31 +08:00 |
|
钱涛
|
1aee6f7ef0
|
往期累计
|
2022-06-10 18:16:11 +08:00 |
|
钱涛
|
33914eae1d
|
解密
|
2022-06-10 18:07:25 +08:00 |
|
钱涛
|
e6c6b8eb57
|
Merge branch 'auth-fl' into release
# Conflicts:
# resource/sql/分权.sql
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2022-06-10 16:58:45 +08:00 |
|
钱涛
|
6ddf483767
|
加解密
|
2022-06-10 16:43:38 +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 |
|
MustangDeng
|
85f0b1164c
|
福利台账分权
|
2022-06-09 18:31:36 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
MustangDeng
|
2d2c993f2a
|
累计附加扣除详情列表没有解密 fix
|
2022-06-09 15:22:49 +08:00 |
|
MustangDeng
|
2fe1613868
|
台账核算
|
2022-06-09 15:16:33 +08:00 |
|
钱涛
|
61346f139b
|
申报和往期异常
|
2022-06-08 17:59:30 +08:00 |
|
MustangDeng
|
69edbc63d1
|
福利台账
|
2022-06-08 17:52:10 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +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 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
|
MustangDeng
|
d3c82acac1
|
发送撤回工资单
|
2022-06-06 13:56:47 +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 |
|
钱涛
|
758e64e6bc
|
档案导入
|
2022-06-01 20:46:51 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
钱涛
|
37a73b94df
|
同步人员
|
2022-06-01 17:45:49 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +08:00 |
|
MustangDeng
|
4430d50492
|
工资单及福利问题修复
|
2022-06-01 14:53:16 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |
|
钱涛
|
5596d88c6f
|
adminUser->AdminUserIds
|
2022-05-31 20:12:25 +08:00 |
|
钱涛
|
69c76ea687
|
Merge branch 'auth-1' into release
|
2022-05-31 18:29:43 +08:00 |
|
钱涛
|
d800ab1925
|
Merge branch 'develop' into release
|
2022-05-31 18:29:34 +08:00 |
|
钱涛
|
3f958d2886
|
暂存
|
2022-05-31 18:27:33 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
MustangDeng
|
560c3c9103
|
cmd 解密转换
|
2022-05-31 16:20:04 +08:00 |
|
MustangDeng
|
df3535c77d
|
和代码build处理
|
2022-05-31 16:02:41 +08:00 |
|
MustangDeng
|
68994ee304
|
Merge branch 'develop' into feature/encrypt
# Conflicts:
# resource/ecology9/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2022-05-31 11:33:36 +08:00 |
|
钱涛
|
0898055d77
|
fix
|
2022-05-31 10:29:18 +08:00 |
|
钱涛
|
8b14038b90
|
分权
|
2022-05-31 09:58:35 +08:00 |
|
钱涛
|
5925fb5606
|
分权
|
2022-05-30 20:13:03 +08:00 |
|
钱涛
|
f8ecb548ed
|
Merge branch 'auth' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SalaryArchiveBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SalaryItemBiz.java
# src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
# src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
# src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/enums/UserStatusEnum.java
# src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
|
2022-05-30 18:50:00 +08:00 |
|
MustangDeng
|
4e4c190f31
|
bug修改
|
2022-05-30 17:31:29 +08:00 |
|
钱涛
|
60ae1ff35b
|
sqlserver
适配
|
2022-05-27 18:07:26 +08:00 |
|
钱涛
|
ad991954cd
|
暂存
|
2022-05-27 11:49:23 +08:00 |
|
钱涛
|
b5d6adfbde
|
暂存
|
2022-05-26 18:16:48 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
钱涛
|
f6eb69e62a
|
暂存
|
2022-05-26 11:02:55 +08:00 |
|
MustangDeng
|
05dc46894d
|
总览数据不对问题
|
2022-05-26 11:00:38 +08:00 |
|
钱涛
|
586fad5f2c
|
分权累计专项附加扣除
|
2022-05-25 16:51:43 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
99fda7ecc3
|
修复调薪记录
|
2022-05-25 11:09:48 +08:00 |
|
钱涛
|
bf364a7639
|
暂存
|
2022-05-24 15:20:12 +08:00 |
|
钱涛
|
082d02ae67
|
Merge branch 'develop' into auth
|
2022-05-24 11:26:37 +08:00 |
|
钱涛
|
f555192e70
|
升级
|
2022-05-24 11:24:21 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
钱涛
|
cb1a53c649
|
暂存
|
2022-05-24 09:14:26 +08:00 |
|
钱涛
|
49cd388df1
|
暂存
|
2022-05-20 15:58:58 +08:00 |
|
钱涛
|
4f36f89e53
|
Merge branch 'develop' into auth
|
2022-05-20 14:56:25 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
钱涛
|
ac934c901c
|
暂存
|
2022-05-19 16:56:57 +08:00 |
|
钱涛
|
2c03d4bc27
|
暂存
|
2022-05-19 16:36:18 +08:00 |
|
钱涛
|
ed0ba7ed6d
|
暂存
|
2022-05-19 14:50:01 +08:00 |
|
MustangDeng
|
14daede3d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 16:37:34 +08:00 |
|
MustangDeng
|
fcbc6c7202
|
福利方案分页创建
|
2022-05-18 16:37:23 +08:00 |
|
钱涛
|
dc1c865a4b
|
账套项目删除bug
|
2022-05-18 14:34:06 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |