qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,753 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

954 Commits

Author SHA1 Message Date
sy 4ffca1872a 薪酬系统-福利台账，核算明细列表合计行导出 2023-08-18 17:58:36 +08:00
钱涛 988139610b Merge branch 'release/2.9.4.2308.02' into release/230803对接个税 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/web/SalarySobController.java
 2023-08-18 09:36:26 +08:00
钱涛 d88c43c3c6 人员报送接口 2023-08-18 09:27:16 +08:00
钱涛 0d8606c956 在线申报接口 2023-08-17 19:04:20 +08:00
钱涛 914963135a 个税对接辅助缴款 2023-08-17 14:55:32 +08:00
sy 63023ae8e6 薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示 2023-08-17 11:31:38 +08:00
钱涛 414f960346 账套-个税字段对应、累计字段对应 2023-08-17 09:22:09 +08:00
钱涛 cf22685fca 账套-个税字段对应、累计字段对应 2023-08-15 20:48:09 +08:00
钱涛 81dae66ea2 个税对接，个税申报接口 2023-08-14 21:03:40 +08:00
钱涛 b1817142b0 个税对接，个税申报接口 2023-08-14 20:07:29 +08:00
Harryxzy 19cb2d9622 Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-14 09:19:20 +08:00
Harryxzy 7ebb8d6618 Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01 2023-08-14 09:19:04 +08:00
钱涛 dc63897165 个税对接，个税申报接口 2023-08-11 14:20:14 +08:00
钱涛 615813c478 个税对接，人员报送相关接口 2023-08-09 18:35:09 +08:00
钱涛 827420c2bd 个税对接，人员报送相关接口 2023-08-08 19:39:53 +08:00
sy 9f021b6d5e 薪酬系统-福利档案，修复非系统人员增量数据造成的bug 2023-08-08 15:03:52 +08:00
Harryxzy 6a01f0d785 Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名 2023-08-08 11:42:41 +08:00
Harryxzy fa7eb0ee60 Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造 2023-08-08 11:06:06 +08:00
Harryxzy 58eaddc33e 人员信息报送temp 2023-08-08 09:21:14 +08:00
sy 8c9049f1f7 Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 15:26:24 +08:00
Harryxzy 190771037e fixbug 2023-08-04 09:33:17 +08:00
sy 3f10c8eb96 Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01 2023-08-02 15:41:33 +08:00
sy 293297ad7f 薪酬系统-福利台账，线下对比导入分批,列表逻辑优化 2023-08-01 15:37:32 +08:00
Harryxzy 3827c8963d fix补发模板问题 2023-07-31 17:07:21 +08:00
Harryxzy b7203625c1 自定义工资项目展示名fix 添加 2023-07-31 10:47:00 +08:00
Harryxzy f282f1a3ab 自定义工资项目展示名 2023-07-28 17:51:50 +08:00
Harryxzy 02628d8224 薪资账套-薪资项目编辑fixBUG 2023-07-28 17:43:14 +08:00
sy 007d6df3cd 薪酬系统-非系统人员管理，非系统人员导入 2023-07-28 10:12:59 +08:00
sy 80f4f7d43b 薪酬系统-非系统人员管理，非系统人员导入模板 2023-07-27 09:39:03 +08:00
Harryxzy 7763f16c0f 薪资账套薪资项目编辑功能 2023-07-26 13:43:53 +08:00
Harryxzy da18b0f884 薪资账套项目页面改造temp 2023-07-25 16:46:57 +08:00
Harryxzy a8a414a48b 薪资账套项目页面改造temp 2023-07-24 17:11:19 +08:00
sy ea4b603c36 薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期 2023-07-24 11:26:36 +08:00
Harryxzy ad6a571310 自定义工资项目展示名fix 2023-07-21 11:08:54 +08:00
Harryxzy 19c297dfe9 自定义工资项目展示名fix补发 2023-07-20 15:57:27 +08:00
Harryxzy fd3abc7f65 自定义工资项目展示名 2023-07-20 14:12:33 +08:00
钱涛 38f3461c64 v1 2023-07-20 14:05:19 +08:00
Harryxzy b95663ada8 自定义工资项目展示名 2023-07-20 10:42:16 +08:00
钱涛 e75d5ab427 v1 2023-07-20 10:36:29 +08:00
钱涛 c0660e5476 暂存 2023-07-20 10:36:28 +08:00
sy c7fe4fee23 Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02 2023-07-20 10:19:40 +08:00
钱涛 01b02531ce Merge branch 'feature/外部人员' into release/2.9.2.2307.02 
# Conflicts:
#	src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-20 10:08:05 +08:00
Harryxzy 8e6bd24d0d 自定义工资项目展示名 2023-07-19 16:14:25 +08:00
Harryxzy 0a4c19fb36 Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02 2023-07-19 11:11:46 +08:00
sy 4b503513f2 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出 2023-07-19 10:04:58 +08:00
Harryxzy 78e5d37cf3 薪资项目-核算时隐藏 2023-07-18 17:22:42 +08:00
Harryxzy db9a0e22eb 薪资项目-核算时隐藏fixbug 2023-07-18 17:00:09 +08:00
Harryxzy bbb8417008 自定义工资项目展示名temp 2023-07-18 16:28:29 +08:00
Harryxzy d551f5ae76 薪资项目核算时隐藏 2023-07-18 14:03:59 +08:00
Harryxzy b8f44dd5b6 薪资项目核算时隐藏 2023-07-18 11:00:13 +08:00
Harryxzy 88892f1aac 工资单反馈fixBug 2023-07-17 12:36:20 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
Harryxzy faf9636a0d 薪资项目-核算时隐藏 temp 2023-07-14 11:34:53 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
sy c78c8375f0 薪酬系统-薪资核算，自定义导出字段 2023-07-12 15:20:02 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
sy 47dc9e35bd 薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑 2023-07-11 17:56:45 +08:00
钱涛 aec6918c12 Merge branch 'release/2.9.1.2307.01' into feature/外部人员 
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
#	src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
#	src/com/engine/salary/wrapper/SalarySendWrapper.java
#	src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2023-07-11 16:08:15 +08:00
Harryxzy 33a0723ad2 Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-11 15:29:21 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
sy c28f782f19 Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 11:11:15 +08:00
sy 83604ba534 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-07-11 11:10:32 +08:00
sy a55ca5182e Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 09:59:29 +08:00
sy b705161492 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复 2023-07-10 14:33:43 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +08:00
sy b92c7ff599 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参 2023-07-07 15:32:12 +08:00
sy 9c34fb9497 薪酬系统-薪资核算，搜索条件新增字段 2023-07-07 11:47:43 +08:00
Harryxzy 40fc4ea13c 工资单定时发送 调整周期类型 2023-07-05 11:39:54 +08:00
Harryxzy 896e0c9e34 工资单定时发送 添加 发放周期 2023-07-05 09:59:45 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
钱涛 a37d6758bb 核算状态标识 2023-07-03 14:27:20 +08:00
钱涛 1403b22cf7 修复邮件保存 2023-07-03 14:02:34 +08:00
Harryxzy 11c416601d 工资单定时发送渲染bug 2023-07-03 11:21:49 +08:00
Harryxzy faa2b9c16e 工资单模板信息 2023-07-03 09:44:10 +08:00
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
sy 041303275b Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:09:12 +08:00
sy d65a792076 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:05:22 +08:00
sy 1ed02f4d07 薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消 2023-06-27 15:05:07 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2023-06-26 13:54:56 +08:00
Harryxzy ca248ded98 发送邮件修复bug 2023-06-26 13:32:14 +08:00
Harryxzy 7c44a2ad6b Merge branch 'feature/waterMark' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/web/SalaryBillController.java
 2023-06-26 13:28:21 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
sy cbcd53d92d 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-06-26 10:56:03 +08:00
sy f2cca4cfd7 Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG 2023-06-26 10:15:24 +08:00
钱涛 50fa724756 采用线程池发送邮件 2023-06-26 10:11:54 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
Harryxzy d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
钱涛 8612f0e5b2 Merge branch 'release/2.8.4.2306.02' into feature/短信验证码 2023-06-16 14:54:24 +08:00
Harryxzy 512510c623 考勤引用校验能够否删除 2023-06-16 11:49:23 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy b60904cc03 水印 - 邮件水印不支持图片 2023-06-12 18:55:27 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
Harryxzy c37750b538 撤回个税申报 2023-06-12 10:40:01 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
Harryxzy b2f39f56e2 Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01 2023-06-09 09:50:25 +08:00
Harryxzy 5bee0f3b4d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-09 09:48:56 +08:00
Harryxzy e24579f363 Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01 2023-06-09 09:48:27 +08:00
Harryxzy e464ca8ba6 薪资账套中薪资项目可以删除 2023-06-08 15:30:52 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
Harryxzy 94edee7f8c Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01 2023-06-08 09:03:21 +08:00
钱涛 7701420430 邮件去除图片 2023-06-07 17:19:00 +08:00
Harryxzy deaa9acfa0 Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective 2023-06-07 15:44:51 +08:00
Harryxzy 4617005e1f 数据透视功能 2023-06-07 15:43:23 +08:00
钱涛 77e9b0a74b Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-07 15:12:40 +08:00
Harryxzy a6356a7d3d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-07 12:27:29 +08:00
Harryxzy f4627b53f9 fix没有公式id内容bug 2023-06-07 12:23:05 +08:00
钱涛 d4c8a66fcf 注释优化 2023-06-07 09:31:46 +08:00
Harryxzy 1584a27fe8 个税扣缴义务人排序 2023-06-06 14:44:00 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +08:00
Harryxzy 0d3a48e7ea 个税扣缴义务人排序 2023-06-05 15:14:25 +08:00
钱涛 91e3b335dd 工资单通道 2023-06-05 13:35:17 +08:00
Harryxzy 30e2c489ea Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-05 09:52:57 +08:00
sy f8e9e8513d Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01 2023-06-05 09:17:54 +08:00
钱涛 0da2bfa55a 邮件暂存 2023-06-02 14:38:56 +08:00
Harryxzy 74c5b4f19f 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
钱涛 4be4acc5d8 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2023-06-01 11:49:16 +08:00
钱涛 0472c7b757 显示字段管理默认使用列 
报表空数据处理
 2023-06-01 11:05:15 +08:00
sy fb03cf98a7 薪酬系统，福利台账、薪资档案、薪资核算增加工号查询 2023-05-31 11:49:40 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
Harryxzy af07cfd930 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-05-25 17:12:15 +08:00
Harryxzy 25ffd06dd4 修复编辑薪资核算没有未分类 2023-05-25 17:06:03 +08:00
钱涛 399a615be6 人员明细 2023-05-25 13:51:27 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
Harryxzy a916e061d8 Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02 2023-05-22 14:03:22 +08:00
Harryxzy c7bdbe7b85 Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-05-22 14:03:07 +08:00
Harryxzy 20262169c9 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02 2023-05-22 14:02:28 +08:00
钱涛 1534b0257d Merge branch 'feature/公式v2' into release/2.8.2.2305.02 2023-05-17 15:08:16 +08:00
钱涛 7ccf8cf607 字段管理不显示默认使用列 2023-05-17 14:59:12 +08:00
钱涛 a7cc99fdd3 公式异常信息 2023-05-16 18:01:38 +08:00
Harryxzy 083916eb0c 薪资核算编辑 带上公式 2023-05-16 15:41:11 +08:00
Harryxzy a3ee91db15 回算后不允许删除薪资核算记录 2023-05-16 15:05:02 +08:00
Harryxzy a6fc40a084 薪资核算 编辑列改造 2023-05-16 14:12:49 +08:00
Harryxzy 7c74149184 薪资核算导入 选择字段根据分类分组 2023-05-15 18:02:22 +08:00
Harryxzy 4ff15ca651 薪资核算结果编辑导入 记录 2023-05-15 10:28:17 +08:00
Harryxzy b0084cad9c 薪资核算编辑 手动编辑后自动锁定 2023-05-11 14:40:10 +08:00
Harryxzy 54ca46c653 薪资核算导入项自动锁定 2023-05-11 10:51:43 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
钱涛 6b19445a1a Merge branch 'release/2.8.2.2305.02' into feature/公式 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
 2023-05-08 11:22:23 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
钱涛 7e940b4db4 减少单次核算的人员 2023-05-05 17:15:25 +08:00
钱涛 41e95ceadf 字段管理不显示id 2023-05-05 15:32:55 +08:00
钱涛 2d8b4b07d0 Merge branch 'release/2.7.4.2304.02' into feature/报表 
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
 2023-04-28 10:49:33 +08:00
钱涛 d36cfe31b3 报表暂存 2023-04-27 16:05:03 +08:00
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
钱涛 77ce806b37 sysadmin不显示申报记录 2023-04-25 10:43:40 +08:00
钱涛 24dfa57850 报表 2023-04-24 14:09:27 +08:00
钱涛 36863c3695 报表 2023-04-23 10:14:32 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
sy 62af02522c 薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
钱涛 f619878f2c 暂存 2023-04-17 10:10:39 +08:00
钱涛 5cb6752c4c Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 17:32:17 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +08:00
钱涛 2d8b538897 Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表 2023-04-13 14:54:22 +08:00
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +08:00
钱涛 59a38954bc Merge branch 'feature/个人养老金' into release/2.7.3.2304.01 
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
 2023-04-13 09:35:29 +08:00
钱涛 58dbdb0d05 养老金 2023-04-12 09:39:53 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
Harryxzy e21b53c2df Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01 2023-04-11 14:00:26 +08:00
钱涛 e8ae952f18 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 
# Conflicts:
#	src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
 2023-04-11 11:41:30 +08:00
Harryxzy a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
钱涛 ce0b8ce186 暂存 2023-04-10 12:43:48 +08:00
Harryxzy d9f041c9bb 账套删除前校验是否存在工资单模板 2023-04-07 16:06:47 +08:00
钱涛 b30a58c1d9 报表功能 2023-04-07 14:38:38 +08:00
sy add7051759 薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件 2023-04-04 16:28:15 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
Harryxzy 295331d1a5 按照工号导入，支持不输入姓名 2023-03-30 09:49:49 +08:00
Harryxzy 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +08:00
钱涛 052eebe83a 解决工资单人名缺失 2023-03-16 19:17:33 +08:00
钱涛 f79569fe4f 解决工资单人名缺失 2023-03-16 17:19:02 +08:00
Harryxzy 3304ffdbd5 薪资核算导入，添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
钱涛 8430397d03 外部人员终极版 2023-03-16 16:10:29 +08:00
钱涛 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
钱涛 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
钱涛 6f9769bae2 手机号 2023-03-15 10:07:40 +08:00
钱涛 5b88cda35c 账套外部人员接入 2023-03-15 09:13:29 +08:00
钱涛 5f465aa914 外部人员范围列表和删除接口 2023-03-14 15:22:50 +08:00
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +08:00
Harryxzy 351d892281 Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02 2023-03-10 15:43:24 +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
Harryxzy 8dabfb28b9 个税扣缴义务人删除人员范围时，不设置最后发薪日期 2023-03-10 13:50:52 +08:00
钱涛 ff4dfe4dad fix日期转换，申报表所属月不显示 2023-03-08 17:53:13 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 88de36f260 Merge branch 'release/2.7.1.2303.02' into feature/外部人员 2023-03-06 13:59:36 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
Harryxzy 762c484d36 个税扣缴义务人名称扩充至40 2023-03-03 15:47:30 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
Harryxzy 1cbd1d2958 自定义福利调整 2023-03-03 09:24:44 +08:00