 钱涛
|
c4831a1612
|
支持外部数据源
|
2022-08-03 10:08:43 +08:00 |
|
钱涛
|
e9c95918eb
|
1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
|
2022-08-02 14:58:18 +08:00 |
 liuliang
|
28cc6e67f4
|
Merge branch 'feature_liuliang_20220726' into develop
|
2022-07-28 16:31:02 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
e7968f2545
|
1、公共枚举接口
2、薪资档案封存标识
|
2022-07-26 18:01:39 +08:00 |
|
liuliang
|
eb6f0b81ca
|
删除社保方案福利功能
|
2022-07-26 16:14:24 +08:00 |
|
liuliang
|
9602ed1d87
|
Merge branch 'feature_liuliang_20220720' into develop
|
2022-07-25 14:34:31 +08:00 |
|
liuliang
|
c8ae60533e
|
导入修改
|
2022-07-25 14:33:35 +08:00 |
|
liuliang
|
03c163bd91
|
Merge branch 'feature_liuliang_20220720' into develop
|
2022-07-25 11:14:24 +08:00 |
|
liuliang
|
341b122fe7
|
导入可以带出数据功能
|
2022-07-25 09:57:15 +08:00 |
|
liuliang
|
6b2c5ba314
|
社保福利台账重新核算
|
2022-07-20 15:40:51 +08:00 |
|
liuliang
|
6cda380aa2
|
Merge branch 'fix_liuliang_20220719' into develop
|
2022-07-19 14:23:08 +08:00 |
|
liuliang
|
76661474c4
|
修改社保福利台账导出按钮无法正确导出bug
|
2022-07-19 14:05:25 +08:00 |
|
钱涛
|
cd7684120b
|
福利核算
|
2022-07-19 11:36:19 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
7301ee1033
|
1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
|
2022-07-06 16:42:13 +08:00 |
|
钱涛
|
3c3c679757
|
获取个税扣缴义务人下的实际人员配置接口
|
2022-07-06 10:52:37 +08:00 |
|
钱涛
|
053c436d49
|
获取薪酬版本信息
|
2022-07-05 16:56:09 +08:00 |
|
钱涛
|
190d6da1b2
|
操作实际管理的个税扣缴人
|
2022-07-05 15:31:18 +08:00 |
|
钱涛
|
c372fff59c
|
系统异常处理
|
2022-07-01 15:18:29 +08:00 |
|
钱涛
|
7b468045c8
|
1、限制核算的人员范围
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
|
2022-06-29 17:38:00 +08:00 |
|
钱涛
|
12fe1405ba
|
修复工资单导出
|
2022-06-27 18:34:41 +08:00 |
|
钱涛
|
bcc44fe65e
|
fix
|
2022-06-27 14:45:23 +08:00 |
|
钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
|
钱涛
|
811a90f50d
|
账套项目的顺序性
|
2022-06-14 11:13:31 +08:00 |
|
钱涛
|
b78e96c875
|
考勤列表适配sqlserver
|
2022-06-13 15:37:52 +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 |
|
钱涛
|
ec3838a292
|
申报表
|
2022-06-10 13:33:48 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
MustangDeng
|
69edbc63d1
|
福利台账
|
2022-06-08 17:52:10 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +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 |
|
钱涛
|
be88b90f56
|
核算的分权
|
2022-06-02 17:10:54 +08:00 |
|
MustangDeng
|
da2a0e5d22
|
工资单及福利问题修复
|
2022-06-01 19:13:20 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
钱涛
|
019ad96871
|
其他扣除
|
2022-05-31 11:21:51 +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 |
|
钱涛
|
841ca27c84
|
暂存
|
2022-05-27 17:21:39 +08:00 |
|
钱涛
|
71ea4b8609
|
导入
|
2022-05-27 15:43:38 +08:00 |
|
钱涛
|
c4c04ac87a
|
暂存
|
2022-05-27 14:46:01 +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 |
|
钱涛
|
90a6bd9921
|
暂存
|
2022-05-25 13:49:25 +08:00 |