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

652 Commits

Author SHA1 Message Date
sy b705161492 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复 2023-07-10 14:33:43 +08:00
Harryxzy 467746f7df Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-10 11:12:03 +08:00
Harryxzy 584ebbc562 暂存 2023-07-10 11:11:52 +08:00
Harryxzy 0e2a6c8368 Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01 
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-10 11:10:10 +08:00
Harryxzy e90bd66489 Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01 2023-07-10 10:09:38 +08:00
sy b92c7ff599 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参 2023-07-07 15:32:12 +08:00
sy fa28db9c79 薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复 2023-07-07 10:15:23 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
Harryxzy 04592a58b4 Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw 
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-06-29 16:40:07 +08:00
Harryxzy ba85231656 个税申报撤回开关-1 2023-06-29 16:38:50 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +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 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 3be6eaa16f Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02 2023-06-26 13:26:03 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
钱涛 8612f0e5b2 Merge branch 'release/2.8.4.2306.02' into feature/短信验证码 2023-06-16 14:54:24 +08:00
Harryxzy 3096954628 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 14:40:36 +08:00
钱涛 2480525fa6 修复同步档案bug 
缓存公共接口
 2023-06-15 10:44:31 +08:00
钱涛 912c80c97f 验证方式 2023-06-14 16:15:05 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +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 e24579f363 Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01 2023-06-09 09:48:27 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
Harryxzy 4617005e1f 数据透视功能 2023-06-07 15:43:23 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
Harryxzy 74c5b4f19f 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
钱涛 0734b5ce01 公式des 2023-05-26 15:40:08 +08:00
钱涛 39ee8d9d35 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 14:45:04 +08:00
钱涛 64be49c61c 工资单适配微信 2023-05-22 10:12:23 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10:12 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
钱涛 f47ad2a7a3 注释接口 2023-04-25 18:04:05 +08:00
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
sy 62af02522c 薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +08:00
钱涛 deb2e367f4 薪酬上下文 2023-04-13 11:53:08 +08:00
Harryxzy bbe7edaa22 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-04-11 13:56:18 +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 d5f6d053b3 修复累计专项附加扣除导出全部bug 2023-04-06 16:20:58 +08:00
Harryxzy accb0d3d2b 社保福利台账 - 合计列 2023-04-04 17:21:29 +08:00
sy 521db08cde Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01 
# Conflicts:
#	src/com/engine/salary/service/SalaryAcctExcelService.java
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
 2023-04-03 15:59:58 +08:00
Harryxzy 530dcd7028 Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01 2023-03-27 17:36:41 +08:00
Harryxzy 3304ffdbd5 薪资核算导入，添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
sy dc2cb5f448 薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
Harryxzy 6a7e5eacdc 社保福利台账合计列 2023-03-16 11:17:18 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 ace15ca7a1 非系统人员 2023-03-15 18:03:46 +08:00
钱涛 50c15989c6 Merge branch 'release/2.7.1.2303.02' into feature/外部人员 2023-03-15 16:15:48 +08:00
Harryxzy 712f30ddfa 工资单发放详情合计列 2023-03-15 16:00:37 +08:00
钱涛 db09f8047e 注释 2023-03-15 11:04:54 +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
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +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
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
Harryxzy 56399c127b 社保福利方案自定义福利列表改造 2023-03-02 10:46:53 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00
钱涛 5feed81803 Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02 2023-02-09 17:31:34 +08:00
sy ba267d9dce Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02 2023-02-09 17:24:29 +08:00
fcli 308a44a9a6 Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02 2023-02-09 17:23:07 +08:00
钱涛 b6429eb41c 通过id查询工资单详情 2023-02-09 17:05:07 +08:00
fcli 003dfe0d35 feat: 请求方式修改 2023-02-02 15:47:17 +08:00
fcli dec7c89856 feat: 发放模板获取可用分组或项目 2023-02-01 11:22:38 +08:00
sy 63ae86978f 薪酬系统-福利档案，导出excel文件名添加日期信息 2023-01-30 09:31:31 +08:00
fcli 80019a029c feat: 获取部分字段 2023-01-28 13:56:02 +08:00
fcli bd2597541d feat: 字段管理 2023-01-18 09:38:43 +08:00
钱涛 2a52671451 支持钉钉打开工资单 2023-01-12 15:47:20 +08:00
sy 0feacffa11 Merge remote-tracking branch 'remotes/origin/feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01 2023-01-12 13:44:30 +08:00
Harryxzy 2b3752a554 Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01 2023-01-12 09:25:06 +08:00
sy 197dbd8c8a 薪酬系统-福利档案，导入模板下载功能入参调整 2023-01-10 15:42:24 +08:00
sy 884da3dfb3 薪酬系统-福利档案，导入模板下载接口优化 2023-01-09 17:51:54 +08:00
sy 97230052b3 薪酬系统-福利档案，导入和导出的excel表头添加导入或导出，并且后缀添加tab页标签 2023-01-09 17:30:49 +08:00
Harryxzy fd470c56aa 薪资账套人员范围导入 2023-01-09 15:12:44 +08:00
Harryxzy c47d3f4ade 下载模板改为get请求 2023-01-09 10:30:26 +08:00
Harryxzy 09ba495bf3 个税扣缴义务人批量导入功能 2023-01-09 10:01:47 +08:00
钱涛 9dac777d5f Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01 
# Conflicts:
#	src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
 2023-01-06 14:41:42 +08:00
sy 84aeb5059f 薪酬系统-福利台账，调差方式3时的福利项 2022-12-28 17:01:15 +08:00
sy 494462092d 薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能 2022-12-27 17:34:46 +08:00
sy d2be8e86ea Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-22 09:09:00 +08:00
Harryxzy 0130b83f00 Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2022-12-14 12:21:42 +08:00
sy 1e31dad7ad 薪酬系统-福利档案，待减员页面删除待办功能优化 2022-12-13 16:58:35 +08:00
钱涛 4d677b4d58 mock公式运行 2022-12-13 16:13:45 +08:00
钱涛 c3cb3105fd 暂存 2022-12-13 10:53:43 +08:00
sy 1b376464c4 薪酬系统-福利档案，删除待办功能（待减员页面） 2022-12-12 15:43:12 +08:00
sy ae72d25431 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-12 13:43:16 +08:00
sy 43157d25e3 薪酬系统-福利台账，补差列表v1 2022-12-09 14:50:29 +08:00
fcli 8e2e85a986 Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01 2022-12-08 16:43:06 +08:00
fcli cc105ca051 Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01 2022-12-08 16:41:04 +08:00
sy 0399731b9b Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01 2022-12-08 16:25:28 +08:00
sy 0210f6542f 薪酬系统-福利台账，补差数据删除v1 2022-12-08 16:23:18 +08:00
sy ab6c0940c2 薪酬系统-福利台账，补差数据导出功能 2022-12-08 14:51:23 +08:00
sy ccfffc200e 薪酬系统-福利台账，补差数据导入功能 2022-12-07 17:09:53 +08:00
钱涛 cdb7f3a0a2 sql测试 2022-12-07 15:47:35 +08:00
Harryxzy c0d916c286 薪资回算功能，工资单部分 2022-12-06 15:29:08 +08:00
sy 3fa017b13a 薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能 2022-12-06 11:44:04 +08:00
sy a04f4a915f 薪酬系统-福利台账，可调差人员列表功能取消分页逻辑 2022-12-05 15:42:49 +08:00
Harryxzy 3ff3fd8e44 薪资回算-薪资核算部分（剩余核算归档） 2022-12-02 17:35:14 +08:00
钱涛 991338a10e 合计行异步处理 2022-12-02 16:58:19 +08:00
sy 4d01c324e0 薪酬系统-福利台账，社保调差保存功能优化 2022-11-30 15:05:24 +08:00
sy a0bda933a1 薪酬系统-福利台账，社保调差项公司支出费用统计功能 2022-11-29 17:36:18 +08:00
sy 2ceeeb165f 薪酬系统-福利台账，社保调差列表v1 2022-11-29 15:33:57 +08:00
fcli 4f9e2d8f80 feat: 路径修改接近e10 2022-11-29 14:36:37 +08:00
sy 8bc16ae470 Merge branch 'master' into feature/v3-siAccountCompensation-1201 2022-11-28 14:58:23 +08:00
sy 1747a613dd 薪酬系统-福利台账，社保调差撤回v1 2022-11-28 14:57:29 +08:00
sy 49466f9f3b 薪酬系统-福利台账，社保调差默认配置保存v1 2022-11-28 13:42:53 +08:00
sy 8d211c7db0 薪酬系统-福利台账，社保调差保存v1 2022-11-28 11:35:05 +08:00
Harryxzy 85fef5c5f8 Merge branch 'master' into feature/V3-backItem-1215 2022-11-28 09:26:59 +08:00
sy 75a7497a07 Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
 2022-11-25 13:55:29 +08:00
sy 58c7374a64 薪酬系统-福利台账，退差数据导出，添加个税扣缴义务人筛选 2022-11-25 11:14:11 +08:00
fcli fc81955b15 feat: 全部范围部分发放撤回功能 2022-11-25 10:53:23 +08:00
sy f1bd574c81 薪酬系统-福利台账，调差v2 2022-11-23 15:39:42 +08:00
钱涛 264edf1bf2 同步人员范围 2022-11-22 15:37:07 +08:00
Harryxzy a53fa14a3d Merge branch 'master' into feature/V3-backItem-MMdd 2022-11-22 14:37:15 +08:00
sy 2b29813f6b 薪酬系统-福利台账，退差数据导出 2022-11-22 13:35:09 +08:00
sy 96a440a9a7 薪酬系统-福利台账，退差数据新增时的可选择人员列表v1 2022-11-21 15:27:15 +08:00
sy 9c897c87dd Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117 2022-11-21 09:54:44 +08:00
sy df76d24a39 薪酬系统-福利台账，退差数据编辑v1 2022-11-18 17:56:21 +08:00
sy 746ab58ed3 薪酬系统-福利台账，退差数据单条查看v2 2022-11-18 16:07:20 +08:00
Harryxzy a5ae8c8ea6 回算薪资项（薪资账套部分），剩余处理历史数据 2022-11-18 14:20:18 +08:00
钱涛 9a9a9cdaf3 Merge branch 'feature/加锁221117' into release/2.2.2.2211.03 2022-11-17 19:05:55 +08:00
fcli 0f51d44cd4 Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03 2022-11-17 14:43:59 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
sy 002de586d5 薪酬系统-福利台账，退差数据列表功能v3 2022-11-16 16:14:21 +08:00
Harryxzy 1e307e2f87 薪资回算，薪资账套中薪资回算项目展示 2022-11-16 15:18:43 +08:00
Harryxzy 94f3c9720a 回算功能-fix mybatis报错 2022-11-16 14:13:50 +08:00
Harryxzy 00357cd9d8 回算功能-新建薪资账套默认 2022-11-16 10:32:05 +08:00
sy ce37694a95 薪酬系统-福利台账，退差数据删除功能v1 2022-11-16 10:15:05 +08:00
sy c339798dc8 薪酬系统-福利台账，退差数据导出功能v1 2022-11-16 09:48:17 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
Harryxzy 323c1ec0e0 查看编辑调薪 2022-11-15 09:34:58 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
fcli 63ee9c9b8e fix: 一键累计添加日期与校验 2022-11-09 18:57:28 +08:00
Harryxzy 095a0665b8 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 2022-11-09 16:12:35 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
fcli 07a07d2be8 feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计 2022-11-09 10:40:48 +08:00
fcli 9b77bf7139 feat: 专项附加扣除模块, 一键清空、分页bug等 2022-11-09 10:40:38 +08:00
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli dffee9206f feat: 专项附加扣除模块 2022-11-09 10:40:05 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
fcli 8873224123 Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-02 17:33:26 +08:00
fcli 11f0a2c418 Merge branch 'fix/089' into release/2.1.2.2211.01 2022-11-02 17:32:49 +08:00
fcli 59f030adf8 Merge branch 'fix/104' into release/2.1.2.2211.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2022-11-02 17:32:42 +08:00
sy 3cbf9b10e5 Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01 2022-11-02 17:30:21 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
fcli 81d91a3a2c fix: 我的调薪记录问题修改,设置分页默认值 2022-10-31 16:37:39 +08:00
sy 126a048a76 薪酬系统-福利档案选中导出功能优化 2022-10-31 16:30:59 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
Harryxzy 317fb5e8ac 数据采集-编辑前查看功能 2022-10-31 14:50:54 +08:00
Harryxzy d525c59d6d Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03 2022-10-28 16:38:17 +08:00
Harryxzy e046b7e3fe fix 一键清空 2022-10-28 16:35:51 +08:00
Harryxzy 09d85bdab3 考勤引用=编辑 2022-10-28 16:15:51 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
fcli 31982fc1db fix: 工资单发放页高级搜索功能不生效 2022-10-28 09:39:31 +08:00
Harryxzy ddd0c49cdd 其他免税扣除-新增、删除所选、一键清空功能 2022-10-27 18:02:05 +08:00
钱涛 104213fc04 1、提示优化 
2、导入模板
3、定薪流程
 2022-10-27 15:17:22 +08:00
Harryxzy a406eed4b9 累计专项附加扣除-新增、删除所选、一键清空功能 2022-10-27 13:59:11 +08:00
Harryxzy c0bb94bf71 editDataCollection-2 2022-10-26 18:35:23 +08:00
fcli 6f09d25077 fix: 我的调薪记录问题修改 2022-10-26 17:48:59 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 61a35854b9 Merge branch 'feature/archive' into develop 2022-10-19 09:41:31 +08:00
钱涛 0e6ec32c12 档案导出 2022-10-19 09:39:01 +08:00
钱涛 47e390eb28 Merge branch 'feature/archive' into develop 2022-10-18 16:47:54 +08:00
钱涛 1f48539e1c 删除待定薪代办 
删除待停薪代办
 2022-10-18 16:44:31 +08:00
李栋 5c3fe06b62 Merge branch 'develop' into dev-LeeD 2022-10-17 11:14:33 +08:00
李栋 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