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

3385 Commits

Author SHA1 Message Date
钱涛 7644e27e05 处理冲突 2024-11-15 14:25:07 +08:00
钱涛 5c4d7d8bde Merge branch 'feature/权限' into feature/数据推送 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
 2024-11-15 14:20:51 +08:00
钱涛 a40697ec33 数据推送配置 2024-11-15 13:57:35 +08:00
Harryxzy 00271f3a4b 解决冲突 2024-11-14 09:23:44 +08:00
Harryxzy cd182a24b7 解决冲突 2024-11-14 09:13:23 +08:00
Harryxzy 8a06eaad93 Merge branch 'feature/工资单审批' into release/2.17.1.2411.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
 2024-11-13 18:36:20 +08:00
钱涛 84aa4caf54 解决冲突 2024-11-13 11:24:19 +08:00
钱涛 5a520a367a Merge branch 'release/2.17.1.2411.01' into feature/权限 
# Conflicts:
#	resource/wiki/常用查询.md
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-11-13 11:10:27 +08:00
钱涛 158e7dd20c Merge branch 'feature/次账号' into release/2.17.1.2411.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2024-11-12 18:05:42 +08:00
Harryxzy ce1312d605 修复没有档案的人，定薪action状态保持不变 2024-11-12 17:08:59 +08:00
Harryxzy 5a18ccf57b 修复没有档案的人，定薪action状态保持不变 2024-11-12 17:06:41 +08:00
Harryxzy e4071edab6 修复社保福利台账添加人员 2024-11-12 16:21:56 +08:00
钱涛 e42e950905 fix薪资明细报表搜索 2024-11-12 15:34:51 +08:00
Harryxzy c88c8acf90 薪资档案搜索2100优化 2024-11-12 14:44:44 +08:00
钱涛 0e3a5320a4 新增核算结果状态编码 2024-11-12 11:31:47 +08:00
钱涛 4601d5ec81 修复打印模板列表不显示 2024-11-11 18:03:31 +08:00
钱涛 99274b95ec 修复打印模板列表不显示 2024-11-11 16:58:16 +08:00
Harryxzy 02de1e4444 工资单发放预览，兼容很早之前新建的工资单模板 2024-11-11 15:02:21 +08:00
Harryxzy 6ebef0cd5e Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01 2024-11-11 14:06:37 +08:00
Harryxzy 95abadfb0d 社保福利台账添加人员bug 2024-11-11 14:06:15 +08:00
钱涛 553764da86 模板sql 2024-11-11 10:51:59 +08:00
Harryxzy ce80905ad0 薪资明细接口优化 2024-11-11 09:59:27 +08:00
Harryxzy 11f2591797 Merge branch 'feature/241101-定薪action支持不设为发薪人员' into release/2.16.1.2410.01 2024-11-08 16:30:53 +08:00
Harryxzy 32eabb25f0 Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01 2024-11-08 16:30:40 +08:00
Harryxzy 058e7dcb3c 薪资档案增加调薪时间 筛选 2024-11-08 16:29:06 +08:00
钱涛 7e235e112a 处理核算结果null插入问题 2024-11-08 16:20:30 +08:00
Harryxzy a2f8803e76 薪资档案增加调薪时间 筛选 2024-11-08 16:08:49 +08:00
钱涛 e537ffaa5a 薪资明细显示模板 2024-11-07 17:45:17 +08:00
Harryxzy 15fe5044e8 修复先加锁 再核算时报错 2024-11-07 15:19:11 +08:00
Harryxzy 5953c2b938 薪酬token加解密 2024-11-06 13:37:03 +08:00
Harryxzy dbb332e07f Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密 2024-11-06 10:05:53 +08:00
Harryxzy 13012b739e 定薪action支持配置留在待定薪 2024-11-05 16:22:48 +08:00
Harryxzy 1026599131 Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01 2024-11-05 14:35:15 +08:00
Harryxzy cb6738734a 修复社保福利档案导出，一个人在多个义务人下 导出bug 2024-11-05 11:04:21 +08:00
钱涛 4cd0fbfe30 报表模板 2024-11-04 19:49:46 +08:00
Harryxzy 07c0492ec2 Merge branch 'release/2.16.1.2410.01' into feature/次账号 2024-11-04 17:29:32 +08:00
钱涛 ea06150dc5 取消社保台账重新核算限制 2024-11-04 15:06:27 +08:00
钱涛 ef13d93fe1 Merge branch 'release/2.16.1.2410.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
 2024-11-04 14:33:15 +08:00
钱涛 e3d5ca78f4 修改账套状态类型 2024-11-04 10:53:21 +08:00
Harryxzy e9b347c07c 前端增加薪资审批按钮的显隐控制 2024-11-01 16:03:51 +08:00
Harryxzy 906a432ec2 Merge branch 'fix/241001-社保停缴action最后缴纳月支持分开设置' into release/2.16.1.2410.01 2024-11-01 14:34:14 +08:00
Harryxzy 989468cdc7 Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01 2024-11-01 14:33:14 +08:00
钱涛 7fd0f95802 扣缴义务人和账套的人员的人员状态 2024-11-01 14:27:47 +08:00
钱涛 391fa6ebd9 扣缴义务人和账套的人员的人员状态 2024-11-01 10:04:15 +08:00
钱涛 ad48063ca9 扣缴义务人和账套的人员范围支持编辑 2024-10-31 16:56:32 +08:00
钱涛 13ed52d1d8 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-30 17:11:04 +08:00
钱涛 d21258596a 扣缴义务人新加入人员，不会修改历史档案 2024-10-30 17:10:32 +08:00
钱涛 812ca6c752 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-28 15:46:51 +08:00
钱涛 455550836e 解决账套项目过多，快照问题 2024-10-28 15:46:29 +08:00
钱涛 2499d543d8 解决主次账号档案异常 2024-10-28 15:11:31 +08:00
钱涛 63928ddc59 解决人员状态null问题 2024-10-28 15:08:10 +08:00
钱涛 a51f20b798 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-28 13:48:52 +08:00
钱涛 bfbd9e4b40 修复人员报表排序 2024-10-28 11:35:57 +08:00
钱涛 f884e3ff25 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-25 16:04:43 +08:00
钱涛 71569cad9e 薪资所属年变量 2024-10-25 16:01:45 +08:00
钱涛 c3e7037667 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-25 09:34:45 +08:00
钱涛 45c99da037 Merge branch 'release/2.16.1.2410.01' into feature/次账号 2024-10-24 11:08:20 +08:00
钱涛 c0de305c3d 核算记录最后操作日期 2024-10-24 10:55:44 +08:00
钱涛 94bb1ede32 Merge branch 'release/2.16.1.2410.01' into feature/次账号 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-10-24 10:34:56 +08:00
钱涛 28fa294c6f 异步记录日志 2024-10-24 10:19:35 +08:00
钱涛 e3c6b08e6f 处理报表导出异常 2024-10-23 17:41:28 +08:00
钱涛 77d8c8168c Merge branch 'release/2.16.1.2410.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-10-22 17:10:47 +08:00
钱涛 b5e6059298 核算记录组织字段分开标识 2024-10-22 16:38:27 +08:00
钱涛 ce8356f9b2 分部id字段 2024-10-22 16:12:30 +08:00
钱涛 8c5c3d5949 工资单查看限制类型约束 2024-10-22 15:00:19 +08:00
钱涛 5271d2516a Merge branch 'release/2.16.1.2410.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2024-10-22 09:27:11 +08:00
钱涛 2bd336fc16 单元格锁定 2024-10-18 16:54:34 +08:00
钱涛 af34b8a5b5 单元格锁定 2024-10-18 16:49:17 +08:00
钱涛 988b82751e 考勤日志 2024-10-18 16:21:14 +08:00
钱涛 57fdc79e7b 修复引用日期转换问题 2024-10-18 15:58:43 +08:00
钱涛 96a7be5625 修复核算列表次账号不显示问题 2024-10-18 11:03:33 +08:00
钱涛 313b91297f Merge branch 'release/2.16.1.2410.01' into feature/次账号 
# Conflicts:
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
 2024-10-18 10:39:12 +08:00
钱涛 9f498551e4 单元格锁定字段改成字符型 2024-10-18 10:20:29 +08:00
钱涛 be2d6b693a 单元格锁定 2024-10-17 18:27:37 +08:00
Harryxzy c6fdbe6403 社保停缴action最后缴纳月支持分开设置 2024-10-17 16:39:24 +08:00
Harryxzy f664536bce 社保停缴action最后缴纳月支持分开设置 2024-10-17 15:51:05 +08:00
钱涛 4ec883cd9c Merge branch 'release/2.16.1.2410.01' into feature/次账号 2024-10-17 14:28:08 +08:00
钱涛 38f773d125 优化核算导入效率 2024-10-17 14:07:27 +08:00
钱涛 70429df180 Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01 2024-10-17 13:42:23 +08:00
钱涛 0d100d9f53 修复报表分部条件过滤不生效 2024-10-17 10:20:58 +08:00
钱涛 fb8595ac00 次账号规则 2024-10-16 18:20:11 +08:00
钱涛 070a2a75ac Merge branch 'release/2.15.2.2409.01' into feature/次账号 2024-10-16 17:19:43 +08:00
钱涛 637e5ced98 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-10-16 17:19:19 +08:00
钱涛 d42e9768c2 处理sqlserver浮动数据bug 2024-10-16 16:53:24 +08:00
Harryxzy fc88f03904 浮动薪酬加解密 2024-10-16 15:47:18 +08:00
钱涛 53ce7c7b43 核算人员显示次账号 2024-10-16 15:25:48 +08:00
钱涛 8e90361e82 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/VariableArchiveService.java
 2024-10-16 10:04:24 +08:00
Harryxzy 35a0349f38 Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01 2024-10-16 09:42:10 +08:00
Harryxzy e8559e1afa 修复社保福利导入报无人员 （历史数据兼容bug） 2024-10-16 09:41:55 +08:00
钱涛 5f50c26640 取消核算导入vlookup支持 2024-10-16 09:30:10 +08:00
钱涛 6ec7210720 除去核算支持函数 2024-10-15 14:40:04 +08:00
钱涛 6336ae24a0 Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院 2024-10-15 14:27:55 +08:00
钱涛 d3050117d1 支持次账号 2024-10-15 14:24:37 +08:00
Harryxzy 4c551dae87 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-10-14 15:06:52 +08:00
Harryxzy dbd1b574e0 浮动薪酬优化 2024-10-14 15:05:22 +08:00
Harryxzy 3ac5da2b31 社保台账sqlserver 2100bug 2024-10-14 14:34:46 +08:00
Harryxzy 49cbb7a7cc 浮动薪酬 2024-10-14 10:38:30 +08:00
钱涛 0111822a47 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
 2024-10-12 15:16:38 +08:00
钱涛 779d519a6f Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-12 11:11:44 +08:00
钱涛 c209399566 修复模板设置主键 2024-10-12 09:38:08 +08:00
钱涛 265ca2a54e 默认展示所有薪资明细列 2024-10-11 18:02:52 +08:00
钱涛 a0bc3b5452 记录核算日志 2024-10-11 17:32:02 +08:00
钱涛 3a224170f1 导入字段持久化 2024-10-11 17:17:07 +08:00
钱涛 4c4b6ab57d 导入字段持久化 2024-10-11 17:14:14 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 32b3ce97a9 Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-11 15:34:44 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
Harryxzy 310c77a270 excel设置列宽 超过255报错 2024-10-11 15:14:21 +08:00
Harryxzy 8d8fc5c15d 社保台账人员信息快照 2024-10-11 10:17:35 +08:00
钱涛 861cda00fa 1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。 
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
 2024-10-10 11:39:22 +08:00
钱涛 2ba4bb72db 薪资明细增加入职日期 2024-10-09 18:10:38 +08:00
钱涛 767d650ee9 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-10-09 17:31:45 +08:00
钱涛 3a128a4c5b 报表快照 2024-10-09 14:59:33 +08:00
钱涛 a40188659f 报表快照 2024-10-09 13:21:28 +08:00
Harryxzy 752de1fa8e 社保福利台账人员信息快照 2024-10-09 10:57:23 +08:00
钱涛 c2b200d843 业务线 2024-10-08 19:47:45 +08:00
钱涛 237ea8fcd8 业务线 2024-10-08 19:47:18 +08:00
钱涛 f487e060a2 Merge branch 'feature/快照条件搜索报表' into feature/权限 
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
 2024-10-08 16:20:32 +08:00
钱涛 09ccda7883 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 16:12:08 +08:00
钱涛 61dee5d3a1 薪资明细排序 2024-10-08 15:48:33 +08:00
钱涛 ff5419f2bb 薪资明细排序 2024-10-08 15:45:12 +08:00
钱涛 edb07052b5 员工明细排序 2024-10-08 14:36:18 +08:00
钱涛 87f819f3e2 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 14:25:26 +08:00
钱涛 ff44ddd8b1 员工明细排序 2024-10-08 14:19:02 +08:00
钱涛 8c0bad8023 报表快照 2024-09-30 10:37:27 +08:00
钱涛 13f0854208 报表缓存 2024-09-29 17:02:59 +08:00
钱涛 b4050e4ee8 报表快照搜索 2024-09-29 16:58:41 +08:00
钱涛 800f03427d 社保档案业务线 2024-09-29 14:34:44 +08:00
钱涛 7f233145d4 fix刷新核算人员功能冲突 2024-09-29 11:07:48 +08:00
钱涛 d54dd4e237 fix刷新核算人员功能冲突 2024-09-29 10:52:04 +08:00
钱涛 541546f5c8 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2024-09-29 10:46:04 +08:00
钱涛 93d2980ad8 刷新核算人员功能 2024-09-29 10:37:38 +08:00
钱涛 4a8e96ebe6 修复扣缴业务人 2024-09-27 18:10:21 +08:00
钱涛 4db0fdc699 SQL 使用mybatis执行 2024-09-27 17:18:07 +08:00
钱涛 6e03afecc2 社保档案导入 2024-09-27 16:15:01 +08:00
钱涛 1d43e980e7 1、优化浮动数据业务线 
2、优化浮动字段业务线
3、修复累计专项附加编辑权限
 2024-09-27 11:34:01 +08:00
钱涛 e512a2868a Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-27 11:13:24 +08:00
钱涛 0852094cb1 修改浮动数据扣缴义务人id类型 2024-09-27 11:13:00 +08:00
钱涛 ab2912fb28 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-27 11:08:53 +08:00
钱涛 ecd99537fa 修复浮动数据null 2024-09-27 11:04:44 +08:00
钱涛 ffb4b5f0b4 记录删除业务线日志 2024-09-27 10:16:48 +08:00
钱涛 222fe9facd 业务线明细列表 2024-09-26 19:20:37 +08:00
钱涛 7f17c2a9b7 业务线同步 2024-09-26 17:52:01 +08:00
钱涛 0d7cdeddb0 社保台账操作按钮 2024-09-26 15:57:16 +08:00
钱涛 78c8d06200 社保福利搜索条件 2024-09-26 11:24:12 +08:00
钱涛 9b9d41532d 社保福利业务线 2024-09-26 10:35:46 +08:00
钱涛 2ada09f16c Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-25 16:07:42 +08:00
钱涛 b732430562 支持根据工号排序 2024-09-25 15:40:36 +08:00
钱涛 9f7fe00303 穿透显示快照组织信息 2024-09-25 13:38:45 +08:00
钱涛 ff200e2586 核算确认列表组织信息 2024-09-25 11:45:36 +08:00
钱涛 63c6a5af5e 业务线配置 2024-09-24 19:02:40 +08:00
钱涛 ae708a1d3b Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 13:19:59 +08:00
钱涛 0944efcf5e 物理删除业务线数据 2024-09-24 11:04:44 +08:00
钱涛 d959c75ce0 业务线操作日志 2024-09-24 10:19:06 +08:00
钱涛 a659821be8 业务线高级搜索 2024-09-24 09:50:46 +08:00
钱涛 cc6deee04c 报表模块分权 2024-09-23 14:35:51 +08:00
钱涛 1bb5dd63fb 优化申报提示 2024-09-23 13:20:59 +08:00
钱涛 164a97a8e0 修复大数据量，重新核算报错 2024-09-23 11:10:25 +08:00
钱涛 f0f6943eb0 薪资项目模块 2024-09-23 10:17:36 +08:00
钱涛 f62dfa17be 往期累计模块 2024-09-20 17:01:37 +08:00
钱涛 0ece125d18 其他免税扣除模块 2024-09-20 16:49:46 +08:00
钱涛 619af1a76a 其他免税扣除模块 2024-09-20 16:45:35 +08:00
钱涛 7ea6278e4e 累计专项附加扣除模块 2024-09-20 15:58:05 +08:00
钱涛 63a9e9caf8 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
 2024-09-20 13:20:30 +08:00
钱涛 dc3dfc2d6b 去除脱敏报表 2024-09-20 11:41:44 +08:00
钱涛 7584404bc1 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-20 10:27:42 +08:00
钱涛 0f1d710cc1 穿梭薪资项目列表 2024-09-19 17:57:48 +08:00
Harryxzy 2b7b61745a Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-19 17:50:09 +08:00
钱涛 ee535fc2bf 1、业务线-新建累计专项附加扣除 
2、业务线-报表
 2024-09-19 16:46:36 +08:00
钱涛 91863b901f 增加核算日志 2024-09-19 14:17:47 +08:00
钱涛 a59448e454 修复人力资源删除数据影响列表展示 2024-09-18 18:24:08 +08:00
钱涛 6e7ccb2339 浮动薪资档案分权 2024-09-18 18:19:58 +08:00
Harryxzy 3420c36448 人员id加密 2024-09-18 18:10:30 +08:00
Harryxzy 18ab255678 Merge branch 'fix/240901_社保福利档案补缴添加bug' into release/2.15.2.2409.01 2024-09-18 16:47:19 +08:00
Harryxzy 58012fe1e1 修复社保福利档案补缴添加bug 2024-09-18 16:44:02 +08:00
钱涛 9edf23fa37 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-18 16:13:24 +08:00
钱涛 cbd6553e11 Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01 2024-09-18 15:59:45 +08:00
钱涛 09042321d1 1、支持获取班次信息 
2、导出考勤功能优化，excel列和列表显示保持一致
 2024-09-18 15:59:36 +08:00
Harryxzy c4826515e1 Merge branch 'fix/240802-报表数据透视bug' into feature/240901-报表增加岗位筛选 2024-09-14 15:33:58 +08:00
Harryxzy eefd4d1795 报表增加岗位筛选 2024-09-14 15:33:31 +08:00
钱涛 174838382a 支持扣缴义务人选项 2024-09-14 10:52:06 +08:00
Harryxzy 31d2994a9a 浮动薪酬多语言 2024-09-14 10:30:32 +08:00
钱涛 a48d4cea11 浮动数据 2024-09-14 09:36:52 +08:00
钱涛 96ced6e934 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-13 17:32:58 +08:00
钱涛 de0728665b 导入往期累计 2024-09-13 17:32:15 +08:00
Harryxzy c212a2782f 薪酬统计报表增加岗位筛选 2024-09-13 14:54:52 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 d70e63e787 修复工资单保存异常 2024-09-12 17:07:52 +08:00
钱涛 4d40deeada 业务线资源 2024-09-12 16:32:19 +08:00
钱涛 3d21fd250f 工资单支持文本变量 2024-09-12 16:22:32 +08:00
钱涛 e8b2fec1ff Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-12 15:03:19 +08:00
钱涛 46f94ddd3d 档案批量发薪、停薪权限控制 2024-09-12 14:48:51 +08:00
钱涛 383562c9cf 工资单、数据采集权限功能 2024-09-12 11:50:18 +08:00
钱涛 54f9c8f056 增加账套配置接口级锁 2024-09-11 16:15:02 +08:00
钱涛 7393d96259 增加账套配置接口级锁 2024-09-11 16:13:49 +08:00
钱涛 87d601c65b 账套和核算列表的权限控制 2024-09-11 15:25:50 +08:00
钱涛 c7659e0717 数据采集权限 2024-09-11 10:28:20 +08:00
钱涛 5e67b5937d 业务线权限接口 2024-09-10 14:42:08 +08:00
钱涛 3614f89982 业务线权限接口 2024-09-10 13:37:21 +08:00
钱涛 a0fb036bce 业务线配置 2024-09-09 19:10:40 +08:00
钱涛 1dd8f12534 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	resource/wiki/扩展功能/hrmSalaryCustom.properties
 2024-09-09 14:20:56 +08:00
钱涛 09fb9898e7 完成账套和扣缴义务人接口 2024-09-09 11:13:10 +08:00
钱涛 17afe87356 申报表权限规则 2024-09-05 18:14:02 +08:00
钱涛 4d9f1e6ff4 申报权限按钮限制 2024-09-05 17:31:01 +08:00
钱涛 882716b10c 修复核算结果可能为空带来的影响 2024-09-05 14:13:43 +08:00
钱涛 920b0e31c4 账套扣缴义务人聚合查询 2024-09-05 10:26:52 +08:00
钱涛 4b0eee4798 工资单跨扣缴义务人发放 2024-09-04 15:39:54 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 e7eb2e3459 支持跨扣缴义务人兼容性 2024-09-03 15:48:20 +08:00
钱涛 e788f3dd37 申报表支持跨扣缴义务人 2024-09-03 14:46:08 +08:00
钱涛 0b90f4890e 工资单支持跨扣缴义务人 2024-09-03 14:30:57 +08:00
Harryxzy 0d5b1c37fd Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-03 09:24:22 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 7f77f4cb12 获取账套关联扣缴义务人 2024-09-03 09:21:57 +08:00
钱涛 fa861c71dc 支持自定义单个线程处理人员数量 2024-09-02 18:11:00 +08:00
钱涛 ecfa6a4604 跨扣缴义务人核算 2024-09-02 17:36:41 +08:00
Harryxzy fedaf50187 返聘优化 2024-09-02 14:45:03 +08:00
钱涛 c72fa7fd7c 保存账套联系 2024-09-02 14:13:29 +08:00
钱涛 13665d8269 业务线列表 2024-09-02 10:43:28 +08:00
钱涛 fdb1f76e01 保存业务线 2024-09-02 10:22:42 +08:00
钱涛 05a9b9e9b2 修改批量插入大小 2024-08-30 17:23:36 +08:00
钱涛 9d4362b46e 业务线分权 2024-08-30 17:22:10 +08:00
Harryxzy e3200f7932 fix报表数据透视 bug 2024-08-30 13:35:17 +08:00
钱涛 49e6050c54 核算和账套的权限 2024-08-30 10:49:46 +08:00
钱涛 932ea6bedd 核算和账套的权限 2024-08-29 14:47:33 +08:00
钱涛 3721867723 核算和账套的权限 2024-08-28 17:55:42 +08:00
Harryxzy eb5cf04622 fix 2024-08-28 11:02:46 +08:00
钱涛 9b96d0cff2 限制账套 2024-08-28 10:02:39 +08:00
钱涛 a2db71d403 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-26 11:11:31 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
钱涛 36c325c62d sql权限 2024-08-23 09:38:54 +08:00
钱涛 df8f2d7b3a sql权限 2024-08-22 16:37:35 +08:00
钱涛 a22aa624db 权限控制 2024-08-22 15:37:50 +08:00
钱涛 25321bb357 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-21 15:49:12 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
钱涛 ae3d666e7d 核算和申报权限 2024-08-20 11:40:12 +08:00
钱涛 9121268815 修复重新导入账套bug 2024-08-20 09:29:14 +08:00
Harryxzy 984e544503 社保方案上下限自动调整基数 2024-08-19 16:27:56 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
钱涛 7c46da5fce 删除数据范围 2024-08-19 15:29:45 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +08:00
钱涛 9b390faf50 SQL适配 2024-08-19 11:33:15 +08:00
钱涛 a796752203 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
 2024-08-19 10:43:43 +08:00
钱涛 cd8d4601af 全量迁移配置 2024-08-19 09:49:49 +08:00
Harryxzy 8742ee7857 Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01 2024-08-16 15:27:15 +08:00
钱涛 105129165d Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:40:02 +08:00
钱涛 22c99e081d 支持Vlookup 2024-08-16 14:39:01 +08:00
钱涛 10b8be86d1 Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:14:30 +08:00