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

175 Commits

Author SHA1 Message Date
Harryxzy 0048001c54 返聘 2023-11-03 16:53:23 +08:00
Harryxzy e018ec629f 返聘 2023-11-03 16:37:09 +08:00
Harryxzy 44233d74a8 返聘 2023-11-03 15:28:04 +08:00
钱涛 96bfdf05ed 在线获取累计专项附加扣除 2023-09-04 14:20:42 +08:00
钱涛 6871316f98 Merge branch 'release/2.9.4.2308.02' into release/个税一期 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2023-09-04 09:30:24 +08:00
Harryxzy c1893f9152 自动同步结束发薪日期temp 2023-08-30 10:41:00 +08:00
钱涛 914963135a 个税对接辅助缴款 2023-08-17 14:55:32 +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 7d9ad3d79e 不允许删除薪资档案校验 2023-07-11 10:14:28 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
Harryxzy ea527d0e37 Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02 2023-06-27 18:00:59 +08:00
Harryxzy 04f0528143 修复下载薪资档案模板没有带出档案数据 2023-06-27 18:00:39 +08:00
Harryxzy 3be6eaa16f Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02 2023-06-26 13:26:03 +08:00
Harryxzy 6850c050b8 薪资核算人员去除 停薪_来自待定薪 2023-06-19 09:16:49 +08:00
Harryxzy 3096954628 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 14:40:36 +08:00
sy f33f309262 Merge remote-tracking branch 'remotes/origin/feature/v4-importAndExportHeaderUnified-0615' into release/2.8.4.2306.02 2023-06-15 16:35:52 +08:00
钱涛 2480525fa6 修复同步档案bug 
缓存公共接口
 2023-06-15 10:44:31 +08:00
sy 3638fb469f 薪酬系统-薪资档案，列表导入、导出统一表头内容和顺序，不包括自选表头 2023-06-14 10:33:26 +08:00
Harryxzy a2f4653411 当薪资档案列表为0时，由于查询了全量数据，导致速度慢 2023-05-29 16:17:13 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +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
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 4faa9e36a6 取消待办优化 2023-03-31 10:17:31 +08:00
Harryxzy 2dc40a7b91 取消待办 2023-03-28 10:10:54 +08:00
sy dc2cb5f448 薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +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
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +08:00
钱涛 2d091dbd33 异步同步人员校验 2023-03-10 17:15:15 +08:00
Harryxzy 5067d50722 EmployeeBiz修改调用方式-2 2023-03-07 17:20:30 +08:00
Harryxzy e7f2d7b496 薪资档案导出，添加工号 2023-03-01 16:19:09 +08:00
钱涛 49cd56e359 档案列表重构 2023-02-21 18:05:58 +08:00
钱涛 2748f04d0a 档案为空不生效 2023-02-13 17:23:05 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
钱涛 013f67469e 显示定制列的入职日期和离职日期 2022-12-01 14:33:21 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
钱涛 2da0455c46 修复薪资档案个税扣缴义务人不显示的问题 
处理历史数据改为异步
 2022-11-07 15:11:24 +08:00
钱涛 f1f8ae53af 档案项目默认生效时间取起始缴纳日期 2022-11-03 19:32:51 +08:00
钱涛 0cd5f1d4d8 一键发薪bug 2022-11-03 17:16:37 +08:00
钱涛 33e2e0e933 修复冲突 2022-11-02 17:36:34 +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
钱涛 104213fc04 1、提示优化 
2、导入模板
3、定薪流程
 2022-10-27 15:17:22 +08:00
fcli 6f09d25077 fix: 我的调薪记录问题修改 2022-10-26 17:48:59 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 a2716c4330 处理档案重复生成的问题 2022-10-19 13:36:31 +08:00
钱涛 1f48539e1c 删除待定薪代办 
删除待停薪代办
 2022-10-18 16:44:31 +08:00
钱涛 77fc944491 获取保存档案配置表单 
保存档案配置
 2022-10-14 16:18:55 +08:00
钱涛 0e05185599 操作接口 2022-10-13 16:24:59 +08:00
钱涛 68076fc724 fix sqlserver增量数据空 2022-10-13 14:57:52 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +08:00
钱涛 5431ed9506 历史数据处理 2022-10-10 09:47:09 +08:00
钱涛 1f0bf061dd 历史数据处理 2022-10-09 10:55:35 +08:00
钱涛 dfeb3fc5e4 修复薪资档案导出全部 2022-09-28 09:26:26 +08:00
sy 49e3b77995 薪酬系统-薪资档案-初始化导入模板表头属性优化 2022-09-22 10:25:31 +08:00
钱涛 57e4360030 通过员工id导入 2022-09-21 13:40:43 +08:00
钱涛 19ea334d57 获取员工信息方法 2022-09-21 11:52:06 +08:00
钱涛 22b03f8f7e 调薪 2022-09-20 17:38:21 +08:00
sy d64b73290a 薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验 2022-09-20 16:54:42 +08:00
sy 882b1306b0 薪酬系统-薪资档案导入bug修复 2022-09-20 15:26:47 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
钱涛 b464240ff7 Merge remote-tracking branch 'origin/develop' into develop 2022-09-19 13:45:14 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +08:00
sy 280c979536 薪酬系统-修改导入信息时对于姓名字段的依赖逻辑 2022-09-16 15:03:48 +08:00
sy a3ec7caf44 薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理 2022-09-15 17:54:59 +08:00
sy d491288296 薪酬系统导入方式配置-各导入模板添加工号字段 2022-09-15 10:43:34 +08:00
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
钱涛 c84836d490 修复调薪导致起始缴纳日期消失 2022-09-06 17:12:56 +08:00
Harryxzy 38edb1bbb8 xzy-fix薪资档案导入时添加起始发薪日期格式校验 2022-09-01 17:06:30 +08:00
Harryxzy 387b6a2897 xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件 2022-08-31 15:06:49 +08:00
sy 2041031e92 薪酬模块导入按钮匹配项优化 
姓名-部门-手机号
涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口
 2022-08-25 11:43:52 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
钱涛 4b800c436d 核算时只获取对应分部的档案 2022-08-09 16:45:22 +08:00
钱涛 deffd8e41f 薪资档案增加分部列 2022-08-09 10:09:55 +08:00
钱涛 c92a215bca 薪资档案导出全部时范围修改 2022-07-28 17:20:24 +08:00
钱涛 b6f8e857d2 1、档案导入初始化修复 
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
 2022-07-28 15:42:25 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
钱涛 e01a575d58 初始化和调薪档案范围调整 2022-07-25 16:29:20 +08:00
钱涛 eb957fbfec 修复档案初始化 2022-07-25 10:45:13 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +08:00
钱涛 b90953873c 薪资档案代码合并 2022-07-21 09:48:40 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
 2022-07-21 09:43:02 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
钱涛 d1770aadbb 薪资档案定薪调薪适配多个扣缴义务人 2022-07-19 18:40:41 +08:00
钱涛 2275f53861 档案设置 2022-07-18 19:14:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
钱涛 136641649d 薪资档案 2022-07-18 09:38:12 +08:00
钱涛 c8aa08fc9f 档案列表显示扣缴义务人 2022-07-14 14:32:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 fc35eff75d fix 2022-06-21 22:37:22 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
钱涛 758e64e6bc 档案导入 2022-06-01 20:46:51 +08:00