Commit Graph

70 Commits

Author SHA1 Message Date
钱涛 6a061592e5 处理pg脚本 2025-11-13 11:37:46 +08:00
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +08:00
钱涛 5e95742508 人事信息快照表 2025-01-15 16:39:50 +08:00
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +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
钱涛 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
钱涛 4a7b218ee3 次账号sql 2024-10-25 15:19:16 +08:00
钱涛 641b085a28 单元格锁定sql 2024-10-17 18:53:37 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 da4e908a7d 模板sql 2024-10-10 14:16:57 +08:00
Harryxzy 752de1fa8e 社保福利台账人员信息快照 2024-10-09 10:57:23 +08:00
钱涛 6f10ac4ab2 取消非系统人员菜单 2024-09-24 19:04:57 +08:00
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
Harryxzy 1ebc56bb70 浮动薪酬增加义务人sql 2024-08-12 16:49:29 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21: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
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
钱涛 6bd0d1b8a8 锁定人员sql 2024-05-28 17:51:26 +08:00
钱涛 def5bae707 账套快照-隐藏字段脚本 2024-05-07 16:41:12 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy 8ff315b341 工资单审批sql 2024-04-25 17:24:47 +08:00
Harryxzy 4ccfac80f5 sql 2024-04-01 16:33:13 +08:00
Harryxzy c3800881bc sql 2024-03-15 09:31:04 +08:00
钱涛 e81937c4dd 去除报表原先的表 2024-03-07 11:45:26 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
钱涛 022b904581 添加账套筛选条件sql 2024-02-28 14:54:13 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy c64e9b4b76 工资单确认反馈sql 2024-02-19 14:01:30 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
Harryxzy acbffb205b sql 2024-01-30 16:00:50 +08:00
钱涛 e1ca39e859 elog脚本 2024-01-23 15:00:46 +08:00
Harryxzy 5f7c1c641b Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-08 15:33:11 +08:00
Harryxzy c0c93490fe sql 2024-01-08 15:32:49 +08:00
sy a16ed64ac0 Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02 2024-01-08 13:54:25 +08:00
钱涛 2befcfd1f2 pg脚本问题 2023-12-28 11:08:53 +08:00
sy e97dab27fc 薪酬系统-福利档案,拆分个人和公司福利基数逻辑相关sql脚本 2023-12-13 10:51:24 +08:00
钱涛 bbe4b315cf pg脚本异常 2023-12-08 11:43:19 +08:00
钱涛 addd937b7b Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02 2023-11-22 10:40:30 +08:00
sy 30e6bed471 Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02 2023-11-22 09:38:16 +08:00
钱涛 118e95465d 短信模板脚本 2023-11-21 16:17:47 +08:00
钱涛 e677207eac 新增统计维度展示 2023-11-08 15:59:54 +08:00
钱涛 27255932de 数据库表 2023-11-07 15:12:10 +08:00