sy
|
bd3e44442d
|
薪酬系统-福利台账，正常缴纳导出添加工号信息
|
2022-09-27 11:39:57 +08:00 |
|
sy
|
314dc8803c
|
薪酬系统-福利台账，正常缴纳线下对比模板下载功能
|
2022-09-27 10:55:57 +08:00 |
 钱涛
|
68142b4bbb
|
补缴必填校验
|
2022-09-22 14:25:50 +08:00 |
|
sy
|
de150e063e
|
薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码
|
2022-09-21 15:49:55 +08:00 |
|
sy
|
ad3a2b4f69
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-21 14:48:49 +08:00 |
|
sy
|
87b2bab9a9
|
薪酬系统导入方式配置-数据采集-往期累计情况-导入,添加导入人员筛选配置化处理
|
2022-09-21 13:57:58 +08:00 |
|
钱涛
|
0045a0dd59
|
福利的重新核算功能异常
|
2022-09-21 11:12:05 +08:00 |
|
sy
|
78d1bf0554
|
薪酬系统-福利台账导入数据允许出现负数
|
2022-09-21 10:47:07 +08:00 |
|
sy
|
546e976543
|
薪酬系统-福利台账-补缴导入,新旧数据整合bug修复
|
2022-09-20 16:36:01 +08:00 |
|
sy
|
7f557903a8
|
薪酬系统-福利台账-补缴导入
|
2022-09-20 10:13:05 +08:00 |
|
sy
|
7120d80689
|
薪酬系统-福利台账-补缴导入模板开发
|
2022-09-19 17:59:12 +08:00 |
|
sy
|
b0cc2cc19d
|
薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0
|
2022-09-19 15:11:27 +08:00 |
|
sy
|
280c979536
|
薪酬系统-修改导入信息时对于姓名字段的依赖逻辑
|
2022-09-16 15:03:48 +08:00 |
|
sy
|
4d9b7af975
|
薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑
|
2022-09-16 14:21:15 +08:00 |
|
sy
|
c13ca103f3
|
薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理
|
2022-09-15 16:14:34 +08:00 |
|
sy
|
d491288296
|
薪酬系统导入方式配置-各导入模板添加工号字段
|
2022-09-15 10:43:34 +08:00 |
|
sy
|
a6028c51e7
|
福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值
|
2022-09-14 14:36:05 +08:00 |
|
sy
|
8c7a5d477a
|
福利核算干预数据导入功能优化v1
|
2022-09-08 09:43:46 +08:00 |
|
sy
|
8f9a335dd0
|
福利核算干预数据导入预览
|
2022-09-07 14:57:07 +08:00 |
|
sy
|
5a6df5a257
|
福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口
|
2022-09-06 17:13:33 +08:00 |
|
sy
|
3445642489
|
优化薪资核算导入相关的唯一匹配逻辑v3
|
2022-09-02 15:40:05 +08:00 |
|
sy
|
79cab3629e
|
福利核算干预功能开发v1
|
2022-09-02 11:53:38 +08:00 |
|
钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
钱涛
|
1eba64edd6
|
1、福利列表统一为个税扣缴义务人
2、补缴导出无数据
|
2022-08-04 15:09:40 +08:00 |
|
钱涛
|
e9c95918eb
|
1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
|
2022-08-02 14:58:18 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
3ced92cfc5
|
修复福利核算
|
2022-07-21 17:28:47 +08:00 |
 liuliang
|
6b2c5ba314
|
社保福利台账重新核算
|
2022-07-20 15:40:51 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
f3a216027f
|
修复福利台账的分权
|
2022-07-08 11:19:08 +08:00 |
|
钱涛
|
7301ee1033
|
1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
|
2022-07-06 16:42:13 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
f34eaa7c6f
|
修复福利台账总览数据
|
2022-06-28 18:21:44 +08:00 |
|
钱涛
|
17dbef3ef2
|
sql
|
2022-06-15 17:53:12 +08:00 |
MustangDeng
|
fcb55bc269
|
fix 冲突
|
2022-06-10 17:15:19 +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
|
3d43cc3f56
|
归档删除
|
2022-06-10 10:56:09 +08:00 |
|
MustangDeng
|
85f0b1164c
|
福利台账分权
|
2022-06-09 18:31:36 +08:00 |
|
MustangDeng
|
69edbc63d1
|
福利台账
|
2022-06-08 17:52:10 +08:00 |
|
MustangDeng
|
958ffc5aa0
|
福利台账解密问题
|
2022-06-06 20:05:37 +08:00 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +08:00 |
|
MustangDeng
|
d36fb221cc
|
福利档案列表
|
2022-06-06 18:17:34 +08:00 |
|
MustangDeng
|
d3c82acac1
|
发送撤回工资单
|
2022-06-06 13:56:47 +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
|
05dc46894d
|
总览数据不对问题
|
2022-05-26 11:00:38 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |