李栋
|
fc94b50c60
|
薪资档案加密设置
|
2022-10-17 11:14:21 +08:00 |
sy
|
b16133f61a
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-17 10:13:59 +08:00 |
|
sy
|
8fa59c2cf9
|
薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整
|
2022-10-17 10:13:38 +08:00 |
 钱涛
|
5102d51b09
|
Merge branch 'feature/archive' into develop
|
2022-10-17 10:03:58 +08:00 |
|
sy
|
8d9a00bfff
|
薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整
|
2022-10-14 18:00:22 +08:00 |
|
sy
|
3d714c2b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 16:34:25 +08:00 |
|
sy
|
8a0e72f99c
|
薪酬系统-福利档案结构改造，档案列表接口返回结果优化
|
2022-10-14 16:34:10 +08:00 |
|
钱涛
|
77fc944491
|
获取保存档案配置表单
保存档案配置
|
2022-10-14 16:18:55 +08:00 |
Harryxzy
|
5233c85c81
|
Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop
|
2022-10-14 15:32:30 +08:00 |
|
Harryxzy
|
989dd13216
|
xzy-修改自定义福利名称
|
2022-10-14 15:17:56 +08:00 |
|
sy
|
4701c4de5c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 14:31:35 +08:00 |
|
sy
|
e61d4f21c7
|
薪酬系统-福利档案结构改造，待减员页面的减员功能
|
2022-10-14 14:31:09 +08:00 |
|
sy
|
0e6520f838
|
薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能
|
2022-10-13 17:36:15 +08:00 |
|
钱涛
|
0e05185599
|
操作接口
|
2022-10-13 16:24:59 +08:00 |
|
sy
|
1aaa8ce43e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:58:42 +08:00 |
|
钱涛
|
68076fc724
|
fix sqlserver增量数据空
|
2022-10-13 14:57:52 +08:00 |
|
sy
|
053ac67604
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:45:38 +08:00 |
|
李栋
|
708a947449
|
薪资档案加密设置加进度
|
2022-10-12 14:24:01 +08:00 |
|
sy
|
187508c0f9
|
薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能
|
2022-10-12 10:38:41 +08:00 |
|
钱涛
|
a18b008581
|
Merge branch 'develop' into feature/archive
|
2022-10-11 14:43:21 +08:00 |
|
sy
|
b2284d6669
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-11 09:03:46 +08:00 |
|
钱涛
|
ab575db152
|
Merge branch 'develop' into feature/archive
|
2022-10-10 17:36:29 +08:00 |
|
sy
|
a7b47a8bfe
|
薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2
|
2022-10-10 17:11:44 +08:00 |
|
钱涛
|
824c3ca565
|
薪资列表
|
2022-10-10 15:40:51 +08:00 |
|
钱涛
|
816885609d
|
薪资列表
|
2022-10-10 15:15:23 +08:00 |
|
钱涛
|
41203342d0
|
薪资列表
|
2022-10-10 14:58:29 +08:00 |
|
李栋
|
60396e90a3
|
薪资档案加密设置
|
2022-10-10 09:43:57 +08:00 |
|
sy
|
98a297ef27
|
薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复
|
2022-09-30 15:40:15 +08:00 |
|
sy
|
1e476e06a5
|
薪酬系统-福利台账，线下对比结果列表导出v1
|
2022-09-29 17:32:04 +08:00 |
|
sy
|
a44a48450b
|
薪酬系统-福利台账，线下对比结果列表开发优化v1
|
2022-09-29 15:11:13 +08:00 |
|
sy
|
44e4afbf72
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
# Conflicts:
# src/com/engine/salary/mapper/InsuranceExportMapper.java
# src/com/engine/salary/mapper/InsuranceExportMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-09-29 11:29:17 +08:00 |
|
sy
|
cec887a214
|
薪酬系统-福利台账，线下对比结果列表开发
|
2022-09-29 11:13:49 +08:00 |
|
钱涛
|
e48f576617
|
显示应用设置接口
|
2022-09-28 10:08:51 +08:00 |
|
钱涛
|
dfeb3fc5e4
|
修复薪资档案导出全部
|
2022-09-28 09:26:26 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
sy
|
78ce712116
|
薪酬系统-福利台账，线下对比excel数据导入功能
|
2022-09-27 17:36:06 +08:00 |
|
sy
|
314dc8803c
|
薪酬系统-福利台账，正常缴纳线下对比模板下载功能
|
2022-09-27 10:55:57 +08:00 |
|
钱涛
|
66a39a07a3
|
Merge branch 'feature/order' into develop
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
|
2022-09-27 10:25:12 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
|
sy
|
e6c2dd502c
|
薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复
|
2022-09-23 16:08:41 +08:00 |
|
钱涛
|
6717a8235a
|
我的薪资福利翻页问题
|
2022-09-22 16:04:48 +08:00 |
|
钱涛
|
1573fc5bcf
|
人员状态枚举适配
|
2022-09-22 11:42:02 +08:00 |
|
钱涛
|
b812454cd3
|
人员校验规则
|
2022-09-22 10:10:18 +08:00 |
|
Harryxzy
|
183e63140a
|
xzy-月度绩效环比增加人员导出功能
|
2022-09-20 16:18:43 +08:00 |
|
sy
|
5b74873a6e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-20 10:34:43 +08:00 |
|
sy
|
7120d80689
|
薪酬系统-福利台账-补缴导入模板开发
|
2022-09-19 17:59:12 +08:00 |
|
钱涛
|
bc1e874a1c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2022-09-19 16:45:10 +08:00 |
|
钱涛
|
830e099b57
|
排序规则
|
2022-09-19 16:44:32 +08:00 |
|
Harryxzy
|
44b3c76a8e
|
xzy-同比增加人员
|
2022-09-19 16:05:59 +08:00 |
|
sy
|
ff4884fbb9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-19 15:13:42 +08:00 |
|
sy
|
f54481bbf1
|
薪酬系统-福利台账补缴功能开发v1
|
2022-09-19 15:13:30 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |
|
钱涛
|
b61b83976d
|
1、系统详情接口
|
2022-09-15 15:41:48 +08:00 |
|
钱涛
|
d238502b2c
|
1、修复线下对比
2、系统配置
|
2022-09-15 15:15:34 +08:00 |
|
钱涛
|
8c0b9038d6
|
1、系统配置列表
2、修复调薪周期对于核算的结果不准确
|
2022-09-14 11:28:17 +08:00 |
|
钱涛
|
198075209e
|
1、核算、合并计税使用税款所属期作为依据
2、核算列表分页
|
2022-09-13 16:03:55 +08:00 |
|
钱涛
|
243d8e0d6b
|
批量调薪前置校验
|
2022-09-07 16:35:57 +08:00 |
|
钱涛
|
572c4cb9f1
|
调薪前置校验
|
2022-09-07 16:12:43 +08:00 |
|
sy
|
1b34914e13
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-07 14:57:46 +08:00 |
|
sy
|
8f9a335dd0
|
福利核算干预数据导入预览
|
2022-09-07 14:57:07 +08:00 |
|
钱涛
|
06f6dcf8f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-07 09:46:02 +08:00 |
|
钱涛
|
8ff4e9e231
|
停薪操作
|
2022-09-07 09:45:37 +08:00 |
|
sy
|
d4886c0d46
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-06 17:14:31 +08:00 |
|
sy
|
5a6df5a257
|
福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口
|
2022-09-06 17:13:33 +08:00 |
|
钱涛
|
e372173b74
|
获取系统配置接口
|
2022-09-05 17:20:57 +08:00 |
|
sy
|
79cab3629e
|
福利核算干预功能开发v1
|
2022-09-02 11:53:38 +08:00 |
|
Harryxzy
|
6809839a2c
|
Merge branch 'feature/addSalaryShowSwitch_xzy' into develop
|
2022-08-25 09:38:59 +08:00 |
|
钱涛
|
a4e6042adf
|
调薪流程按钮
|
2022-08-24 20:00:57 +08:00 |
|
钱涛
|
7dfe9ee732
|
福利方案分权
|
2022-08-24 12:03:04 +08:00 |
|
Harryxzy
|
289e685e09
|
xzy-薪资项目显隐控制
|
2022-08-24 10:31:42 +08:00 |
|
Harryxzy
|
4d0a73e030
|
xzy-解决社保福利方案删除时校验问题
|
2022-08-18 12:26:53 +08:00 |
|
钱涛
|
7d79dcdfc2
|
修复社保福利列表高级搜索
|
2022-08-11 10:27:15 +08:00 |
|
钱涛
|
99c0806b73
|
支持外部数据源
|
2022-08-03 10:47:26 +08:00 |
|
钱涛
|
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 |