 钱涛
|
36e2f96ae5
|
社保方案起始缴纳和最后缴纳生效
|
2022-07-28 14:22:59 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +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 |
|
钱涛
|
a7b61dc7da
|
限制福利核算时的扣缴义务人
|
2022-07-20 18:01:00 +08:00 |
 liuliang
|
6b2c5ba314
|
社保福利台账重新核算
|
2022-07-20 15:40:51 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +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 |
|
钱涛
|
7301ee1033
|
1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
|
2022-07-06 16:42:13 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
03ba0418ab
|
福利核算精度异常
|
2022-07-05 15:04:00 +08:00 |
|
钱涛
|
3e300e62eb
|
修复福利台账补缴功能异常
|
2022-06-29 14:13:23 +08:00 |
|
钱涛
|
f34eaa7c6f
|
修复福利台账总览数据
|
2022-06-28 18:21:44 +08:00 |
|
钱涛
|
b64f34a14c
|
福利核算时只核算当前扣缴义务人的
|
2022-06-28 11:26:01 +08:00 |
|
钱涛
|
12fe1405ba
|
修复工资单导出
|
2022-06-27 18:34:41 +08:00 |
MustangDeng
|
8846346dda
|
台账核算回滚数据
|
2022-06-14 16:05:23 +08:00 |
|
MustangDeng
|
3bedc88f44
|
福利加解密
|
2022-06-10 18:01:55 +08:00 |
|
MustangDeng
|
fcb55bc269
|
fix 冲突
|
2022-06-10 17:15:19 +08:00 |
|
钱涛
|
df7e3febc3
|
冲突
|
2022-06-10 17:03: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 |
|
钱涛
|
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 |
|
MustangDeng
|
e1440e9203
|
台账归档删除
|
2022-06-10 11:46:57 +08:00 |
|
MustangDeng
|
3d43cc3f56
|
归档删除
|
2022-06-10 10:56:09 +08:00 |
|
MustangDeng
|
85f0b1164c
|
福利台账分权
|
2022-06-09 18:31:36 +08:00 |
|
MustangDeng
|
2fe1613868
|
台账核算
|
2022-06-09 15:16:33 +08:00 |
|
MustangDeng
|
69edbc63d1
|
福利台账
|
2022-06-08 17:52:10 +08:00 |
|
MustangDeng
|
e306b6754d
|
福利台账解密问题
|
2022-06-06 19:08:51 +08:00 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +08:00 |
|
MustangDeng
|
d36fb221cc
|
福利档案列表
|
2022-06-06 18:17:34 +08:00 |
|
MustangDeng
|
a24cb2e6d6
|
加解密自测问题处理
|
2022-06-02 17:01:26 +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 |
|
钱涛
|
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
|
968a48eed2
|
取消福利归档前异常数据校验
|
2022-05-26 13:30:23 +08:00 |
|
MustangDeng
|
05dc46894d
|
总览数据不对问题
|
2022-05-26 11:00:38 +08:00 |
|
MustangDeng
|
402a3304cc
|
福利核算数据量过大的情况
|
2022-05-25 13:23:02 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
 Chengliang
|
8a0e4744cd
|
分页
|
2022-04-26 10:06:09 +08:00 |
|
Chengliang
|
906f9a8a36
|
修改保存
|
2022-04-22 18:05:19 +08:00 |
|
Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
|
Chengliang
|
c2c7d2dee5
|
修复方案列表
|
2022-04-22 15:17:31 +08:00 |
|
Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +08:00 |
|
Chengliang
|
651df1842e
|
福利台账导出
|
2022-04-18 20:24:43 +08:00 |
|
Chengliang
|
2d98890c04
|
台账相关列表
|
2022-04-16 16:43:33 +08:00 |
|
Chengliang
|
6ddf60a548
|
福利台账核算接口
|
2022-04-15 13:17:25 +08:00 |
|
Chengliang
|
2eadc713e1
|
薪资台账保存核算
|
2022-04-14 11:54:16 +08:00 |
|
Chengliang
|
0dd6f4ae35
|
福利台账
|
2022-04-12 10:24:21 +08:00 |
|
Chengliang
|
568cc1811e
|
薪资台账列表
|
2022-04-11 19:07:35 +08:00 |