Commit Graph

283 Commits

Author SHA1 Message Date
Harryxzy 8bea1405dc 银盛科技 考勤引用薪酬二开 2025-03-21 13:28:01 +08:00
Harryxzy 04bb4433ff Merge branch 'release/2.19.1.2501.01' into custom/银盛科技服务集团有限公司
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2025-03-20 15:35:40 +08:00
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +08:00
钱涛 0aabf7df6c 处理sql异常 2025-01-22 15:06:03 +08:00
钱涛 a002e16f3c 去除消息类型 2025-01-16 16:21:53 +08:00
钱涛 5e95742508 人事信息快照表 2025-01-15 16:39:50 +08:00
钱涛 790f9f0175 核算执行状态sql 2025-01-08 16:58:59 +08:00
钱涛 a96a19b07f 1、核算账套增加多选框,选择多个账套后批量发起核算;
2、核算记录下核算状态,显示在核算列表中。核算中,核算完成;
3、全部核算完成后,提醒当前操作人员薪资数据全部核算完成;
2025-01-07 18:07:56 +08:00
钱涛 5a0ef67816 版本 2025-01-03 09:14:08 +08:00
钱涛 8f697eba36 版本 2025-01-02 15:00:21 +08:00
钱涛 b3dcafa6f1 版本号 2024-12-09 15:12:33 +08:00
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
钱涛 ba3e635e1f 版本 2024-11-19 11:12:39 +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
钱涛 9ff0612f59 sql缺失 2024-11-13 09:59:13 +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
钱涛 7aa3d12d4f 模板sql 2024-11-08 17:00:42 +08:00
Harryxzy 07c0492ec2 Merge branch 'release/2.16.1.2410.01' into feature/次账号 2024-11-04 17:29:32 +08:00
Harryxzy 989468cdc7 Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01 2024-11-01 14:33:14 +08:00
钱涛 ad48063ca9 扣缴义务人和账套的人员范围支持编辑 2024-10-31 16:56:32 +08:00
钱涛 4a7b218ee3 次账号sql 2024-10-25 15:19:16 +08:00
钱涛 28fa294c6f 异步记录日志 2024-10-24 10:19:35 +08:00
钱涛 641b085a28 单元格锁定sql 2024-10-17 18:53:37 +08:00
钱涛 cede931b0d 版本 2024-10-17 14:21:46 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
Harryxzy bbbb29a3d9 社保台账人员信息快照sql 2024-10-11 10:41:52 +08:00
钱涛 da4e908a7d 模板sql 2024-10-10 14:16:57 +08:00
Harryxzy 752de1fa8e 社保福利台账人员信息快照 2024-10-09 10:57:23 +08:00
钱涛 7d0ebd1cdc 精简版常用查询 2024-09-26 17:00:59 +08:00
钱涛 6f10ac4ab2 取消非系统人员菜单 2024-09-24 19:04:57 +08:00
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +08:00
钱涛 db064863b2 版本号 2024-09-19 14:19:26 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 8aa34b806c 日志权限 2024-09-12 14:50:10 +08:00
钱涛 b7f9a1653c 线程数量 2024-09-02 17:41:07 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
Harryxzy 1ebc56bb70 浮动薪酬增加义务人sql 2024-08-12 16:49:29 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 b91818f2dc 版本 2024-07-15 09:36:40 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-06-21 14:17:36 +08:00
钱涛 6d3af9d4ed wiki 2024-06-21 14:14:57 +08:00
钱涛 28536476d3 版本 2024-06-21 09:16:44 +08:00
钱涛 8d65e5d501 版本记录 2024-06-20 14:48:35 +08:00
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
钱涛 7e988193c6 公式扩展获取月有多少天 2024-06-12 14:31:50 +08:00