Commit Graph

1029 Commits

Author SHA1 Message Date
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 81650888c7 非系统人员 2023-03-15 18:21:04 +08:00
钱涛 ace15ca7a1 非系统人员 2023-03-15 18:03:46 +08:00
Harryxzy 1f9597195f 外部人员-个税扣缴义务人service获取人员信息改变写法 2023-03-15 15:49:20 +08:00
钱涛 c9f6b62b5a Merge branch 'release/2.7.1.2303.02' into feature/外部人员
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
2023-03-15 10:15:49 +08:00
钱涛 5b88cda35c 账套外部人员接入 2023-03-15 09:13:29 +08:00
钱涛 5f465aa914 外部人员范围列表和删除接口 2023-03-14 15:22:50 +08:00
钱涛 5c75b3cf8e 去除无用代码 2023-03-14 14:22:45 +08:00
钱涛 b54d754c4b 删除个税扣缴义务人人员范围改异步 2023-03-14 11:04:25 +08:00
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
钱涛 ad616f80d3 Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员 2023-03-13 16:04:28 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +08:00
Harryxzy 7b0e1cb1f3 employeeService查询外部 fixBug 2023-03-13 15:57:12 +08:00
Harryxzy 32b1a2db48 employeeService查询外部 2023-03-13 15:53:56 +08:00
钱涛 2d091dbd33 异步同步人员校验 2023-03-10 17:15:15 +08:00
Harryxzy 7de5c1e175 Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02 2023-03-10 15:42:42 +08:00
钱涛 d8c13b70d2 内外部人员匹配标识 2023-03-08 18:01:19 +08:00
sy dbf9e878e5 Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02 2023-03-08 17:52:09 +08:00
Harryxzy 401947fabc Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02 2023-03-08 17:50:01 +08:00
钱涛 160116e946 Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员 2023-03-08 16:37:11 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 2c13c138a6 校验每次只能申报一个扣缴义务人 2023-03-07 17:44:21 +08:00
Harryxzy 4ce79438e6 工资单没有工号BUG 2023-03-07 17:43:51 +08:00
Harryxzy 5067d50722 EmployeeBiz修改调用方式-2 2023-03-07 17:20:30 +08:00
Harryxzy 068f7e6535 EmployeeBiz修改调用方式 2023-03-07 17:14:25 +08:00
sy b6ee197fe6 薪酬系统,梳理Mapper类使用方式 2023-03-07 14:21:01 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 a423790a35 获取人员信息 2023-03-06 17:57:20 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
Harryxzy 1cbd1d2958 自定义福利调整 2023-03-03 09:24:44 +08:00
钱涛 ca20ed8ca2 Merge branch 'release/2.6.3.2303.01' into feature/外部人员 2023-03-02 19:48:40 +08:00
sy 7f0d87a017 Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01 2023-03-02 18:14:19 +08:00
钱涛 26b8996d42 公司名 2023-03-02 17:59:58 +08:00
Harryxzy 3f0160ebe5 Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01 2023-03-02 17:19:44 +08:00
Harryxzy 50e1f2c432 Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01 2023-03-02 17:18:10 +08:00
钱涛 6de22b142d 1、工资单模板
2、一键累计
2023-03-02 17:11:42 +08:00
钱涛 fd9b592384 修复核算未分类项目不显示 2023-03-02 11:25:25 +08:00
Harryxzy fdb5774ae4 考勤引用列表改造 2023-03-02 11:23:57 +08:00
Harryxzy 56399c127b 社保福利方案自定义福利列表改造 2023-03-02 10:46:53 +08:00
Harryxzy 5455bc739a Merge branch 'fix/V3_exportAddWorkCode' into develop 2023-03-01 16:20:25 +08:00
Harryxzy e7f2d7b496 薪资档案导出,添加工号 2023-03-01 16:19:09 +08:00
钱涛 14bee7f6d5 修复未分类无法保存 2023-03-01 09:58:55 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00
钱涛 0138351665 修复账套项目可删除 2023-02-27 17:51:26 +08:00
sy 3e2cf917ae Merge branch 'feature/v4-siArchivesChangeByTaxRange-0302' into develop 2023-02-24 14:01:56 +08:00
sy 0e164b7989 薪酬系统-社保福利,福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发,不需打开福利档案列表触发 2023-02-24 13:53:57 +08:00
钱涛 a8cb586358 公式删除校验 2023-02-23 15:48:18 +08:00
钱涛 1c2028f551 公式删除优化 2023-02-23 14:52:24 +08:00
钱涛 e3c1efcc47 sql操作的扩展 2023-02-23 09:19:34 +08:00
钱涛 ee5e5fa127 调薪说明 2023-02-22 19:12:53 +08:00