Compare commits

...

2330 Commits

Author SHA1 Message Date
dxfeng 6e4882bde3 test 2025-12-03 18:00:57 +08:00
钱涛 adda52f7b9 Merge branch 'release/3.0.2.2504.01' 2025-04-21 13:57:58 +08:00
钱涛 8b22e71e6a t 2025-04-21 11:31:25 +08:00
钱涛 64ad0a30d4 修复sql部署异常 2025-04-21 10:33:06 +08:00
钱涛 4d56cde7a9 版本 2025-04-17 15:34:29 +08:00
钱涛 083f266a85 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-17 14:24:23 +08:00
钱涛 6e366bed5a fix账套列表检索问题 2025-04-17 14:20:14 +08:00
钱涛 d01c9bf06f 增加扣缴义务人搜索核算列表 2025-04-17 11:06:02 +08:00
钱涛 da6364a511 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-04-16 14:06:53 +08:00
钱涛 37445cdd58 fix部分发放 2025-04-16 14:06:46 +08:00
Harryxzy 99a0c3facc 2100bug修复 2025-04-16 13:26:36 +08:00
钱涛 b0fb2b3866 部分发放 2025-04-15 17:49:38 +08:00
钱涛 61beec603e 创建推送记录接口;
推送接口;
撤回接口;
2025-04-14 17:00:16 +08:00
Harryxzy 0bcafd3934 修复个税申报 不同税款所属期校验bug 2025-04-09 17:20:48 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
钱涛 c32dab5562 数据撤回功能 2025-04-07 13:50:34 +08:00
钱涛 f4c025e078 数据推送 2025-04-07 09:19:47 +08:00
钱涛 d4f45d5eb3 扩展排序字段 2025-04-03 10:49:10 +08:00
钱涛 0a78f17230 记录推送耗时 2025-04-02 17:05:04 +08:00
钱涛 ba650b9fe6 推送记录状态变更;
推送明细状态变更;
2025-04-02 14:59:32 +08:00
钱涛 0777f99870 创建推送记录接口;
重推接口;
2025-04-01 17:35:29 +08:00
钱涛 8e3c4bfacc 数据推送配置sql 2025-04-01 16:43:02 +08:00
钱涛 3511c18e31 数据推送配置 2025-04-01 15:12:36 +08:00
钱涛 97546393a4 上线版本 2025-03-27 16:31:40 +08:00
钱涛 8a49a2ef1b 上线版本 2025-03-27 16:13:19 +08:00
钱涛 77df0f4c58 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-24 15:03:27 +08:00
钱涛 eea9093cfd Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01 2025-03-24 15:03:09 +08:00
钱涛 b128f219f7 处理敏感信息泄露 2025-03-24 14:57:00 +08:00
钱涛 93defb41cd 版本 2025-03-20 17:32:06 +08:00
钱涛 5673bba357 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 18:08:31 +08:00
钱涛 8910183e7f 核算是否采用线程池配置 2025-03-19 18:08:19 +08:00
钱涛 a63d956da3 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 17:55:41 +08:00
钱涛 fe4b8b1fb3 核算是否采用线程池配置 2025-03-19 17:18:09 +08:00
钱涛 7de1062387 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 10:09:28 +08:00
钱涛 c8f281613b 薪资明细增加人员浏览按钮多选搜索 2025-03-18 17:45:00 +08:00
钱涛 3b520fcf62 社保和档案执行标识 2025-03-18 17:31:32 +08:00
钱涛 4913398650 修复业务线分页问题 2025-03-18 11:10:27 +08:00
钱涛 d672dd8d61 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-17 11:05:52 +08:00
钱涛 a29f8b3da9 薪资明细模板导出根据项目类型设置单元格格式 2025-03-17 11:03:42 +08:00
Harryxzy e2ac113378 fix 个税申报报错 2025-03-13 17:20:05 +08:00
Harryxzy d0ec44c7b1 Merge branch 'feature/250301_社保福利台账增减人员' into release/3.0.1.2503.01 2025-03-13 16:59:11 +08:00
钱涛 ccb0dcd8d5 修复数值类型判断 2025-03-13 16:02:00 +08:00
钱涛 9c3bb5f956 处理未开启分权的情况 2025-03-13 10:06:23 +08:00
Harryxzy 3fb29b2c3d 停薪action 增加日志 2025-03-12 18:21:04 +08:00
Harryxzy 25723af00a 社保福利台账增减人员 2025-03-11 15:18:05 +08:00
Harryxzy 5b66efa3cc 社保福利台账增减人员 2025-03-10 16:47:48 +08:00
Harryxzy 7da3e9262a 社保福利台账增减人员 2025-03-10 16:08:12 +08:00
钱涛 521907d6f6 Merge branch 'release/2.19.1.2501.01' into release/3.0.0.2502.01 2025-03-06 17:38:09 +08:00
钱涛 9cee19397d 记录核算具体操作日志 2025-03-06 17:35:25 +08:00
钱涛 165a775074 刷新账套和扣缴义务人自关联 2025-03-05 16:42:13 +08:00
Harryxzy ef28618db4 社保福利台账增减人员 2025-03-04 16:48:00 +08:00
钱涛 cb38a3fa9b 浮动薪资权限改进 2025-02-27 17:44:23 +08:00
钱涛 7382345dd5 修复退差人员添加 2025-02-27 15:47:59 +08:00
钱涛 b37610dd13 Merge remote-tracking branch 'origin/release/3.0.0.2502.01' into release/3.0.0.2502.01 2025-02-27 10:29:21 +08:00
钱涛 1b77352301 处理冲突,禁用map 2025-02-27 10:29:11 +08:00
Harryxzy bf57c66fc1 修复 定薪超过1000日志报错bug 2025-02-26 15:13:39 +08:00
钱涛 93b98ce583 版本 2025-02-20 10:54:52 +08:00
钱涛 2f9822aeef 修复导出社保档案失败问题 2025-02-20 10:53:27 +08:00
钱涛 d220833512 修复导出非系统人员报表文件失败 2025-02-19 16:38:49 +08:00
钱涛 cac3c11fa3 处理获取上月数据变量大于1000可能带来的异常 2025-02-19 10:07:01 +08:00
钱涛 85eaa6e2a2 修复获取上月数据时人员边界值混乱问题 2025-02-17 16:34:35 +08:00
钱涛 291cd426fe 公式变量支持获取上月数据 2025-02-17 15:54:35 +08:00
钱涛 22077f431e 权限改造 2025-02-17 09:49:01 +08:00
钱涛 05690a81fa 替换listAllTaxAgentsAsAdmin方法 2025-02-14 15:13:40 +08:00
钱涛 32be67e022 替换listAllTaxAgents方法 2025-02-14 14:50:54 +08:00
钱涛 3d0aff3f1d 薪资档案字段管理业务线分权 2025-02-14 14:05:18 +08:00
钱涛 9c6e7f46b5 业务线分权; 2025-02-13 15:17:06 +08:00
钱涛 a688ca8b52 业务线分权;
调薪记录多语言;
2025-02-13 14:23:58 +08:00
钱涛 c0dbce4786 业务线分权 2025-02-13 11:27:13 +08:00
钱涛 c17a566443 Merge branch 'release/2.19.1.2501.01' into feature/数据推送 2025-02-12 13:31:54 +08:00
Harryxzy 9c419f09bf Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-02-11 09:23:15 +08:00
钱涛 54559b198b 处理模板示例列合并问题 2025-02-08 15:12:42 +08:00
钱涛 e48c74b2e2 处理模板示例列合并问题 2025-02-08 15:12:21 +08:00
Harryxzy 06e117f3aa Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-02-08 11:29:23 +08:00
Harryxzy be59482fc8 fix社保福利台账核算人员bug 2025-02-08 11:28:36 +08:00
钱涛 747c349e9a 处理冲突 2025-02-08 10:06:01 +08:00
钱涛 f2b71b1c38 Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-02-08 09:59:44 +08:00
钱涛 0988dd6d5a 下载excel模板示例 2025-02-08 09:52:32 +08:00
钱涛 5916cd63ef 支持根据税款所属期进行申报 2025-02-07 16:58:58 +08:00
钱涛 3394c92964 修复导出模板附件删除问题 2025-02-07 11:44:17 +08:00
钱涛 20f06e07da 修复导出模板附件删除问题 2025-02-07 11:42:31 +08:00
钱涛 8425a30aa0 模板显示附件名称 2025-02-07 10:13:29 +08:00
Harryxzy c77ecf8d69 Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01 2025-02-07 09:16:18 +08:00
钱涛 d75979ed45 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-02-06 16:11:50 +08:00
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +08:00
Harryxzy 81e8b70746 Merge branch 'release/2.19.1.2501.01' into feature/数据推送 2025-02-06 14:22:06 +08:00
Harryxzy d63702891d fix 社保福利台账核算人数大于1000时sqlbug 2025-02-06 13:51:22 +08:00
钱涛 36a92fee91 Merge branch 'feature/权限' into feature/数据推送 2025-02-05 16:04:30 +08:00
钱涛 74bb4beffc 修复业务线核算不了社保 2025-02-05 16:00:52 +08:00
Harryxzy 4875bd327c 社保福利台账勾选了暂不缴纳的不出现在台账中 2025-02-05 15:52:34 +08:00
钱涛 f3994f852d 修复业务核算不了社保 2025-02-05 14:38:53 +08:00
钱涛 e1804c303b 薪资档案调整分权 2025-01-23 14:20:21 +08:00
钱涛 6e6347555a 处理oracle适配 2025-01-22 15:56:56 +08:00
钱涛 0aabf7df6c 处理sql异常 2025-01-22 15:06:03 +08:00
钱涛 e113c7f124 Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2025-01-22 10:27:31 +08:00
钱涛 a0cd1f1973 处理冲突 2025-01-21 17:19:17 +08:00
钱涛 50c3bbf41d Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
2025-01-21 17:14:47 +08:00
钱涛 076e3029b1 获取已归档的正常工资薪金所得人员 2025-01-21 15:03:36 +08:00
钱涛 7195dc7618 兼容0状态档案 2025-01-21 10:20:16 +08:00
钱涛 b206fd984c 考勤引用排除非系统人员 2025-01-20 15:05:04 +08:00
钱涛 5e95742508 人事信息快照表 2025-01-15 16:39:50 +08:00
钱涛 bfeab498c8 Merge branch 'release/2.19.1.2501.01' into feature/权限 2025-01-03 09:40:39 +08:00
钱涛 5a0ef67816 版本 2025-01-03 09:14:08 +08:00
钱涛 8f697eba36 版本 2025-01-02 15:00:21 +08:00
钱涛 df3ce490c0 处理账套复制问题 2024-12-27 14:34:03 +08:00
钱涛 35aff0431e Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-27 09:24:22 +08:00
Harryxzy d4a42e0ed6 修复人员确认页面“环比上月减少人员”搜索后,显示数据错误 2024-12-25 11:27:06 +08:00
Harryxzy bbb02bcd81 fix 报表按照分部维度错误
fix 调薪记录导入生效日期格式错误
2024-12-24 15:39:58 +08:00
Harryxzy 7b82b570e4 获取token增加https配置 2024-12-19 16:59:38 +08:00
钱涛 9b9c169246 Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-17 16:27:46 +08:00
钱涛 bf8f55aaa9 是否引用班次给出按钮选择 2024-12-17 15:47:49 +08:00
钱涛 10266bf739 处理离职员工无法导入问题 2024-12-17 15:00:41 +08:00
Harryxzy 94da3d3a31 修复报表导出,单元格格式问题 2024-12-16 17:46:58 +08:00
钱涛 4d90d0d8f0 支持主账号查看次账号工资单 2024-12-16 10:38:08 +08:00
Harryxzy ec88fc5b10 修复基数没有自动调整 日志调整 2024-12-13 16:29:24 +08:00
Harryxzy 874de98a91 修复基数没有自动调整 2024-12-13 16:19:56 +08:00
钱涛 c13cc9d0a2 处理薪资档案问题 2024-12-12 18:24:00 +08:00
Harryxzy 66912f62a4 社保基数自动调整 增加日志 2024-12-12 16:16:18 +08:00
Harryxzy 3d04414511 Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01 2024-12-12 15:30:55 +08:00
Harryxzy 19a4385703 社保基数自动调整 增加日志 2024-12-12 15:30:26 +08:00
钱涛 83df05b763 控制下账号类型显示隐藏 2024-12-12 10:18:07 +08:00
Harryxzy 4ddb123b3d 移动端获取工资单列表优化 2024-12-11 15:22:08 +08:00
钱涛 bd3b815bcf 隐藏项目导入导出不显示 2024-12-11 11:04:42 +08:00
钱涛 b8fdc4dde6 隐藏项目导入导出不显示 2024-12-10 16:25:20 +08:00
钱涛 72605793d1 处理冲突 2024-12-10 14:24:42 +08:00
钱涛 36de3feeed Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
2024-12-10 14:14:28 +08:00
Harryxzy b769e762ca 社保福利台账非系统人员 2024-12-10 11:50:20 +08:00
Harryxzy 1715b58bad 社保福利台账进度条优化 2024-12-10 11:00:05 +08:00
钱涛 89ca47d65e 进度条问题 2024-12-10 09:12:35 +08:00
Harryxzy cc0568a149 Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01 2024-12-09 17:14:23 +08:00
钱涛 c872fc69ba 处理分页问题 2024-12-09 17:13:45 +08:00
Harryxzy 77f7640a24 社保台账进度条key增加义务人id 2024-12-09 17:13:29 +08:00
钱涛 2932df22e9 推送明细 2024-12-09 16:55:22 +08:00
钱涛 b3dcafa6f1 版本号 2024-12-09 15:12:33 +08:00
Harryxzy 3fa6205c11 Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01 2024-12-09 14:35:15 +08:00
Harryxzy d52e13f09e 薪资明细报表增加证件号码 2024-12-09 14:34:57 +08:00
钱涛 887531ba5d Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
2024-12-09 14:26:32 +08:00
钱涛 7c1e314f2c 保存核算人员时增加快照数据 2024-12-09 14:20:52 +08:00
钱涛 4100ba1331 保存核算人员时增加快照数据 2024-12-09 13:21:25 +08:00
Harryxzy 7d346aa4b0 fix非系统人员导入薪资档案时,employeetype为null 2024-12-06 16:33:52 +08:00
钱涛 0b6a832c4f 组织信息替换 2024-12-06 16:05:51 +08:00
钱涛 5b8562edb6 组织快照 2024-12-06 16:00:53 +08:00
钱涛 de5af5f2c9 组织快照 2024-12-06 16:00:05 +08:00
钱涛 dff42953b5 Merge branch 'release/2.17.1.2411.01' into feature/组织快照 2024-12-05 15:21:28 +08:00
钱涛 ec0e74a8eb 系统模板bug修改 2024-12-05 10:26:37 +08:00
钱涛 5fedafc67e 系统模板配置 2024-12-05 10:17:12 +08:00
钱涛 0114bdeb3f 系统模板配置 2024-12-04 17:45:56 +08:00
钱涛 f000148af7 Merge branch 'feature/薪资报表明细页面配置' into release/2.17.1.2411.01 2024-12-04 15:54:04 +08:00
钱涛 85e3d414fe 查询组织信息快照 2024-12-04 15:41:11 +08:00
钱涛 051a38d408 社保和薪资档案支持定时任务增员 2024-12-04 11:46:00 +08:00
钱涛 3e3350bcd6 删除模板功能 2024-12-04 10:14:39 +08:00
钱涛 c80d900339 模板管理列表 2024-12-04 09:13:41 +08:00
钱涛 c3b71201a4 组织快照 2024-12-03 16:39:02 +08:00
钱涛 583f3fa85a Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
2024-12-03 12:14:25 +08:00
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 09b5dee199 模板权限 2024-12-02 15:01:06 +08:00
钱涛 186473f9f6 数据推送服务 2024-12-02 14:08:03 +08:00
钱涛 4606e11754 数据推送列表和明细列表 2024-11-29 10:10:25 +08:00
钱涛 ff3d569e1d 数据推送列表和明细列表 2024-11-29 09:14:04 +08:00
钱涛 17ceeef74d 数据推送明细状态 2024-11-28 15:30:36 +08:00
Harryxzy 9daa406d83 优化token接口,避免不配时报错 2024-11-28 13:33:03 +08:00
钱涛 3ba1ea6cc7 推送记录状态 2024-11-28 09:41:10 +08:00
钱涛 866dc1c6ff 薪资项目分页功能 2024-11-27 11:13:20 +08:00
钱涛 1e2d37ad2e 推送明细 2024-11-27 09:02:24 +08:00
钱涛 b652dbbc8b 处理报表空指针 2024-11-26 18:14:41 +08:00
钱涛 74b78a3ab5 推送记录 2024-11-26 18:05:19 +08:00
钱涛 035209afa8 推送记录 2024-11-26 16:47:51 +08:00
钱涛 94da757524 Merge branch 'release/2.17.1.2411.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
2024-11-26 14:21:02 +08:00
钱涛 5d458356a5 Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-26 13:50:20 +08:00
钱涛 79ed6a3226 定制列恢复默认设置 2024-11-26 13:50:10 +08:00
Harryxzy 607fd2c6a2 Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-26 13:30:04 +08:00
钱涛 12df33960a 修改默认列设置功能 2024-11-25 18:05:18 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
钱涛 33cc898257 刷新数据bug 2024-11-25 13:40:00 +08:00
钱涛 38b283e9ba 推送记录 2024-11-22 10:59:16 +08:00
钱涛 119d9f3cd8 推送日志功能 2024-11-21 11:54:47 +08:00
钱涛 7ea1e5fc80 建模列表接口 2024-11-21 10:25:37 +08:00
钱涛 2fe7b7dc03 Merge branch 'release/2.17.1.2411.01' into feature/数据推送 2024-11-20 18:43:59 +08:00
钱涛 dd77a2f11b 数据推送 2024-11-20 17:03:41 +08:00
Harryxzy 04fb5edade 浮动薪酬字符、数值限制 2024-11-20 11:28:14 +08:00
钱涛 e4e3fb4bec 数据推送 2024-11-19 19:34:41 +08:00
Harryxzy 7b6c6d211c Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-19 13:36:23 +08:00
Harryxzy 94c8d82f08 action 增加enableField字段值wei 2024-11-19 13:35:25 +08:00
钱涛 fd48cd9a3d sql 2024-11-19 11:29:21 +08:00
钱涛 ba3e635e1f 版本 2024-11-19 11:12:39 +08:00
Harryxzy 27b4e4c8fd Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-19 10:03:09 +08:00
Harryxzy 05c0995841 工资单导出增加查看、确认状态 2024-11-19 10:02:33 +08:00
钱涛 618dbd17d8 fix默认值列表重复bug 2024-11-19 09:48:13 +08:00
钱涛 9eb6a83f7b 数据推送列表 2024-11-19 09:37:43 +08:00
钱涛 37b9d20faa 数据推送来源枚举 2024-11-18 17:57:58 +08:00
钱涛 bca10e8978 数据推送权限重构 2024-11-18 17:52:48 +08:00
钱涛 527bd5e1ed 数据推送管理 2024-11-18 16:41:48 +08:00
钱涛 f4de5b16e9 Merge branch 'feature/权限' into feature/数据推送 2024-11-15 15:53:08 +08:00
钱涛 db99fc12e2 专项操作按钮 2024-11-15 15:50:32 +08:00
钱涛 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
钱涛 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
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
钱涛 7aa3d12d4f 模板sql 2024-11-08 17:00:42 +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
钱涛 909782d7d6 调薪管理页面权限 2024-10-31 10:46:02 +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
钱涛 4a7b218ee3 次账号sql 2024-10-25 15:19:16 +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
钱涛 641b085a28 单元格锁定sql 2024-10-17 18:53:37 +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
钱涛 cede931b0d 版本 2024-10-17 14:21:46 +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 bbbb29a3d9 社保台账人员信息快照sql 2024-10-11 10:41:52 +08:00
Harryxzy 8d8fc5c15d 社保台账人员信息快照 2024-10-11 10:17:35 +08:00
钱涛 da4e908a7d 模板sql 2024-10-10 14:16:57 +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
钱涛 4b60c83df2 出去多余sql字段 2024-09-27 10:02:22 +08:00
钱涛 63f6dc6c0a Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-26 19:23:43 +08:00
钱涛 222fe9facd 业务线明细列表 2024-09-26 19:20:37 +08:00
钱涛 7f17c2a9b7 业务线同步 2024-09-26 17:52:01 +08:00
钱涛 7d0ebd1cdc 精简版常用查询 2024-09-26 17:00:59 +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
钱涛 fed88b5ac5 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 19:05:21 +08:00
钱涛 6f10ac4ab2 取消非系统人员菜单 2024-09-24 19:04:57 +08:00
钱涛 63c6a5af5e 业务线配置 2024-09-24 19:02:40 +08:00
钱涛 a40814fa0b 业务线sql 2024-09-24 14:37:46 +08:00
钱涛 ae708a1d3b Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 13:19:59 +08:00
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +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
钱涛 db064863b2 版本号 2024-09-19 14:19:26 +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
钱涛 8aa34b806c 日志权限 2024-09-12 14:50:10 +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
钱涛 ce1a82b6e7 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-02 18:10:39 +08:00
钱涛 b7f9a1653c 线程数量 2024-09-02 17:41:07 +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
钱涛 4b9341cc98 支持Vlookup 2024-08-16 14:13:59 +08:00
钱涛 94d068356b Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:07:56 +08:00
钱涛 4b30292c6c 支持Vlookup 2024-08-16 14:07:16 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 1d388a1993 支持Vlookup 2024-08-16 14:04:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
Harryxzy be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +08:00
钱涛 7250ed3520 修复组织信息快照,主动添加或者sql添加人员丢失 2024-08-15 17:03:17 +08:00
钱涛 980dc2f532 导入工具 2024-08-15 16:25:31 +08:00
Harryxzy a4d91c3c97 删除无用代码 2024-08-15 16:01:00 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
钱涛 c079b1d2e6 Merge branch 'release/2.15.1.2407.01' into feature/导入工具 2024-08-15 13:48:14 +08:00
钱涛 22ccad05ad 排除显示 2024-08-15 13:47:55 +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
钱涛 c5c469e4c4 修复邮件不显示入职日期 2024-08-15 11:54:18 +08:00
Harryxzy e9fef7d915 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:10:49 +08:00
Harryxzy 4348954994 Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01 2024-08-15 11:09:09 +08:00
钱涛 2b2e9ea504 账套支持sql范围 2024-08-15 10:53:08 +08:00
钱涛 d37434521d Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 10:37:57 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 6450254371 薪酬迁移工具 2024-08-14 14:47:27 +08:00
Harryxzy 832a6ac1ec 社保福利台账明细导入2100bug 2024-08-14 11:17:56 +08:00
钱涛 9d26e1228f 薪酬迁移工具 2024-08-13 18:15:04 +08:00
Harryxzy c255d74912 批量导入 分页 2024-08-13 15:25:57 +08:00
Harryxzy a05fb6fcf0 报表义务人、账套分权 2024-08-13 13:45:24 +08:00
Harryxzy 2e7657eb23 浮动薪酬增加义务人 2024-08-12 17:21:11 +08:00
钱涛 845f117d9c excel导入工具 2024-08-12 17:17:52 +08:00
Harryxzy a0dff5780a 浮动薪酬增加义务人sql 2024-08-12 17:11:17 +08:00
Harryxzy 1ebc56bb70 浮动薪酬增加义务人sql 2024-08-12 16:49:29 +08:00
Harryxzy 5055a4801a 浮动薪酬增加义务人 2024-08-12 16:36:27 +08:00
钱涛 ecb0f6f7bc excel导入工具 2024-08-12 15:16:06 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
钱涛 31cd3981e2 添加日志 2024-08-09 17:30:44 +08:00
钱涛 71c9bd3564 xml文件 2024-08-09 15:53:36 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 8611358c6c 配置 2024-08-08 11:03:55 +08:00
钱涛 e0271c3006 成员和数据批量保存 2024-08-08 10:01:41 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 b8b9cbbe6c 导入薪资项目 2024-08-07 13:25:57 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
Harryxzy dd18cf5191 考勤引用多个账套 2024-08-06 16:54:19 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 23ed2c5f3f 删除、同步对象设置 2024-08-06 10:46:33 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
钱涛 84cb57ccd7 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-05 17:23:47 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
钱涛 4dcb3b4fea 薪资档案分权 2024-08-05 15:40:34 +08:00
钱涛 4d8c54bf8a 角色加描述 2024-08-02 16:18:26 +08:00
钱涛 494679087d 角色加描述 2024-08-02 14:04:14 +08:00
钱涛 9eea989bf2 显示扣缴义务人的角色 2024-08-02 10:10:04 +08:00
钱涛 4d51b6e57c 显示扣缴义务人的角色 2024-08-01 18:04:09 +08:00
钱涛 a0d2db2702 角色 2024-08-01 16:19:23 +08:00
钱涛 c674c22da1 在线算税重试处理 2024-08-01 10:56:29 +08:00
Harryxzy 8d057e2706 Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01 2024-08-01 10:53:29 +08:00
Harryxzy 8bbf8f3ff6 核算时编辑职称bug 2024-08-01 10:52:44 +08:00
钱涛 a8b487c94b Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
2024-08-01 10:16:05 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
钱涛 6f55def466 权限数据 2024-07-30 18:55:02 +08:00
Harryxzy bcf5fbdce7 Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01 2024-07-30 18:17:49 +08:00
钱涛 87a5eb59c6 暂存 2024-07-30 17:45:02 +08:00
Harryxzy 0c3610961f 修复社保福利档案 高级搜索后下载导入模板bug 2024-07-30 17:29:12 +08:00
钱涛 fad1402b06 权限项配置 2024-07-29 16:00:27 +08:00
钱涛 63012fd62a 成员列表 2024-07-29 13:28:46 +08:00
Harryxzy 9819bb25e0 修复社保福利台账补差添加bug 2024-07-29 10:58:41 +08:00
钱涛 a976dbc9c5 成员同步 2024-07-29 09:46:01 +08:00
钱涛 76543c6021 成员同步 2024-07-26 16:35:51 +08:00
钱涛 0b091eee12 成员表达式变更 2024-07-26 14:32:35 +08:00
钱涛 e30ae5a2a1 成员表达式变更 2024-07-26 14:30:14 +08:00
钱涛 4543539206 角色和成员基础接口 2024-07-26 11:35:17 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
Harryxzy 039c6fd568 薪资明细报表合计行过滤文本项 2024-07-22 10:27:46 +08:00
钱涛 909152decc 报表导出改为从内存获取 2024-07-16 16:57:58 +08:00
Harryxzy 6f7ae2506d 阅后即焚oracle数据库修复 2024-07-16 14:56:11 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 95ba4aee36 Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01 2024-07-15 14:48:21 +08:00
Harryxzy 5331494ebc Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01 2024-07-15 14:48:08 +08:00
Harryxzy e579bbc4f2 人员维度分页 2024-07-15 11:20:24 +08:00
钱涛 b91818f2dc 版本 2024-07-15 09:36:40 +08:00
钱涛 50e3be607d 修复oracle bug 2024-07-11 16:30:00 +08:00
Harryxzy a259a52044 人员维度分页 2024-07-11 11:28:54 +08:00
Harryxzy a6f02082d8 fix社保福利台账非系统人员日志空指针 2024-07-10 15:01:49 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
钱涛 7ef229dfde 修复社保调差bug 2024-07-10 10:43:11 +08:00
Harryxzy 95b9f5452a 薪资档案导出fix多选义务人bug 2024-07-08 10:20:21 +08:00
Harryxzy 3a7c1c2d29 修复sql隐藏bug 2024-07-03 18:00:29 +08:00
Harryxzy db93c2b8a8 修复报表分享记录分页总计数bug 2024-06-28 17:22:34 +08:00
钱涛 458f10d09b 优化考勤引用 2024-06-28 15:42:10 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
Harryxzy b26663889d Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 11:33:32 +08:00
Harryxzy 933fc8ae65 报表分享支持次账号 2024-06-26 11:33:12 +08:00
Harryxzy c1c8bae9da Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 10:37:51 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
2024-06-26 10:35:05 +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
钱涛 a90e32fbf4 map映射 2024-06-20 17:08:01 +08:00
Harryxzy 071130adb3 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-20 16:40:42 +08:00
Harryxzy b5f8e88a58 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 16:40:07 +08:00
Harryxzy 537992187e update 设置了多个default_value 2024-06-20 16:39:48 +08:00
钱涛 2be7ec31de 修改工资单预览 2024-06-20 16:39:35 +08:00
Harryxzy 560fabe075 账套人员范围导入增加了一列,导致导入校验没通过 2024-06-20 16:28:48 +08:00
钱涛 8d65e5d501 版本记录 2024-06-20 14:48:35 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
Harryxzy 3f9bb23e80 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 11:44:15 +08:00
Harryxzy e13c2b0cd0 薪资项目同步默认值 2024-06-20 11:43:57 +08:00
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
Harryxzy 4fbd7d7418 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 10:44:41 +08:00
Harryxzy 5459729da2 Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
2024-06-20 10:44:12 +08:00
钱涛 0961071980 Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
2024-06-19 11:23:43 +08:00
钱涛 fe8dcd0ccd 核算默认值 2024-06-19 11:21:00 +08:00
钱涛 f0fce26e8a Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
2024-06-19 11:14:31 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
Harryxzy 216c4cee84 默认值temp 2024-06-17 17:58:01 +08:00
钱涛 5b7533e908 同步假期余额字段 2024-06-14 13:46:59 +08:00
钱涛 5c13f80034 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 17:46:55 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
Harryxzy a27716ae72 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 14:14:38 +08:00
Harryxzy 6513c2b6e6 Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02 2024-06-13 14:14:21 +08:00
Harryxzy 1dd3439ce3 社保福利台账小数位优化 2024-06-13 13:59:43 +08:00
钱涛 db391f01c4 处理大数据内存溢出 2024-06-13 13:39:24 +08:00
钱涛 4798f5d4a6 处理大数据内存溢出 2024-06-12 17:35:06 +08:00
Harryxzy e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
钱涛 1983ba968c 去除日志
系统薪资项目配置不需要重启
2024-06-12 15:35:40 +08:00
钱涛 7e988193c6 公式扩展获取月有多少天 2024-06-12 14:31:50 +08:00
钱涛 853482141f 小数位支持10位 2024-06-12 10:45:32 +08:00
钱涛 f073f6d90c 处理刷新非正常人员问题 2024-06-11 15:48:07 +08:00
钱涛 a1e7ec160c 处理复制异常 2024-06-11 10:10:45 +08:00
钱涛 7a67253407 版本 2024-06-06 15:35:12 +08:00
钱涛 789b77ba0b 档案导入模板注释 2024-06-06 14:54:58 +08:00
Harryxzy 91444e9495 修复薪资核算高级搜索ISNOTEMPTY 中文显示 2024-06-05 16:54:53 +08:00
Harryxzy 16f5ffcf29 优化 - 社保福利台账小数位数 2024-06-05 15:30:57 +08:00
Harryxzy 91b8809c03 修复薪资核算搜索,合并计税bug 2024-06-05 13:43:49 +08:00
Harryxzy b6331b952c 修复
1、社保福利台账补差下载导入模板,显示的是补差数据;
2、报表分享不设置起始日期时oracle数据库兼容问题;
2024-06-05 11:02:59 +08:00
钱涛 e4af4b8918 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-06-03 09:33:02 +08:00
钱涛 6b164ece2a 处理隐藏bug 2024-05-31 11:39:08 +08:00
钱涛 abba78ead3 处理隐藏bug 2024-05-31 11:36:56 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 9aa2a03425 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 14:41:45 +08:00
钱涛 9e8e7f1f09 删除隐藏 2024-05-30 14:41:28 +08:00
钱涛 3569519b12 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 12:02:18 +08:00
钱涛 18a4f7c3e7 隐藏数据迁移 2024-05-30 12:01:53 +08:00
钱涛 7952e93d01 考勤引用显示证件号码 2024-05-29 16:53:51 +08:00
钱涛 63851a1fe7 社保福利通过证件号码导入 2024-05-29 15:32:19 +08:00
钱涛 238438897b 处理工资单证件号码不显示 2024-05-29 14:04:16 +08:00
钱涛 1ca5b15a68 处理档案sql 2024-05-29 10:31:29 +08:00
钱涛 6bd0d1b8a8 锁定人员sql 2024-05-28 17:51:26 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 f298450e7c 根据身份证导入 2024-05-28 15:26:59 +08:00
钱涛 bc5735135c Merge branch 'feature/身份证导入' into release/2.14.3.2406.01 2024-05-28 11:28:18 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 98d45ebd32 处理内存溢出 2024-05-27 11:36:05 +08:00
钱涛 e2dec06735 隐藏身份证号 2024-05-27 10:52:26 +08:00
钱涛 24b2154cb3 隐藏身份证号 2024-05-27 10:48:46 +08:00
钱涛 2cd255136d 版本 2024-05-23 16:13:47 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
Harryxzy bf50976849 Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02 2024-05-23 10:58:30 +08:00
钱涛 1b3da7dfc0 身份证 2024-05-23 09:16:28 +08:00
Harryxzy 51b4a3198c 修复报表数值项目出现文本值 2024-05-21 15:04:52 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 6a1b28c555 解决工资单null 2024-05-17 17:11:51 +08:00
钱涛 4c3b34e376 sql 2024-05-17 15:41:15 +08:00
钱涛 26d6efd827 pdf日志 2024-05-17 10:58:38 +08:00
Harryxzy b76a87b125 社保福利编辑保存改造 2024-05-17 09:40:52 +08:00
钱涛 c146537684 修改计时说明 2024-05-16 15:56:49 +08:00
钱涛 6de3b1454d 获取档案信息sql 2024-05-16 14:06:38 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 0f1473801e 维护工具效率 2024-05-14 14:12:14 +08:00
钱涛 af819896e4 版本 2024-05-14 13:45:03 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
Harryxzy dd54a10433 核算固定列头数优化 2024-05-11 16:19:25 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 8d18c0e5cb 优化“薪资项目同步至账套”,薪酬总管理员能选到所有义务人下账套 2024-05-10 18:25:32 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00
Harryxzy 845586cba2 test 2024-05-10 14:54:02 +08:00
钱涛 e7dee966d6 二开说明 2024-05-09 17:27:28 +08:00
钱涛 bcc1e35117 拦截核算记录样例 2024-05-08 17:28:43 +08:00
钱涛 6d4265acf1 职称显示为中午 2024-05-08 15:31:36 +08:00
钱涛 c97618bd97 修复社保福利修改时没有小数位问题 2024-05-08 11:15:52 +08:00
钱涛 6f2d65a4be 修复社保福利新建时没有小数位和进位规则对应问题 2024-05-08 10:49:08 +08:00
钱涛 bb32bdfe11 核算详细信息 2024-05-07 18:48:38 +08:00
钱涛 6b0606f5a4 自适应 2024-05-07 17:37:02 +08:00
钱涛 def5bae707 账套快照-隐藏字段脚本 2024-05-07 16:41:12 +08:00
钱涛 5c90909c0e 账套快照-解决导入、公式、详细详细不对应问题 2024-05-07 15:25:43 +08:00
钱涛 1cb89a9d1b 账套快照-工资单模板 2024-05-06 17:41:39 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy b5b2c9ef1e 累计专项附加扣除一键累计,能根据义务人进行累计 2024-04-30 15:00:43 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计,能根据义务人进行累计 2024-04-30 14:43:37 +08:00
Harryxzy 8ae76f9b65 Merge branch 'release/2.13.1.2404.02' into feature/工资单审批 2024-04-30 10:26:58 +08:00
Harryxzy 1800c02e58 盛威 2024-04-29 16:08:18 +08:00
Harryxzy d7de02696d 工资单审批,增加规则配置 2024-04-28 16:58:33 +08:00
钱涛 7d7d2dc309 处理公式数组问题 2024-04-28 16:21:44 +08:00
Harryxzy e7c46bc5e8 优化同步离职日期 2024-04-26 15:13:54 +08:00
Harryxzy 4f391a2159 工资单审批 2024-04-26 11:24:47 +08:00
Harryxzy 8ff315b341 工资单审批sql 2024-04-25 17:24:47 +08:00
Harryxzy 34fe103055 工资单审批 2024-04-25 15:30:25 +08:00
钱涛 4682866674 档案sql 2024-04-25 14:25:40 +08:00
Harryxzy ea968c316e 解决数据透视薪资项目排序问题 2024-04-25 14:04:13 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
钱涛 c206538aa6 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-25 11:45:53 +08:00
钱涛 d802d890d6 处理解密问题 2024-04-25 11:45:37 +08:00
Harryxzy f46a18fa27 薪资审批 2024-04-25 09:39:28 +08:00
Harryxzy 11304bebed 薪资审批 2024-04-24 15:55:41 +08:00
Harryxzy 0bf4b8ed09 修复往期累计导入时未加密 2024-04-23 15:45:24 +08:00
钱涛 794ed55c7d 版本 2024-04-22 15:03:28 +08:00
钱涛 95a7f26d60 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-16 16:05:53 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
Harryxzy 916baf623c fix导出文本 2024-04-16 09:57:12 +08:00
Harryxzy 8d7d3c3ec3 非系统人员部门id、分部id删除失败 2024-04-12 15:06:32 +08:00
钱涛 23eba4950b 处理pdf生成 2024-04-11 15:23:23 +08:00
钱涛 6a05269b2d 处理LIKE函数 2024-04-10 14:20:30 +08:00
Harryxzy 44ed332ed5 修复ecology的多语言导致乱码 2024-04-08 17:57:59 +08:00
Harryxzy ff19e46ac2 fix 2024-04-07 15:52:07 +08:00
Harryxzy 93f9e9aca7 1、修复工资单员工信息分部显示问题
2、修复日志功能查询参数超1000导致的报错
2024-04-07 13:56:00 +08:00
Harryxzy 2242723d3f Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02 2024-04-03 11:39:30 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy 4ccfac80f5 sql 2024-04-01 16:33:13 +08:00
Harryxzy f9d7c05190 核算导出模板修改表名 2024-04-01 10:17:45 +08:00
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
Harryxzy 47e0f5da52 fix冲突 2024-03-29 10:52:46 +08:00
Harryxzy 330d1363fc Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02 2024-03-29 10:49:58 +08:00
Harryxzy 5d2cc92bf8 Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
2024-03-29 10:49:39 +08:00
Harryxzy 4e25dd4f0d Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02 2024-03-29 10:47:44 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 130be31d99 薪资核算导出模板 2024-03-27 11:33:56 +08:00
Harryxzy 3c8d1dc6ee 薪资明细表 2024-03-27 09:35:47 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy 92ba8e8fcf 薪资明细合计接口 2024-03-26 13:49:37 +08:00
Harryxzy ccc2744bee 薪资明细 2024-03-26 09:12:59 +08:00
Harryxzy faabf1dad3 薪酬报表-人事状态 2024-03-25 17:29:40 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
Harryxzy 25c2e2f1c1 其他维度 2024-03-22 15:23:03 +08:00
Harryxzy 18c496c009 多部门多分部筛选 2024-03-21 14:19:36 +08:00
Harryxzy 0c444acd38 多部门多分部筛选 2024-03-21 14:19:03 +08:00
Harryxzy 216a2c67d3 社保福利编辑保存改造 2024-03-20 14:47:41 +08:00
Harryxzy 2691b1e099 调薪显示位数前端优化 2024-03-19 17:36:58 +08:00
Harryxzy 649dd8f7d5 社保福利台账补缴新增 2024-03-19 17:23:53 +08:00
Harryxzy 1a4059f7ba 报表数据透视导出 2024-03-19 13:35:37 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
钱涛 68b4d29c40 修改版本号 2024-03-18 09:54:59 +08:00
钱涛 80510c8cfc 修改版本号 2024-03-15 10:20:38 +08:00
Harryxzy 69d94731a0 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 10:15:12 +08:00
Harryxzy 08b2c240ab 提示修复 2024-03-15 10:14:59 +08:00
Harryxzy a1c6d6ba52 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:33:22 +08:00
Harryxzy c3800881bc sql 2024-03-15 09:31:04 +08:00
Harryxzy 0f8b16d473 Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01 2024-03-15 09:19:17 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
Harryxzy d28321bcad Merge branch 'fix/240302_加密解密社保福利错误' into release/3.0.0.2403.01
# Conflicts:
#	src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
2024-03-15 09:18:57 +08:00
Harryxzy ea2a8540ef Merge branch 'fix/240301-加解密开关后社保台账线下对比bug' into release/3.0.0.2403.01 2024-03-15 09:18:30 +08:00
钱涛 0a7334ddef 考勤导入,多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
Harryxzy 0c42e1cb35 同步社保、薪资档案起始发薪日为入职日定时任务 2024-03-14 14:05:36 +08:00
钱涛 a70a2061a5 部门改多选 2024-03-14 11:19:02 +08:00
Harryxzy 8543d70a66 社保加解密 2024-03-14 11:07:01 +08:00
钱涛 f23b23cd92 优化IF解释 2024-03-14 10:25:39 +08:00
Harryxzy 26a3199b1e 社保线下对比加解密 2024-03-13 17:58:24 +08:00
Harryxzy dca445810d Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into fix/240302_加密解密社保福利错误 2024-03-12 18:31:30 +08:00
钱涛 bef1835c39 jar更新 2024-03-12 16:46:55 +08:00
Harryxzy 43c57cb10b 阅后即焚功能 2024-03-12 16:17:24 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
Harryxzy af57e8ecf4 Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01 2024-03-12 14:58:21 +08:00
钱涛 e22e178d08 去除非标准功能 2024-03-12 14:51:28 +08:00
钱涛 9ec3581533 elog配置 2024-03-12 14:42:12 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy 83624be06e Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01 2024-03-12 14:26:42 +08:00
Harryxzy a44d42e9d2 修复加密解密:社保档案、社保台账加解密失败问题 2024-03-12 11:27:13 +08:00
Harryxzy afb4bfd7ad 修复bug:
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
2024-03-11 17:23:20 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
Harryxzy 0f82b8ce10 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-07 14:23:46 +08:00
Harryxzy 17428c621e 非系统人员范围操作日志 2024-03-07 14:23:12 +08:00
钱涛 729c6c7d3a 处理空指针 2024-03-07 14:12:16 +08:00
钱涛 e81937c4dd 去除报表原先的表 2024-03-07 11:45:26 +08:00
钱涛 3b1edddf00 优化薪资账套项目保存逻辑 2024-03-07 10:21:06 +08:00
钱涛 e187ee57e0 获取所有账套列表接口 2024-03-07 09:52:21 +08:00
钱涛 78c1d6f51c 项目日志字段解释 2024-03-06 15:20:21 +08:00
Harryxzy 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2024-03-06 13:50:56 +08:00
Harryxzy 0ac291d83d Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-06 09:23:21 +08:00
钱涛 cb005d717a 添加wiki目录 2024-03-05 17:40:10 +08:00
钱涛 c2eab7ce64 添加wiki目录 2024-03-05 17:37:47 +08:00
钱涛 fc807ae005 版本 2024-03-05 15:43:16 +08:00
Harryxzy 8984369343 薪资档案、社保档案查看日志 2024-03-05 15:15:20 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
钱涛 2fc387cc40 账套条件 2024-03-05 13:44:34 +08:00
Harryxzy afa2cbaf97 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-03-04 16:12:44 +08:00
Harryxzy 3f76b5bbbf 非系统人员管理日志 2024-03-04 16:12:30 +08:00
钱涛 93a77fdb6f 日志包添加锁 2024-03-04 16:04:17 +08:00
Harryxzy 8c6c6a4966 社保福利台账,非系统人员导入报错 2024-03-04 14:30:25 +08:00
钱涛 c081581ba7 Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01 2024-03-04 14:01:33 +08:00
钱涛 f325674673 Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件 2024-03-04 09:41:35 +08:00
Harryxzy 28f7c57e12 社保福利台账导入,表单字段缓存 2024-03-04 09:18:00 +08:00
Harryxzy 5485f7d260 社保福利台账导入,表单字段缓存 2024-03-01 17:40:19 +08:00
钱涛 34f6b76fb1 修复核算数据为null 2024-03-01 16:55:40 +08:00
钱涛 8ae06f27b8 fix导入性能,导入方法类型改完外层引用 2024-02-29 15:53:22 +08:00
Harryxzy efa556ddd9 操作日志修复 2024-02-29 11:31:18 +08:00
Harryxzy 89787332e3 操作日志修复 2024-02-28 18:03:55 +08:00
Harryxzy 066222400b 操作日志修复 2024-02-28 16:44:52 +08:00
Harryxzy adff178a7c 义务人日志优化 2024-02-28 15:01:44 +08:00
钱涛 022b904581 添加账套筛选条件sql 2024-02-28 14:54:13 +08:00
钱涛 a1ab3c79f4 添加账套筛选条件 2024-02-28 14:43:27 +08:00
钱涛 4b77af983a 分页jar 2024-02-28 13:40:05 +08:00
Harryxzy f9163340e5 分片 2024-02-28 09:17:28 +08:00
钱涛 2edb98475b 更新日志版本 2024-02-27 15:43:36 +08:00
Harryxzy 1261194d88 操作日志优化 2024-02-27 11:30:14 +08:00
钱涛 9e8fbbef89 去除pagehelper jar包 2024-02-26 16:25:17 +08:00
钱涛 f11d6a035c 去除pagehelper jar包 2024-02-26 15:40:52 +08:00
sy 4ea2499d85 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-23 16:11:18 +08:00
sy 624c7db09f 薪酬系统-福利台账,核算功能操作日志逻辑添加 2024-02-23 16:11:11 +08:00
Harryxzy 093cb34f77 操作日志fix some bugs 2024-02-23 15:11:56 +08:00
sy 721f6046da Merge remote-tracking branch 'remotes/origin/fix/240101-福利台账列表分权问题修复' into release/2.11.1.2402.01 2024-02-23 14:07:08 +08:00
Harryxzy 4775d8683a fix调薪原因value值相同 2024-02-23 11:42:36 +08:00
sy dce7f684a5 薪酬系统-福利台账,列表分权问题修复 2024-02-23 11:34:48 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
sy e4cbcdd400 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 15:24:12 +08:00
sy 1654e041b9 薪酬系统-福利档案,相关功能操作日志逻辑优化 2024-02-22 15:23:59 +08:00
钱涛 a78c45f8f9 Merge branch 'master' into feature/操作日志组件
# Conflicts:
#	src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
2024-02-22 15:20:14 +08:00
Harryxzy 5c5dcdabb2 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:44:02 +08:00
Harryxzy f591074fc1 日志 2024-02-22 09:43:47 +08:00
sy f7eb698c4c Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:34:09 +08:00
sy 75dd4235af 薪酬系统-福利台账,补缴、补差、退差页相关功能操作日志添加 2024-02-22 09:33:35 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
钱涛 1e12138ca1 Merge branch 'feature/报表维度' into release/2.10.1.2401.01 2024-02-21 14:17:30 +08:00
sy e813a195f5 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-20 17:05:04 +08:00
sy 4f372645ec Merge remote-tracking branch 'remotes/origin/fix/240101-福利方案,自定义福利详情获取接口增加返回参数' into release/2.10.1.2401.01 2024-02-20 17:00:25 +08:00
sy 7804936e52 薪酬系统-福利方案,自定义福利列表返回结果优化 2024-02-20 16:59:18 +08:00
sy 088a5c1d72 薪酬系统-福利台账,正常缴纳页相关功能操作日志添加 2024-02-20 16:50:45 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy 400d22cc93 修复考勤引用查看报错 2024-02-20 10:06:17 +08:00
Harryxzy 4158f9f708 Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01 2024-02-20 09:51:17 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
sy cfb82cb9b2 薪酬系统-福利方案、档案、台账,相关实现类代码梳理,去除sqlsession形式的mpper调用 2024-02-19 17:27:42 +08:00
Harryxzy ee82d1cb9a 工资单确认反馈优化 2024-02-19 14:16:47 +08:00
Harryxzy c64e9b4b76 工资单确认反馈sql 2024-02-19 14:01:30 +08:00
sy 5525d9881c 薪酬系统-福利方案,自定义福利项详情获取接口增加返回参数 2024-02-19 10:33:48 +08:00
Harryxzy 7fe03ac7a1 工资单确认反馈优化 2024-02-19 10:09:49 +08:00
钱涛 b2972e8aca 增加操作日志类型 2024-02-18 11:40:59 +08:00
钱涛 8f8bc5256d 增加操作日志类型 2024-02-18 11:39:49 +08:00
sy 69513fa148 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-07 17:39:57 +08:00
sy 6a79b22c17 薪酬系统-福利档案,增加操作日志 2024-02-07 17:39:26 +08:00
钱涛 8213eedbc5 上传日志包 2024-02-06 14:12:24 +08:00
钱涛 405fe226d9 删除elog 2024-02-05 16:33:43 +08:00
sy 146a21a377 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-05 15:13:21 +08:00
sy 1c61c0004d 薪酬系统-福利方案,方案明细编辑并保存,主表增加操作日志 2024-02-05 15:04:39 +08:00
钱涛 395d3f567f sqlserver字段类型改成nvarchar(max) 2024-02-05 14:48:29 +08:00
钱涛 1c252b79da sqlserver字段类型改成nvarchar(max) 2024-02-05 14:34:16 +08:00
sy 43d10c4ba0 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-05 14:07:08 +08:00
sy 5783342b01 薪酬系统-福利方案,方案新建、复制、删除功能增加操作日志 2024-02-05 14:06:52 +08:00
钱涛 133933e287 修改sqlserver批量插入和oracle类型 2024-02-05 14:04:47 +08:00
sy 6efbd9deb0 薪酬系统,将部分新增代码中labelId入参统一置为0,方便后期多语言逻辑适配时定位 2024-02-04 15:10:35 +08:00
sy 306af48291 薪酬系统-福利档案,SICategoryBiz、SISchemeBiz方法迁移到对应是实现类,并修改调用方相关代码 2024-02-04 10:11:10 +08:00
sy 9074fb46fc 薪酬系统-福利档案,SIArchivesBiz方法迁移到对应是实现类,并修改调用方相关代码 2024-02-02 15:23:26 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
sy f5d21042c8 Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01 2024-01-31 16:32:45 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy a502cd84a2 Merge branch 'fix/240101_回算工资单发放后不能再次回算' into release/2.10.1.2401.01 2024-01-31 16:12:52 +08:00
钱涛 335964e2df 去除无效代码 2024-01-30 17:21:13 +08:00
Harryxzy acbffb205b sql 2024-01-30 16:00:50 +08:00
sy 3281b138fa 薪酬系统-福利档案,复制action功能优化 2024-01-30 15:58:42 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
钱涛 336aaeabea 文本维度,无分组排序放到末尾 2024-01-30 15:45:48 +08:00
sy 8237ed48a6 Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01 2024-01-30 14:32:59 +08:00
sy b1d3d2c445 薪酬系统-福利档案,复制action开发 2024-01-30 14:31:21 +08:00
钱涛 b6f7281cbd 记录日志 2024-01-30 14:17:06 +08:00
Harryxzy 12f66512df 工资单反馈区分pc和移动端 2024-01-30 13:50:05 +08:00
钱涛 60616e8462 Merge branch 'release/2.10.1.2401.01' into feature/报表维度 2024-01-30 11:39:44 +08:00
钱涛 e5a0a85179 增加调薪原因,晋升、降职、调岗 2024-01-30 11:18:54 +08:00
钱涛 65f972846f 处理id超过2100 2024-01-30 10:26:44 +08:00
钱涛 a8bfe83030 操作日志 2024-01-30 09:58:13 +08:00
钱涛 3a0646df9c 修复日志分页问题 2024-01-29 16:21:17 +08:00
钱涛 a78a10cad6 合并 2024-01-29 15:12:12 +08:00
钱涛 d2216eee13 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
2024-01-29 15:07:58 +08:00
sy c4adecf436 薪酬系统-福利档案,减员action优化 2024-01-29 11:30:04 +08:00
钱涛 9c9a8e2661 Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01 2024-01-29 10:05:45 +08:00
钱涛 6a8c9aebe3 修复考勤引用数据失败bug 2024-01-29 10:05:30 +08:00
Harryxzy 5e9956fbbf 修复新建工资单模板时没有模板id,导致添加薪资项目时取到了其他模板的重命名的信息。 2024-01-26 14:56:58 +08:00
sy f215b45afa 薪酬系统-工资单模板,复制功能改造,获取带选择薪资项目逻辑改造 2024-01-26 10:04:53 +08:00
钱涛 2aa4ed05d8 去除达梦驱动 2024-01-25 13:56:18 +08:00
sy 78f96c5008 薪酬系统,拉取20240101分支更新内容,并处理冲突 2024-01-25 13:37:35 +08:00
sy 56c9557b3a Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2024-01-25 11:43:11 +08:00
sy 8eeb358dcc Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-25 11:41:44 +08:00
sy e92e134d21 薪酬系统-工资单模板,复制功能改造,补发工资单模板名称更改 2024-01-25 11:41:35 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
sy 4da07b9e80 薪酬系统-福利档案、台账,基数调整记录列表查询增加分权,台账查询条件支持个税扣缴义务人多选 2024-01-24 14:35:55 +08:00
钱涛 5bf00a98aa 记录核算日志 2024-01-24 09:50:58 +08:00
Harryxzy 71f90882d3 工资单反馈区分pc和移动端 2024-01-23 16:45:09 +08:00
sy 163c436b3d Merge remote-tracking branch 'remotes/origin/fix/231202-福利档案编辑页详情返回参数缺失' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-23 15:38:11 +08:00
sy b84b5d1d6e Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-23 15:37:46 +08:00
sy ead242cdb6 Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into release/2.10.1.2401.01 2024-01-23 15:29:14 +08:00
sy 56bb9a5af3 薪酬系统-福利档案,编辑页详情返回编辑框对应参数缺失问题修复 2024-01-23 15:08:53 +08:00
钱涛 e1ca39e859 elog脚本 2024-01-23 15:00:46 +08:00
sy 60e792d481 薪酬系统-福利台账,自动核算并归档功能优化 2024-01-23 14:46:29 +08:00
钱涛 a5303b42a8 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-01-23 14:08:14 +08:00
钱涛 70b7e556af Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01 2024-01-23 14:07:02 +08:00
钱涛 887ec2084a 导出excel工具类 2024-01-23 14:06:56 +08:00
sy 2a67ca9238 薪酬系统-工资单模板,复制功能改造2 2024-01-23 13:55:49 +08:00
Harryxzy 2d24fbfa23 回算工资单发放后不能再次回算 2024-01-23 11:34:36 +08:00
sy 94d72cd93c 薪酬系统-工资单模板,复制功能改造 2024-01-23 10:52:53 +08:00
Harryxzy c9220d62e1 Merge branch 'fix/240101_非系统人员搜索不生效' into release/2.10.1.2401.01 2024-01-23 10:01:53 +08:00
Harryxzy a3e281b3fe 修复非系统人员搜索不生效 2024-01-23 10:00:26 +08:00
钱涛 6ee8b5f044 解决短信不换行问题 2024-01-22 15:41:38 +08:00
钱涛 5d3a371f56 报表支持文本 2024-01-22 11:45:40 +08:00
sy 56651196fa Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档 2024-01-22 11:03:37 +08:00
钱涛 d09034b17b 报表支持文本 2024-01-22 10:38:18 +08:00
sy e8aee9ab64 薪酬系统-福利档案,档案编辑页详情接口增加返回缺失福利项数值 2024-01-19 17:32:52 +08:00
sy f236b8e655 薪酬系统-福利台账,核算相关方法梳理和优化 2024-01-19 11:35:11 +08:00
钱涛 40013d698b 暂存 2024-01-18 15:12:00 +08:00
sy 29e5c27ffb 薪酬系统-福利台账,自动核算并归档任务类开发 2024-01-17 16:07:27 +08:00
钱涛 a3aa0f5ca1 自适应文字长度 2024-01-17 10:55:42 +08:00
钱涛 3f49076a19 Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-16 16:35:45 +08:00
钱涛 db4b44e62c 修复非系统人员状态bug 2024-01-16 16:35:37 +08:00
Harryxzy f4bb757538 Merge branch 'feature/240101_薪资档案增加起始、结束发薪筛选' into release/2.9.10.2312.02 2024-01-15 18:48:16 +08:00
Harryxzy 0a6467aaa6 薪资档案增加起始、结束发薪筛选 2024-01-15 18:48:05 +08:00
Harryxzy e38fd9be99 薪资档案增加起始、结束发薪筛选 2024-01-15 10:51:53 +08:00
sy e9aba73172 Merge remote-tracking branch 'remotes/origin/feature/231202-福利档案导入基数值自动调整' into release/2.9.10.2312.02 2024-01-15 09:46:29 +08:00
sy be68f01145 薪酬系统-福利档案,mysql环境中sql脚本优化 2024-01-15 09:45:19 +08:00
sy 3b761341fc 薪酬系统-福利档案,档案导入功能优化,增加基数自动调整逻辑 2024-01-10 11:20:36 +08:00
Harryxzy f5aa425f2c fix公式,人员状态变量没有值bug 2024-01-09 13:21:45 +08:00
Harryxzy 8164660ebf Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
2024-01-08 15:34:32 +08:00
Harryxzy 5ecf069a79 Merge branch 'feature/240101_工资单发送action' into release/2.9.10.2312.02 2024-01-08 15:33:16 +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 9232dedbbf Merge branch 'feature/240101_薪资项目宽度' 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
sy 681c0fb18e 薪酬系统-福利档案,档案编辑中更新档案主表和子表的关联关系 2024-01-08 10:57:55 +08:00
Harryxzy 9ca420b5e6 fix删除义务人时,没分片 2024-01-04 10:39:41 +08:00
Harryxzy 7945c84fbb 薪资项目宽度 2024-01-02 16:37:07 +08:00
Harryxzy fe00f5c0e7 工资单发送action 2024-01-02 14:40:33 +08:00
Harryxzy f03c0d0147 薪资项目同步至账套功能,过滤没有权限的账套 2023-12-29 10:27:35 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00
钱涛 06fe3144ba 导入模板 2023-12-28 15:37:01 +08:00
钱涛 2befcfd1f2 pg脚本问题 2023-12-28 11:08:53 +08:00
Harryxzy e976c7aaec oracle工资单模板保存异常 2023-12-27 09:32:31 +08:00
钱涛 ed29be3701 日志 2023-12-26 18:47:45 +08:00
钱涛 7d1ce983dd 日志 2023-12-26 17:49:50 +08:00
钱涛 b7435554e8 操作日志前端接口 2023-12-26 16:12:44 +08:00
Harryxzy 2ed856ac18 Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02 2023-12-25 16:32:11 +08:00
Harryxzy e67cb5bf83 个税扣缴义务人like分成3个 2023-12-25 16:31:36 +08:00
钱涛 8b5703c894 薪资项目操作日志 2023-12-25 09:36:23 +08:00
钱涛 ea8d51c493 薪资项目操作日志 2023-12-22 16:36:11 +08:00
钱涛 7a23324744 修改elog版本表名 2023-12-22 14:52:09 +08:00
钱涛 bd0edcf8e2 日志组件 2023-12-22 14:50:16 +08:00
钱涛 7e980db4b3 日志组件 2023-12-21 20:25:00 +08:00
钱涛 83a41da11d 日志组件 2023-12-21 14:30:21 +08:00
sy a5eb86ab06 薪酬系统-福利台账,线下对比导入功能优化,适配福利基数个人和公司导入 2023-12-21 13:33:21 +08:00
钱涛 b20a3ef103 暂存 2023-12-20 21:00:48 +08:00
钱涛 e8223a832b 缓存识别条件 2023-12-16 12:40:33 +08:00
钱涛 bda3d7080b 缓存识别条件 2023-12-16 12:36:56 +08:00
钱涛 4f8606b00e 缓存识别条件 2023-12-16 12:35:24 +08:00
sy 7cb0e68623 薪酬系统-福利档案,福利档案编辑页公司基数信息返回逻辑优化 2023-12-15 09:50:20 +08:00
Harryxzy 14cb45f4bc Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2023-12-14 16:00:46 +08:00
Harryxzy 85f009984c Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02 2023-12-14 16:00:24 +08:00
Harryxzy e97a35f158 新建补发工资单模板时,已发补发项目fix 2023-12-14 15:57:55 +08:00
sy 2685c724e4 薪酬系统-福利档案,福利档案编辑页方案基础信息返回逻辑优化 2023-12-14 13:59:39 +08:00
钱涛 d53897d147 Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2023-12-14 10:40:06 +08:00
钱涛 96d37b1b68 修复申报表明细 2023-12-14 10:39:49 +08:00
sy e97dab27fc 薪酬系统-福利档案,拆分个人和公司福利基数逻辑相关sql脚本 2023-12-13 10:51:24 +08:00
Harryxzy cfbddef42a 核算记录归档action 2023-12-13 09:58:00 +08:00
Harryxzy 5fba05bc43 Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 14:22:44 +08:00
Harryxzy 51022c0a16 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:22:18 +08:00
Harryxzy d38ef4769b Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-12 14:12:19 +08:00
Harryxzy 5c50b61cd5 Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 14:12:14 +08:00
Harryxzy 9602e48e74 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:11:48 +08:00
钱涛 b78f4302e0 小数位 2023-12-12 13:18:17 +08:00
Harryxzy 9c454623bc Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 10:32:30 +08:00
Harryxzy 559ba88e9f 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:32:04 +08:00
Harryxzy 929bcc7877 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:18:10 +08:00
钱涛 04e3225c98 自适应 2023-12-12 10:07:31 +08:00
Harryxzy d6705e8917 产品-批量编辑 2023-12-11 13:09:20 +08:00
Harryxzy 2b6b1ef2c4 Merge branch 'custom/鲁控数字' into feature/231202-批量编辑 2023-12-11 11:36:59 +08:00
钱涛 e495c1799f 自定义 2023-12-11 09:52:47 +08:00
sy 9d0d7a00fc 薪酬系统-福利台账,线下对比列表、导入、导出,适配拆分福利档案个人和公司基数逻辑 2023-12-08 18:06:54 +08:00
Harryxzy 32984afaeb Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-08 11:44:07 +08:00
钱涛 bbe4b315cf pg脚本异常 2023-12-08 11:43:19 +08:00
Harryxzy 8138b5297f 薪酬报表添加文本统计项目时,字符去值规则没有保存进去 2023-12-08 11:41:13 +08:00
sy 1c5249c76e 薪酬系统-福利台账,福利核算、明细列表、导出数据,适配拆分福利档案个人和公司基数逻辑 2023-12-08 11:16:18 +08:00
sy bb1b785f55 薪酬系统-福利档案,导出功能,根据区分个人和公司福利基数逻辑改造 2023-12-07 11:06:19 +08:00
sy 1287a97fe5 薪酬系统-福利档案,导入模板下载、导入、基数调整记录功能,根据区分个人和公司福利基数逻辑改造 2023-12-07 09:41:46 +08:00
Harryxzy 419baeb8cd 鲁控数字 2023-12-06 16:05:08 +08:00
Harryxzy 2a02e17c15 temp 2023-12-06 15:55:47 +08:00
sy 6dca2a4380 薪酬系统-福利档案,开启开关时,档案列表展示,区分个人和公司福利基数 2023-12-06 15:38:19 +08:00
sy ec8cb6214d 薪酬系统-福利档案,档案明细编辑保存功能改造,适配福利档案福利基数拆分个人和公司需求 2023-12-06 14:04:12 +08:00
sy 451c9fb07b 薪酬系统-福利档案,档案明细获取逻辑改造,根据应用设置中的区分开关,判定后将公司的福利基数信息单独区分返回 2023-12-06 09:51:07 +08:00
钱涛 390251bd63 Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 15:08:44 +08:00
钱涛 dd48bff747 同步所有档案起始发薪日期为入职日期 2023-12-05 15:08:37 +08:00
Harryxzy 4eb931686e 鲁控数字temp 2023-12-05 14:57:34 +08:00
Harryxzy 3687bdfcdc Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 11:30:04 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
sy ce10204dab Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账,补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01 2023-12-05 11:26:48 +08:00
Harryxzy a0331112be Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01 2023-12-05 11:26:22 +08:00
sy 362c4d4459 薪酬系统-福利台账,正常缴纳和补缴中未设置缴纳的福利项导入校验优化,忽略为null的福利类缴纳map 2023-12-05 10:21:47 +08:00
sy cecbd16508 薪酬系统-福利台账,正常缴纳和补缴中未设置缴纳的福利项,不允许导入核算数据 2023-12-04 15:10:46 +08:00
钱涛 3f61807401 修复核算结果可能为0 2023-11-29 17:45:16 +08:00
Harryxzy df25f99544 薪资核算固定列头 2023-11-29 16:48:09 +08:00
sy eaa8a45376 薪酬系统-福利台账,编辑功能带出福利项数据逻辑优化,增加缴纳对象(公司或个人)标志字段 2023-11-29 13:50:25 +08:00
sy ce8ac2c125 薪酬系统-福利台账,编辑功能带出福利项数据逻辑优化,增加福利类别标志字段 2023-11-29 11:04:14 +08:00
sy 22d749dcb3 Merge remote-tracking branch 'remotes/origin/fix/231101-福利档案及模板导出后文件损坏问题修复' into feature/231102-福利台账,补差待编辑项扩充其他可缴纳福利项 2023-11-28 16:05:29 +08:00
sy 1bd20b2686 薪酬系统-福利台账,台账查询增加个税扣缴义务人 2023-11-27 11:20:36 +08:00
sy bf99fd81c6 薪酬系统-福利核算,补差数据新增功能接口 2023-11-24 17:42:34 +08:00
钱涛 3ab8840ccd 增加搜索条件颗粒度 2023-11-24 16:49:54 +08:00
sy c8e3d6312b 薪酬系统-福利核算,补差待编辑福利项列表功能接口,补缴第三种方式的待编辑福利项获取逻辑优化,补差编辑tab页待编辑福利项获取逻辑优化 2023-11-24 14:05:03 +08:00
钱涛 f77b4c063b 去除文化遗产 2023-11-23 10:25:33 +08:00
钱涛 a143b4fba5 新增工资单模板短信字段 2023-11-23 09:31:09 +08:00
sy 9876bc49cf 薪酬系统-福利核算,对于处于在缴员工列表,但是不在起始缴纳月和最后缴纳月区间的核算月的人员,不生成核算记录 2023-11-22 16:47:36 +08:00
钱涛 e0f7ec3256 申报表提示日期优化 2023-11-22 16:37:48 +08:00
钱涛 f16f93fd43 过滤pdf中的空或0值 2023-11-22 14:06:34 +08:00
sy 9f8c5f9c07 薪酬系统-福利档案,福利档案列表显示、导入导出数据中不带出福利方案中停止缴费的福利数据 2023-11-22 11:32:32 +08:00
钱涛 afabde3b18 短信模板配置 2023-11-22 10:54:32 +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
sy 4ebad5ec83 Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into fix/231102-福利档案,导入数据中的年月数据校验优化 2023-11-21 16:02:30 +08:00
sy 9bbbd80d36 薪酬系统-福利档案,福利档案导入时,年月格式兼容2001/01一类格式 2023-11-21 16:02:12 +08:00
sy c9b279049d 薪酬系统-福利台账,福利核算出现异常时,优化核算进度获取逻辑 2023-11-21 14:40:30 +08:00
Harryxzy 805fb9ff3c 1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
2023-11-20 16:14:51 +08:00
Harryxzy 1d52069e11 Merge branch 'fix/核算结果导入超过1000' into release/2.9.8.2311.02 2023-11-20 11:22:11 +08:00
Harryxzy a237f75d79 核算结果超过1000导入bug 2023-11-20 11:21:58 +08:00
Harryxzy c8838f2528 Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000 2023-11-20 11:21:14 +08:00
Harryxzy d01634d39c Merge branch 'fix/核算结果导入超过1000' into release/2.9.8.2311.02 2023-11-20 11:10:37 +08:00
Harryxzy 301144214a 薪资核算编辑保存时删除了隐藏项目 2023-11-20 11:09:43 +08:00
Harryxzy 2656ce7c90 薪资核算结果导入超过1000报错 2023-11-20 10:56:03 +08:00
Harryxzy c0ca63129e 线下对比优化 2023-11-16 16:56:50 +08:00
钱涛 a2f63dee2b 短信模板设置接口 2023-11-16 15:42:11 +08:00
钱涛 e1a4e275ff 短信模板设置接口 2023-11-16 15:41:29 +08:00
钱涛 c0e311bf57 不使用系统算税支持重新核算之前月份 2023-11-16 11:42:02 +08:00
钱涛 3de1e62f6b 短信模板 2023-11-16 11:38:21 +08:00
Harryxzy 97a5d4ab91 线下对比表头改造成分组的样式 2023-11-15 17:12:52 +08:00
钱涛 d2127cccff 短信模板 2023-11-15 13:32:37 +08:00
sy e0fcff792d 薪酬系统-福利档案,福利档案及模板导出参数设置优化 2023-11-15 10:17:12 +08:00
钱涛 7f68931cc5 获取考勤假期余额 2023-11-13 17:23:33 +08:00
钱涛 7befa9f408 获取考勤假期余额 2023-11-13 17:23:09 +08:00
钱涛 443f2a749e Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01 2023-11-13 17:20:04 +08:00
钱涛 2c12b10171 1、减少人员bug
2、档案项目输入bug
2023-11-13 17:12:25 +08:00
钱涛 f3bc735fae 短信发送 2023-11-13 16:52:19 +08:00
钱涛 8eefec2e57 跳过考勤报表假期余额权限 2023-11-13 11:15:49 +08:00
钱涛 3dc5cc3a44 修改报表bug 2023-11-10 14:22:58 +08:00
钱涛 eb61811766 假期余额 2023-11-10 10:55:38 +08:00
钱涛 d86b00e5f7 清除加解密状态 2023-11-09 17:01:08 +08:00
钱涛 9ec0daa3f6 加密描述 2023-11-09 16:40:30 +08:00
Harryxzy c88db43e55 Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01 2023-11-09 16:19:35 +08:00
Harryxzy 025cb73a21 Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01 2023-11-09 16:18:00 +08:00
钱涛 0cfbe05c54 报表日期 2023-11-09 16:14:35 +08:00
钱涛 675e5d7972 扩展人员属性 2023-11-09 11:34:00 +08:00
钱涛 e677207eac 新增统计维度展示 2023-11-08 15:59:54 +08:00
钱涛 d2ac1aec23 修改维度展示 2023-11-08 09:38:24 +08:00
钱涛 61d0e0f659 去除无效代码 2023-11-07 20:14:23 +08:00
钱涛 fbd19ecf75 缓存 2023-11-07 19:11:16 +08:00
钱涛 00f806a8e9 Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度 2023-11-07 19:06:57 +08:00
钱涛 bcee3c5e5a 人员属性扩展 2023-11-07 19:06:43 +08:00
钱涛 5f371a8e58 报表复制 2023-11-07 15:55:03 +08:00
钱涛 27255932de 数据库表 2023-11-07 15:12:10 +08:00
钱涛 b30c9b1ca9 Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度 2023-11-07 14:45:27 +08:00
Harryxzy 3353cd67ce Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01 2023-11-07 11:24:59 +08:00
Harryxzy f2a840576e Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01 2023-11-07 11:24:25 +08:00
钱涛 68bc79ab0b 修改关键字 2023-11-07 11:00:00 +08:00
钱涛 b9d119bcf0 修改关闭解密方法 2023-11-07 10:00:51 +08:00
钱涛 36a77a8e0f 自定义报表维度 2023-11-06 18:46:49 +08:00
钱涛 43d627c23a 扩展维度属性 2023-11-06 11:32:25 +08:00
钱涛 74f7c71ffe 扩展维度属性 2023-11-06 11:19:00 +08:00
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
钱涛 0634a139b9 显示字符统计规则 2023-11-02 18:41:58 +08:00
Harryxzy f85f0af44a 下载核算导入模板,直接从缓存拿选的字段 2023-11-02 16:39:58 +08:00
Harryxzy 5d2218b8f0 返聘action 2023-11-02 16:22:24 +08:00
钱涛 83f38d1d74 显示字符统计规则 2023-11-02 14:43:15 +08:00
Harryxzy f80bb620dd 返聘action 2023-11-02 14:21:33 +08:00
钱涛 22a946d9ad 报表支持文本 2023-11-01 16:09:19 +08:00
钱涛 7fa3c31aac 报表支持文本 2023-11-01 09:54:09 +08:00
钱涛 4c11c54973 统一解密位置 2023-10-31 17:16:48 +08:00
钱涛 0c77031e46 报表功能暂存 2023-10-31 17:08:28 +08:00
钱涛 3d8919da25 账套增加证件号码字段 2023-10-31 15:08:43 +08:00
钱涛 e70a17cd19 捕获社保模块导出异常 2023-10-31 11:21:48 +08:00
钱涛 4bf60c0370 公式负数符号特殊处理 2023-10-31 09:41:02 +08:00
钱涛 2b4ded9dd0 修复合计没有根据自定义字段过滤 2023-10-30 19:19:07 +08:00
钱涛 872ca0a805 恢复档案pageid 2023-10-26 13:45:38 +08:00
sy da04a951d2 薪酬系统-福利档案,福利档案基数调整记录列表排序优化 2023-10-26 10:00:14 +08:00
sy 267cced46b 薪酬系统-福利档案,福利档案基数调整记录列表功能优化,可展示非系统人员姓名 2023-10-25 19:14:02 +08:00
钱涛 16f46ae2da 报表人员维度增加部门和工号 2023-10-25 14:33:19 +08:00
钱涛 b08d3bdd2c 修复报表多部门查询 2023-10-25 11:19:47 +08:00
sy dba2f48785 薪酬系统-福利档案,福利档案基数调整记录生成逻辑优化,过滤空值变更 2023-10-25 11:18:10 +08:00
钱涛 adc8bce395 薪资档案改个pageid 2023-10-25 10:14:33 +08:00
sy 5b2609d93f 薪酬系统-福利档案,福利档案基数调整记录表新建sql脚本 2023-10-25 09:49:16 +08:00
sy 05b2c1868b Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01 2023-10-24 14:11:22 +08:00
钱涛 cf2d2552a2 Merge branch 'feature/假期余额' into release/3.0.0.2311.01 2023-10-24 11:44:01 +08:00
钱涛 bf67fe17fc 年假余额 2023-10-24 11:43:14 +08:00
钱涛 7249c749c0 年假余额 2023-10-24 10:24:10 +08:00
sy 1c0b00d163 薪酬系统-福利档案,福利档案基数调整记录列表查询入参调整 2023-10-23 18:07:37 +08:00
钱涛 05b9a2a57e Merge branch 'feature/公式短路' into release/2.9.6.2310.01 2023-10-20 14:19:54 +08:00
钱涛 35550aa788 假期余额 2023-10-20 13:26:25 +08:00
钱涛 a19f86c624 一键累计bug修复 2023-10-20 10:29:46 +08:00
sy 1db16d6fa6 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复,档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-20 09:51:39 +08:00
sy f8f5ea7782 薪酬系统-福利档案,薪资核算时调用福利核算数据查询时人员ids分片 2023-10-20 09:50:44 +08:00
钱涛 83e16cedf6 一键累计bug修复 2023-10-20 09:43:04 +08:00
钱涛 0dd9040408 一键累计bug修复 2023-10-19 17:35:33 +08:00
钱涛 81b9d65a22 过滤== 2023-10-19 16:26:23 +08:00
钱涛 6bbfc10c34 过滤== 2023-10-19 16:25:30 +08:00
钱涛 3745be2c5c 状态编码 2023-10-19 15:52:52 +08:00
sy d247353530 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复,档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-19 14:31:49 +08:00
sy d0e0195709 薪酬系统-福利档案,导入时档案主表查询时人员ids分片 2023-10-19 14:30:58 +08:00
钱涛 18527f745e 修复自定义核算条件 2023-10-19 14:21:22 +08:00
钱涛 0d5f1ce6c7 Merge branch 'release/2.9.6.2310.01' into feature/公式短路 2023-10-18 17:12:22 +08:00
钱涛 213deb731c 调薪记录bug 2023-10-18 17:01:37 +08:00
钱涛 0ecb3a3977 短路处理 2023-10-18 16:01:37 +08:00
sy 96bc325b43 薪酬系统-福利档案,福利档案基数调整记录列表查询入参和返回数据调整 2023-10-18 15:13:08 +08:00
钱涛 dafde8451e 调薪记录bug 2023-10-18 14:20:32 +08:00
sy b9a681a791 薪酬系统-福利台账,线下对比中数值是否存在差异相关逻辑优化 2023-10-18 14:14:05 +08:00
sy 9ac549c06a 薪酬系统-福利档案,福利档案基数调整记录列表查询 2023-10-18 13:34:05 +08:00
sy e68359ef50 Merge branch 'fix/231001-福利台账,导入模板下载接口由get改为post' into release/2.9.6.2310.01 2023-10-18 09:48:19 +08:00
钱涛 5d7a6bc241 调薪记录 2023-10-17 18:04:47 +08:00
sy 0225e40e57 薪酬系统-福利档案,福利档案编辑保存逻辑中增加基数调整记录 2023-10-17 17:46:54 +08:00
sy e80a3497d9 薪酬系统-福利档案,福利档案导入逻辑中增加基数调整记录 2023-10-17 11:40:28 +08:00
Harryxzy a34a5b9aa6 同步义务人人员范围到账套人员范围 2023-10-16 16:59:18 +08:00
钱涛 7e22c9836f 调整原因接口 2023-10-16 15:01:29 +08:00
钱涛 b4a1aa8039 修改系统公式异常 2023-10-16 10:52:28 +08:00
钱涛 855effccc5 修改系统公式异常 2023-10-13 16:54:33 +08:00
钱涛 4a59859fa8 调薪记录 2023-10-12 17:34:09 +08:00
Harryxzy f70a7e6c96 Merge branch 'fix/231002_变量返回双引号或0' into release/2.9.6.2310.01 2023-10-12 14:28:10 +08:00
Harryxzy 07c1785714 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-12 14:27:57 +08:00
Harryxzy 8e8a502738 prop 2023-10-12 14:26:28 +08:00
钱涛 db71ba0e5f fix null 2023-10-12 14:13:25 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
sy 6ae953c723 薪酬系统-福利台账,补缴、补差导入模板下载接口改为post类型 2023-10-12 11:45:21 +08:00
Harryxzy c83539460c 薪酬token 2023-10-11 15:54:08 +08:00
Harryxzy b71633d744 token 2023-10-11 15:28:58 +08:00
Harryxzy 03d3befbdd token 2023-10-11 14:07:23 +08:00
sy 92a7daa9fa 薪酬系统-福利台账,正常缴纳导入模板下载接口改为post类型 2023-10-10 16:17:44 +08:00
钱涛 e570c1879e 账套保存异常 2023-10-09 15:35:20 +08:00
Harryxzy e25ea296e8 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:34:32 +08:00
Harryxzy 2766ceb276 自动同步考勤定时任务 2023-10-09 14:34:18 +08:00
钱涛 61b80e3ad1 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:17:25 +08:00
钱涛 39520346dc 解密 2023-10-09 14:17:15 +08:00
Harryxzy d69aa46e33 自动同步考勤定时任务 2023-10-09 14:10:09 +08:00
钱涛 dada3a0633 去除objectuutil 2023-10-09 10:43:43 +08:00
钱涛 5f152a991b 核算自定义其他搜索条件 2023-10-08 15:44:09 +08:00
钱涛 182e90676c Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2023-10-08 14:24:33 +08:00
钱涛 8166e76081 账套增加状态字段 2023-10-08 13:38:37 +08:00
sy 26e9fc90e1 薪酬系统-福利台账,修复未设置基数情况下存在的核算失败问题 2023-10-08 11:12:16 +08:00
钱涛 138f832537 时效性过滤 2023-10-08 10:11:07 +08:00
钱涛 b6508067f1 过滤枚举 2023-10-08 09:16:54 +08:00
钱涛 37e9b3c33c sql可以使用薪资项目作为变量 2023-10-07 17:00:02 +08:00
钱涛 d98933832a Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
#	src/com/engine/salary/web/SalaryBillController.java
2023-10-07 15:19:38 +08:00
钱涛 67a9d45630 工资单时效设置 2023-10-07 14:47:32 +08:00
钱涛 5241972151 工资单时效设置 2023-10-07 14:46:28 +08:00
钱涛 6fe4b855ec Merge branch 'fix/核算效率' into release/2.9.6.2310.01 2023-10-07 10:05:49 +08:00
钱涛 4c5bc5dda7 增加状态 2023-09-28 17:05:42 +08:00
钱涛 6e889ccc70 同步字段名称到项目公式 2023-09-27 17:17:56 +08:00
钱涛 4ed4edc9ed pdf按钮控制 2023-09-27 14:19:52 +08:00
钱涛 7562b4e4a3 Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件 2023-09-27 14:01:32 +08:00
钱涛 07291fb20a 取消sqlserver自动分片 2023-09-27 10:50:05 +08:00
钱涛 568c62122a 取消sqlserver自动分片 2023-09-27 10:49:55 +08:00
钱涛 763393983c 工资单pdf 2023-09-26 17:52:46 +08:00
钱涛 309e89ceaa 异步处理核算报表数据 2023-09-26 17:35:23 +08:00
钱涛 a7e8498b98 取消核算报表数据 2023-09-26 17:18:27 +08:00
钱涛 f99bb21bab 修复核算效率 2023-09-26 14:29:12 +08:00
钱涛 e37922c52f 工资单pdf 2023-09-26 10:26:12 +08:00
钱涛 1de83a57c2 工资单pdf 2023-09-26 10:00:00 +08:00
钱涛 5d203b0783 自定义搜索 2023-09-25 16:53:01 +08:00
钱涛 faeafbe5ad 暂存 2023-09-25 15:38:14 +08:00
Harryxzy bf8ae9fd09 Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01 2023-09-21 16:03:38 +08:00
Harryxzy bc7d7b3326 Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01 2023-09-21 15:06:04 +08:00
Harryxzy 7a57849a25 报表fixbug 2023-09-21 15:05:39 +08:00
sy f4883ad87c Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01 2023-09-21 14:10:06 +08:00
sy 5f84ed451b Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差,支持一个人存在多个调差记录' into release/2.9.5.2309.01 2023-09-21 14:09:54 +08:00
Harryxzy efa818f8b9 核算结果导出数值项excel格式为数值 2023-09-21 13:36:23 +08:00
Harryxzy cdefb1d310 Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01 2023-09-21 11:45:34 +08:00
Harryxzy 443368bdb3 Merge branch 'fix/230902-账套中从公式改为输入,核算公式展示错误' into release/2.9.5.2309.01 2023-09-21 11:44:23 +08:00
Harryxzy ad6587b9b2 Merge branch 'fix/230902-能够重复反馈' into release/2.9.5.2309.01 2023-09-21 11:44:12 +08:00
钱涛 c86151225d 流程获取档案信息v2 2023-09-21 11:43:41 +08:00
Harryxzy 9e95e3402b 删除多余注释 2023-09-21 11:02:48 +08:00
钱涛 3609045de2 流程获取档案信息 2023-09-21 10:58:19 +08:00
Harryxzy 97b451e203 sql 2023-09-21 10:05:32 +08:00
Harryxzy dfc8a1c578 报表共享 2023-09-21 09:38:38 +08:00
sy 3167aaab63 薪酬系统-福利方案,修改查询参数 2023-09-20 17:29:44 +08:00
sy 05507180eb 薪酬系统-福利台账,调差保存时判断调差到对象是否为统计范围内福利项 2023-09-20 15:40:31 +08:00
Harryxzy c40c31845c 账套中修改公式为输入,核算的公式页面展示为空字符串不是”输入“ 2023-09-20 15:26:18 +08:00
Harryxzy 74e4d39b83 报表fix 2023-09-20 15:02:44 +08:00
钱涛 9ab80de441 工资单pdf和签名 2023-09-20 14:45:44 +08:00
sy dc93a96c8d 薪酬系统-薪资核算,获取福利核算数据逻辑优化 2023-09-20 14:13:00 +08:00
Harryxzy 0eafc0ce94 报表temp 2023-09-20 09:10:47 +08:00
Harryxzy 5bd66b626f 查看工资单后能够继续反馈、确认 2023-09-19 16:21:23 +08:00
sy bf6918264f 薪酬系统-福利方案,福利方案修改action 2023-09-19 15:24:44 +08:00
Harryxzy 897a7731bf 报表fixbug 2023-09-19 13:59:08 +08:00
Harryxzy c7713353dd 报表fixbug 2023-09-19 13:34:51 +08:00
Harryxzy 5d4231c241 报表共享fix 2023-09-19 13:11:24 +08:00
钱涛 b0a25f6cf0 删除与组织冲突sql 2023-09-19 11:37:37 +08:00
钱涛 d9c56a0da4 修复switchs函数数据问题 2023-09-19 11:24:41 +08:00
sy 2afa94e3a4 Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差,支持一个人存在多个调差记录 2023-09-19 10:47:13 +08:00
Harryxzy c95098a22b 报表共享fix 2023-09-18 19:14:06 +08:00
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
Harryxzy 5f1ef51892 报表共享temp 2023-09-18 18:20:53 +08:00
sy 5538a7d01e 薪酬系统-福利方案,增加查询功能 2023-09-18 16:30:52 +08:00
钱涛 88a59d3d01 处理空指针 2023-09-18 13:49:25 +08:00
钱涛 7b3f7b2e39 签名 2023-09-18 10:25:43 +08:00
sy 3826e89a72 薪酬系统-福利台账,福利核算逻辑优化,支持未设置基数,仅设置固定值的福利档案的核算 2023-09-15 15:38:20 +08:00
Harryxzy 7db0a475ff Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01 2023-09-14 17:35:05 +08:00
Harryxzy 0675de75ed 修复复制账套时少复制 2023-09-14 17:32:01 +08:00
钱涛 2b13d0c7ef 定薪账套 2023-09-14 11:56:00 +08:00
sy 38bffb2a8b 薪酬系统-福利台账、档案,细化调差报错信息,编辑action修复新增个税扣缴义务人人员范围 2023-09-13 10:09:32 +08:00
sy 0ad4a63a6b Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差,支持一个人存在多个调差记录 2023-09-12 11:30:12 +08:00
sy eb1966b703 薪酬系统-福利档案,编辑后保存功能,校验档案人员是否为非系统人员逻辑问题修复 2023-09-12 11:21:48 +08:00
sy b276066b52 薪酬系统-福利台账,导入模板带出核算数据 2023-09-12 11:05:46 +08:00
sy 39971f726d Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01 2023-09-08 17:02:03 +08:00
sy 3e7180a25e Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差,支持一个人存在多个调差记录 2023-09-08 16:57:32 +08:00
sy ec406b7f8a 薪酬系统-福利档案,福利档案编辑并减员、编辑并增员action 2023-09-08 16:57:09 +08:00
sy 9bd270e77d 薪酬系统-福利台账,调差支持一人多条记录 2023-09-08 13:24:27 +08:00
sy a8e118b33a 薪酬系统-非系统人员管理,导入时增加对多级部门的识别 2023-09-07 15:11:10 +08:00
Harryxzy 8ec5def53d Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01 2023-09-07 10:05:14 +08:00
sy a672c71e5a 薪酬系统-福利档案,导入初始、最后缴纳月取值逻辑优化 2023-09-06 17:39:09 +08:00
Harryxzy e48f64e814 Merge branch 'fix/230801-修改jackson解析方法' into release/2.9.5.2309.01
# Conflicts:
#	src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
2023-09-06 15:42:53 +08:00
sy eb6fed2079 Merge remote-tracking branch 'remotes/origin/release/2.9.4.2308.02' into fix/230901-福利核算中处理核算结果逻辑中,查询sql分片 2023-09-06 10:17:41 +08:00
sy d7b9485d18 薪酬系统-福利台账,核算数据中间表查询分片 2023-09-06 10:17:20 +08:00
钱涛 1451c4b192 定位解析异常 2023-09-06 10:14:52 +08:00
钱涛 8de418b28b 定位解析异常 2023-09-06 10:13:22 +08:00
sy f6094cbc7a 薪酬系统-福利档案,非系统人员tab页列表 2023-09-06 10:04:58 +08:00
Harryxzy 6f2436d808 新建调薪调整返回数据,为null时不返回“null” 2023-09-04 16:38:18 +08:00
钱涛 5ef4c8c909 解决sql202307100103.sql与组织冲突 2023-09-01 11:33:20 +08:00
钱涛 0ac2fd248e 慢sql提醒 2023-08-31 16:22:02 +08:00
钱涛 2fad3c6c7c Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02 2023-08-31 15:46:29 +08:00
钱涛 283485929f 超时提醒 2023-08-31 15:31:34 +08:00
钱涛 feeb3d21f2 公式检测 2023-08-31 14:39:58 +08:00
sy fac2bc21e0 Merge remote-tracking branch 'remotes/origin/feature/230802-ST数据库适配' into release/2.9.4.2308.02 2023-08-31 14:18:46 +08:00
sy bc21cc7a2e 薪酬系统-福利档案,导入模板带出数据时,参考当前搜索条件 2023-08-31 14:18:00 +08:00
sy cd5e5d2284 薪酬系统-ST数据库适配,神通数据库-薪酬非标初始化脚本 2023-08-31 14:04:41 +08:00
Harryxzy f16f62304c Merge branch 'feature/230901-自动同步结束发薪日期' into release/2.9.4.2308.02 2023-08-31 13:57:49 +08:00
Harryxzy b90066e8b7 fixbug 2023-08-31 13:03:04 +08:00
Harryxzy 6ca1c6eae3 Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02 2023-08-31 11:13:46 +08:00
Harryxzy dbe659d81d Merge branch 'fix/2309101-工资单模板给无分类项目重命名bug' into release/2.9.4.2308.02 2023-08-31 10:39:58 +08:00
Harryxzy 2934a88cc2 同步薪资项目至账套 2023-08-31 10:23:14 +08:00
sy a23e62052c Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02 2023-08-31 09:34:39 +08:00
Harryxzy 190bbe0875 同步薪资项目至账套 2023-08-31 09:24:41 +08:00
Harryxzy 64f64c4f89 自动同步离职人员结束发薪日期 2023-08-30 15:34:54 +08:00
sy bf48341655 薪酬系统-福利档案,全量增减员过滤掉非系统人员 2023-08-30 15:10:25 +08:00
Harryxzy 4467f57928 工资单模板新建时重命名无分类名字消失bug 2023-08-30 13:26:25 +08:00
Harryxzy bd75ef8d3b 自动同步离职人员社保档案、薪资档案最后缴纳日期 2023-08-30 13:09:56 +08:00
Harryxzy c2ae65ff79 Merge branch 'fix/230802-添加非系统人员时误删除taxagentEmp数据' into release/2.9.4.2308.02 2023-08-30 10:44:52 +08:00
Harryxzy c1893f9152 自动同步结束发薪日期temp 2023-08-30 10:41:00 +08:00
sy 8966730267 Merge remote-tracking branch 'remotes/origin/fix/230802-函数中增加福利项基数信息' into release/2.9.4.2308.02 2023-08-30 10:27:51 +08:00
sy 92d33534a0 Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02 2023-08-30 10:26:56 +08:00
sy 28fff1f519 薪酬系统-薪资档案,非系统人员导入模板带出数据中部门为null处理为空字符串 2023-08-29 11:46:06 +08:00
Harryxzy bd1a6b7a9a 在个税扣缴义务人非系统人员添加人员时,会误删除正常人员范围在hrsa_tax_agent_emp中的数据 2023-08-28 22:22:00 +08:00
钱涛 c1db3883b0 核算时暴露日期解析异常 2023-08-27 20:10:31 +08:00
Harryxzy e83db15bc7 薪资档案、薪资核算编辑前端控制保留位数 2023-08-25 15:09:12 +08:00
sy d94ee07de6 薪酬系统-福利方案,处理合并冲突 2023-08-24 09:17:39 +08:00
sy f925943b31 Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action 2023-08-24 09:15:48 +08:00
sy a3b67ab091 薪酬系统-福利方案,福利方案明细数据修改接口,明细表更细sql优化 2023-08-23 18:39:02 +08:00
sy 770074ba23 薪酬系统-薪资核算,非系统人员查询问题修复 2023-08-23 17:48:52 +08:00
sy 2048e9c489 薪酬系统-福利档案,福利档案减员、增员action 2023-08-23 16:52:32 +08:00
sy c94f1b24a4 薪酬系统-福利档案,新增和编辑福利档案action、福利档案导入逻辑优化(仅修改设置值的数据) 2023-08-22 14:47:48 +08:00
sy 5f9fbde35a 薪酬系统-福利方案,福利方案明细数据修改接口,更新明细修改时间 2023-08-21 16:48:17 +08:00
sy 299284872f 薪酬系统-福利方案,福利方案明细数据修改接口 2023-08-21 14:58:01 +08:00
sy 4ffca1872a 薪酬系统-福利台账,核算明细列表合计行导出 2023-08-18 17:58:36 +08:00
sy 4a7b04152b 薪酬系统-薪资核算,薪资项目函数增加福利基数信息 2023-08-18 13:30:42 +08:00
Harryxzy ea1a46839d Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-17 16:07:24 +08:00
Harryxzy 343edd2df7 sql 2023-08-17 16:06:55 +08:00
sy f60eae5af2 薪酬系统-福利台账,列表导出取消对档案状态的过滤 2023-08-17 15:24:15 +08:00
sy 63023ae8e6 薪酬系统-福利档案、台账,档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示 2023-08-17 11:31:38 +08:00
Harryxzy bf555b5b32 修改jackson解析map的方法 2023-08-14 16:38:40 +08:00
Harryxzy 19cb2d9622 Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-14 09:19:20 +08:00
Harryxzy 7ebb8d6618 Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01 2023-08-14 09:19:04 +08:00
Harryxzy 0790322120 Merge remote-tracking branch 'origin/feature/230801-福利档案-同步非系统人员增量数据' into release/2.9.2.2307.02 2023-08-10 15:38:28 +08:00
sy 165c777919 Merge remote-tracking branch 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' into release/2.9.3.2308.01 2023-08-09 18:20:17 +08:00
sy 6f9deed908 薪酬系统-福利档案,修改社保、公积金、其他福利表结构 2023-08-09 18:19:42 +08:00
sy 536465fbae Merge remote-tracking branches 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' and 'remotes/origin/fix/230801-福利台账-导入的年月格式校验逻辑优化' into release/2.9.3.2308.01 2023-08-09 18:08:40 +08:00
sy 9f021b6d5e 薪酬系统-福利档案,修复非系统人员增量数据造成的bug 2023-08-08 15:03:52 +08:00
Harryxzy 6a01f0d785 Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名 2023-08-08 11:42:41 +08:00
Harryxzy a85e887356 sql 2023-08-08 11:42:24 +08:00
Harryxzy fa7eb0ee60 Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造 2023-08-08 11:06:06 +08:00
Harryxzy c977109cb7 sql 2023-08-08 11:05:52 +08:00
sy 9d0194acd3 薪酬系统-福利台账,优化福利台账补缴模板中账单月份和补缴月份校验逻辑 2023-08-07 16:46:17 +08:00
sy 95525d42d8 Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 16:55:56 +08:00
sy 14a944c60b 薪酬系统-非系统人员管理,非系统人员导入时,部门名称为null则置为空字符串 2023-08-04 16:55:19 +08:00
sy d9caedbe5b Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 16:34:16 +08:00
sy 2f6e221c9b 薪酬系统-非系统人员管理,非系统人员导入新增添加status值设置 2023-08-04 16:14:00 +08:00
sy 98e1574914 Merge remote-tracking branch 'remotes/origin/fix/230801-社保福利-停用自定义福利不显示在档案导入模板和台账导入自定义字段中' into release/2.9.3.2308.01 2023-08-04 15:27:34 +08:00
sy 8c9049f1f7 Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 15:26:24 +08:00
sy 4048d0998c Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.3.2308.01 2023-08-04 15:18:56 +08:00
sy cedb49833c Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.2.2307.02 2023-08-04 15:18:10 +08:00
sy 6dd6eca3bf 薪酬系统-人员匹配,优化全量人力表人员查询sql 2023-08-04 15:07:41 +08:00
sy d219d129a5 薪酬系统-福利台账,台账明细导入模板自定义导入字段列表优化 2023-08-04 14:14:44 +08:00
sy c623d32609 Merge remote-tracking branch 'remotes/origin/fix/230801-福利档案-增量处理逻辑添加日志' into release/2.9.3.2308.01 2023-08-04 10:55:27 +08:00
sy 07eb966c18 薪酬系统-非系统人员管理,非系统人员导入逻辑优化 2023-08-04 10:02:06 +08:00
Harryxzy 190771037e fixbug 2023-08-04 09:33:17 +08:00
sy 9488823307 Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.2.2307.02 2023-08-04 09:11:26 +08:00
Harryxzy ebd2e8651f Merge remote-tracking branch 'origin/release/2.9.3.2308.01' into release/2.9.3.2308.01 2023-08-03 09:27:05 +08:00
sy 5925bd5600 薪酬系统-福利档案,增量数据处理-新增福利档案相关日志添加开关 2023-08-02 16:39:20 +08:00
sy 0749ab9d5b 薪酬系统-福利档案,增量数据处理中相关日志添加开关 2023-08-02 16:31:59 +08:00
sy 109028e645 薪酬系统-福利档案,增量数据处理添加日志若干 2023-08-02 16:08:12 +08:00
sy 3f10c8eb96 Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01 2023-08-02 15:41:33 +08:00
sy f566193dcb Merge remote-tracking branch 'remotes/origin/feature/230702-福利方案-自定义福利项删除功能' into release/2.9.3.2308.01 2023-08-02 15:41:00 +08:00
Harryxzy f6dc6d9257 fix个税扣缴义务人删除人员范围,档案不跳到停薪 2023-08-02 14:47:40 +08:00
Harryxzy e655daf018 fix个税扣缴义务人人员范围,无法根据部门、分部维度生成数据 2023-08-02 10:34:04 +08:00
sy 293297ad7f 薪酬系统-福利台账,线下对比导入分批,列表逻辑优化 2023-08-01 15:37:32 +08:00
sy 98bbac3236 薪酬系统-福利台账,线下对比导入分批 2023-08-01 13:53:22 +08:00
Harryxzy 3827c8963d fix补发模板问题 2023-07-31 17:07:21 +08:00
sy 61b35eda1f Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into fix/230702-福利档案-不显示合同到期日期 2023-07-31 16:46:55 +08:00
sy a8f9134418 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-非系统人员导入功能 2023-07-31 16:46:10 +08:00
sy 494156aeaf Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-福利方案-自定义福利项删除功能 2023-07-31 16:45:11 +08:00
Harryxzy 2b08efb483 复制工资单模板时同时复制工资单展示名称信息 2023-07-31 14:13:07 +08:00
sy c0822d7822 薪酬系统-福利方案,自定义福利项删除功能,获取全量核算明细时,对人员id进行去重 2023-07-31 10:57:34 +08:00
Harryxzy b7203625c1 自定义工资项目展示名fix 添加 2023-07-31 10:47:00 +08:00
sy 4b66380c5b 薪酬系统-福利方案,自定义福利项编辑功能优化同名校验逻辑 2023-07-31 10:16:41 +08:00
sy f2091cbba5 薪酬系统-福利档案,新增档案逻辑添加日志2 2023-07-31 09:54:48 +08:00
Harryxzy f282f1a3ab 自定义工资项目展示名 2023-07-28 17:51:50 +08:00
Harryxzy 02628d8224 薪资账套-薪资项目编辑fixBUG 2023-07-28 17:43:14 +08:00
sy 4b1b1077db 薪酬系统-福利档案,新增档案逻辑添加日志 2023-07-28 15:42:37 +08:00
sy 007d6df3cd 薪酬系统-非系统人员管理,非系统人员导入 2023-07-28 10:12:59 +08:00
Harryxzy 0a7c975c28 薪资账套-薪资项目编辑 2023-07-28 09:48:27 +08:00
sy 82d708966e 薪酬系统-非系统人员管理,非系统人员导入预览 2023-07-27 10:07:00 +08:00
sy 80f4f7d43b 薪酬系统-非系统人员管理,非系统人员导入模板 2023-07-27 09:39:03 +08:00
Harryxzy ed99e186e1 fix代码合并bug 2023-07-26 17:56:25 +08:00
Harryxzy 36f6a457cf fix代码合并bug 2023-07-26 17:53:40 +08:00
Harryxzy d5d84967c4 Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02 2023-07-26 17:47:53 +08:00
Harryxzy f5b70764d3 fix 2023-07-26 17:44:41 +08:00
sy 74bb6e85c4 薪酬系统-福利方案,自定义福利项删除功能优化 2023-07-26 14:04:42 +08:00
Harryxzy 7763f16c0f 薪资账套薪资项目编辑功能 2023-07-26 13:43:53 +08:00
Harryxzy ee9697a4ad 修复sql中union异常字符问题 2023-07-25 18:27:19 +08:00
Harryxzy da18b0f884 薪资账套项目页面改造temp 2023-07-25 16:46:57 +08:00
sy 5acf9dc8ad 薪酬系统-福利方案,自定义福利项删除 2023-07-25 16:17:24 +08:00
sy 7969360e67 薪酬系统-福利方案,自定义福利项支持修改缴费对象 2023-07-25 14:28:35 +08:00
Harryxzy a8a414a48b 薪资账套项目页面改造temp 2023-07-24 17:11:19 +08:00
sy 174941ea63 薪酬系统-福利档案,保存功能对于存在冗余数据的情况,利用当前编辑数据,新建对应档案并与base_info表进行关联 2023-07-24 16:39:48 +08:00
sy ea4b603c36 薪酬系统-薪资档案、核算,列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期 2023-07-24 11:26:36 +08:00
sy b10a45ebda 薪酬系统-福利档案,列表不要显示合同到期日期 2023-07-24 10:57:34 +08:00
Harryxzy ad6a571310 自定义工资项目展示名fix 2023-07-21 11:08:54 +08:00
钱涛 0119161173 修复冲突 2023-07-21 10:46:55 +08:00
sy 40de6e0e6b Merge remote-tracking branch 'remotes/origin/feature/230701-社保福利-核算记录的校验' into release/2.9.2.2307.02 2023-07-20 17:06:38 +08:00
sy 7b6a76cad7 薪酬系统-福利台账,导入福利项列表过滤出正常缴纳、补缴、补差细分项 2023-07-20 17:05:46 +08:00
钱涛 a643f43656 修复档案模板名称异常 2023-07-20 16:46:12 +08:00
钱涛 d068ce0744 修复档案模板名称异常 2023-07-20 16:43:50 +08:00
Harryxzy 19c297dfe9 自定义工资项目展示名fix补发 2023-07-20 15:57:27 +08:00
Harryxzy c2cd4d8a4d Merge remote-tracking branch 'origin/release/2.9.2.2307.02' into release/2.9.2.2307.02 2023-07-20 15:37:53 +08:00
Harryxzy 84d9184959 自定义工资项目展示名 2023-07-20 15:37:20 +08:00
钱涛 5b5d3ff447 非系统人员浏览按钮 2023-07-20 15:34:10 +08:00
Harryxzy 79ef1941b2 删除个税扣缴义务人时校验社保福利 2023-07-20 15:14:43 +08:00
钱涛 dbe01ca25e 非系统人员初始化语句 2023-07-20 14:43:50 +08:00
Harryxzy fd3abc7f65 自定义工资项目展示名 2023-07-20 14:12:33 +08:00
Harryxzy ce32c6571c 系统薪资项目重名 2023-07-20 11:14:58 +08:00
Harryxzy b95663ada8 自定义工资项目展示名 2023-07-20 10:42:16 +08:00
sy c7fe4fee23 Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02 2023-07-20 10:19:40 +08:00
钱涛 b98fc4c527 非系统人员冲突 2023-07-20 10:17:20 +08:00
钱涛 01b02531ce Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
#	src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
2023-07-20 10:08:05 +08:00
sy 1c83f1ab0e 薪酬系统-薪资核算,归档action逻辑优化 2023-07-19 18:02:44 +08:00
钱涛 013137ba30 非系统人员状态是临时 2023-07-19 17:07:38 +08:00
Harryxzy 07b36db9e1 加上大括号 2023-07-19 16:27:55 +08:00
Harryxzy 5340b114d1 Merge branch 'feature/230701-工资单反馈' into feature/230702-自定义工资项目展示名 2023-07-19 16:19:53 +08:00
Harryxzy ca0d800bab Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02 2023-07-19 16:18:52 +08:00
Harryxzy 311aa8f139 加上大括号 2023-07-19 16:17:40 +08:00
Harryxzy 8e6bd24d0d 自定义工资项目展示名 2023-07-19 16:14:25 +08:00
Harryxzy a144b88f6c Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02 2023-07-19 11:51:50 +08:00
Harryxzy 31a863c937 没有设置工资单模板时报错 2023-07-19 11:51:31 +08:00
Harryxzy 959aa83a21 Merge branch 'fix/230701-个税扣缴义务人前后空格' into release/2.9.2.2307.02 2023-07-19 11:11:58 +08:00
Harryxzy 0a4c19fb36 Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02 2023-07-19 11:11:46 +08:00
Harryxzy 57f75d36a0 fix个税扣缴义务人保存过滤前后空格 2023-07-19 11:10:27 +08:00
钱涛 3cc0d412ce 修复导出外部人员名称不显示问题 2023-07-19 10:58:11 +08:00
sy 4b503513f2 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出 2023-07-19 10:04:58 +08:00
sy 47b02e4d5d 薪酬系统-薪资核算,归档action 2023-07-19 10:03:29 +08:00
钱涛 b77e7a737c 外部人员名称不可重复 2023-07-19 09:58:42 +08:00
Harryxzy cb3b55f8b4 薪资项目-核算时隐藏sql 2023-07-19 09:35:30 +08:00
钱涛 5e227febee 关闭系统算税后,系统薪资项目可删除 2023-07-18 17:59:20 +08:00
Harryxzy 78e5d37cf3 薪资项目-核算时隐藏 2023-07-18 17:22:42 +08:00
Harryxzy db9a0e22eb 薪资项目-核算时隐藏fixbug 2023-07-18 17:00:09 +08:00
Harryxzy bbb8417008 自定义工资项目展示名temp 2023-07-18 16:28:29 +08:00
Harryxzy d551f5ae76 薪资项目核算时隐藏 2023-07-18 14:03:59 +08:00
Harryxzy b8f44dd5b6 薪资项目核算时隐藏 2023-07-18 11:00:13 +08:00
sy 7c3c929fcd 薪酬系统-福利方案,自定义福利项启用逻辑优化 2023-07-18 09:33:07 +08:00
sy f93090b063 薪酬系统-薪资核算,自定义导出字段优化未分类字段识别逻辑 2023-07-17 17:53:59 +08:00
Harryxzy 8379d6426a Merge remote-tracking branch 'origin/release/2.9.2.2307.02' into release/2.9.2.2307.02 2023-07-17 15:02:52 +08:00
Harryxzy 3a1765b562 Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02 2023-07-17 15:02:33 +08:00
Harryxzy 1ea80b8fe9 工资单反馈 2023-07-17 15:01:14 +08:00
钱涛 5d6a471fb8 删除未适配数据库 2023-07-17 14:37:15 +08:00
Harryxzy 88892f1aac 工资单反馈fixBug 2023-07-17 12:36:20 +08:00
Harryxzy e83302caac 工资单反馈 2023-07-17 12:11:31 +08:00
钱涛 1b289319a4 工资单反馈sql 2023-07-17 11:52:10 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
钱涛 fbdf93cf5b 取消不用系统算税时一系列校验 2023-07-17 10:20:54 +08:00
sy b0e8da2ad4 薪酬系统-福利台账,列表排序规则账单月份逆序、更新时间逆序 2023-07-14 17:32:16 +08:00
sy 2e2954f706 薪酬系统-薪资核算,补缴和补差个人福利项明细核算失败问题修复 2023-07-14 14:43:30 +08:00
Harryxzy faf9636a0d 薪资项目-核算时隐藏 temp 2023-07-14 11:34:53 +08:00
Harryxzy 6279f0d8c9 工资单反馈 2023-07-14 09:55:36 +08:00
sy 3571797e12 薪酬系统-薪资核算,薪资项目函数中增加福利核算明细项根据缴纳状态的细分项 2023-07-14 09:13:19 +08:00
钱涛 942a3b2a97 修复工资单发送列表 2023-07-13 17:23:28 +08:00
钱涛 873b90474f Merge branch 'feature/230701qt' into feature/外部人员 2023-07-13 16:55:36 +08:00
钱涛 152eeaa68e 所有配置文件 2023-07-13 16:55:23 +08:00
钱涛 385726fa76 所有配置文件 2023-07-13 16:51:01 +08:00
sy b007b1b351 薪酬系统-薪资核算,自定义导出字段 2023-07-13 14:43:54 +08:00
钱涛 1d32b4b015 授权文件id过长 2023-07-13 14:36:11 +08:00
钱涛 0fc16efb11 核算界面获取外部人员 2023-07-13 14:11:54 +08:00
钱涛 4901f79066 核算界面获取外部人员 2023-07-13 14:11:32 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
钱涛 888938f150 系统设置接口 2023-07-13 11:33:58 +08:00
钱涛 23c0a78adc 修复外部人员初始化档案数据 2023-07-13 10:20:41 +08:00
钱涛 d5977c053b 添加删除脚本 2023-07-13 09:19:16 +08:00
sy c78c8375f0 薪酬系统-薪资核算,自定义导出字段 2023-07-12 15:20:02 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
Harryxzy 58fe219cdb fix 工资单反馈bug 2023-07-12 11:25:44 +08:00
钱涛 89ecf0984d fix外部人员 2023-07-12 09:45:00 +08:00
sy 47dc9e35bd 薪酬系统-福利台账,已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑 2023-07-11 17:56:45 +08:00
Harryxzy 56c1666542 工资单发放 2023-07-11 17:51:52 +08:00
Harryxzy 5dc2dadd46 工资单自动确认 2023-07-11 17:28:15 +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 33a0723ad2 Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-11 15:29:21 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
Harryxzy 5918de016e Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
2023-07-11 13:24:37 +08:00
Harryxzy fa950fb4dd 薪资项目排序比较 2023-07-11 13:23:07 +08:00
sy fd9a9aef72 Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 11:31:29 +08:00
sy ad37ba9af0 薪酬系统-薪资档案,高级搜索中工号、分部筛选问题修复 2023-07-11 11:30:57 +08:00
sy c28f782f19 Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 11:11:15 +08:00
sy 83604ba534 薪酬系统-福利台账,修改台账列表返回台账状态值返回逻辑 2023-07-11 11:10:32 +08:00
钱涛 f53c904fde Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01 2023-07-11 11:08:39 +08:00
钱涛 bb6cf386cb 修复 2023-07-11 11:05:35 +08:00
Harryxzy 1f5af02056 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-11 10:22:42 +08:00
Harryxzy 287fcae68e 工资单定时发送sql 2023-07-11 10:22:14 +08:00
Harryxzy 7a72ef28d1 Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01 2023-07-11 10:14:46 +08:00
Harryxzy 7d9ad3d79e 不允许删除薪资档案校验 2023-07-11 10:14:28 +08:00
sy a55ca5182e Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 09:59:29 +08:00
sy e67530eb87 薪酬系统-福利档案,导出加高级搜索问题修复 2023-07-10 17:20:04 +08:00
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
sy 193e28758c 薪酬系统-薪资核算、薪资档案、福利档案,高级搜索中的状态条件改为数组类型的入参 2023-07-10 10:26:08 +08:00
Harryxzy b7c58ecc11 Merge branch 'fix/累计专项附加扣除防抖动' into release/2.9.1.2307.01 2023-07-10 10:10:58 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +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 9c34fb9497 薪酬系统-薪资核算,搜索条件新增字段 2023-07-07 11:47:43 +08:00
sy fa28db9c79 薪酬系统-薪资核算,高级搜索和导出带入筛选条件未生效问题修复 2023-07-07 10:15:23 +08:00
Harryxzy 40fc4ea13c 工资单定时发送 调整周期类型 2023-07-05 11:39:54 +08:00
Harryxzy 508e324dac 工资单定时发送 添加 发放周期 2023-07-05 10:36:02 +08:00
Harryxzy 896e0c9e34 工资单定时发送 添加 发放周期 2023-07-05 09:59:45 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
钱涛 91859e5127 Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01 2023-07-04 15:38:55 +08:00
sy 0e8aa4995d Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01 2023-07-04 14:51:07 +08:00
sy 7f7e7cd453 薪酬系统-薪资档案,导入模板字段提示位置问题修复 2023-07-04 14:48:02 +08:00
Harryxzy a5a05aabda 工资单定时发送fix 2023-07-04 14:35:51 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
Harryxzy 8dc3883168 工资单定时发送 2023-07-03 17:46:11 +08:00
钱涛 a37d6758bb 核算状态标识 2023-07-03 14:27:20 +08:00
钱涛 1403b22cf7 修复邮件保存 2023-07-03 14:02:34 +08:00
Harryxzy 11c416601d 工资单定时发送渲染bug 2023-07-03 11:21:49 +08:00
Harryxzy 5e4f32dbab 累计专项附加扣除更新插入时间修正 2023-07-03 10:34:30 +08:00
Harryxzy 2bf99d3ec1 累计专项附加扣除防抖动修复 2023-07-03 10:33:01 +08:00
Harryxzy faa2b9c16e 工资单模板信息 2023-07-03 09:44:10 +08:00
Harryxzy 18fb376054 个税申报撤回fix 2023-06-30 16:41:06 +08:00
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
Harryxzy 8cbc758131 删除档案开关bug 2023-06-30 11:40:59 +08:00
Harryxzy 1fa04f1515 个税申报撤回开关-2 2023-06-29 16:42:48 +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 d10d5da364 Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02 2023-06-29 15:14:10 +08:00
sy a429c271f4 Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02 2023-06-29 15:12:48 +08:00
Harryxzy eb0c59c0b9 累计专项附加扣除列表提速-2 2023-06-29 14:05:33 +08:00
Harryxzy 33593311df 累计专项附加扣除列表提速 2023-06-29 14:04:11 +08:00
Harryxzy e3e0bcd66b 累计专项附加扣除防抖动 2023-06-29 13:53:07 +08:00
钱涛 6a5304a605 修复进度条 2023-06-29 13:38:07 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
钱涛 b130fb0121 海康包冲突jar 2023-06-28 18:11:53 +08:00
Harryxzy 5d83326d23 listByAcctEmployeeIdsAndSalaryItemIds的分片问题 2023-06-28 16:26:20 +08:00
sy cdf4421ac2 薪酬系统-pg数据库适配,初始化sql脚本 2023-06-28 15:56:30 +08:00
sy faee7160e3 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-28 09:46:11 +08:00
Harryxzy 2bb5d18b90 Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02 2023-06-28 09:16:51 +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
钱涛 89ae0dc786 报表缓存时参数变更问题 2023-06-27 16:18:42 +08:00
sy 041303275b Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:09:12 +08:00
sy d65a792076 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:05:22 +08:00
sy 1ed02f4d07 薪酬系统-福利台账,(修改台账列表返回台账状态值返回逻辑)——暂时取消 2023-06-27 15:05:07 +08:00
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +08:00
钱涛 abd8431d49 水印上线脚本 2023-06-26 16:22:19 +08:00
钱涛 f5ce086535 上线脚本 2023-06-26 15:48:25 +08:00
Harryxzy 6ae98ce50a Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02 2023-06-26 14:23:27 +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 ca248ded98 发送邮件修复bug 2023-06-26 13:32:14 +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 ce6ba1453c Merge branch 'fix/一键累计定时任务' into release/2.8.4.2306.02 2023-06-26 13:27:21 +08:00
Harryxzy 0d23a318e8 Merge branch 'feature/停薪action' into release/2.8.4.2306.02 2023-06-26 13:27:03 +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 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
sy cbcd53d92d 薪酬系统-福利台账,修改台账列表返回台账状态值返回逻辑 2023-06-26 10:56:03 +08:00
sy f2cca4cfd7 Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG 2023-06-26 10:15:24 +08:00
sy 8514f076d0 薪酬系统-pg数据库适配,考勤引用-设置表头字段显示异常问题修复 2023-06-26 10:14:07 +08:00
钱涛 50fa724756 采用线程池发送邮件 2023-06-26 10:11:54 +08:00
sy 3657abe41b 薪酬系统-pg数据库适配,福利档案状态变换异常问题修复 2023-06-25 17:56:18 +08:00
sy 1bb9b939f0 薪酬系统-pg数据库适配,薪资档案待定薪导入问题修复 2023-06-25 13:50:20 +08:00
钱涛 1e78c40e9a Merge branch 'feature/报表缓存' into release/2.8.4.2306.02 2023-06-21 09:48:23 +08:00
Harryxzy e7edb9040c 修复无分类 2023-06-20 17:27:18 +08:00
钱涛 3708aea0de 考勤引用-列表字段根据当时引用情况生成 2023-06-20 17:00:14 +08:00
钱涛 d90a1977ce fix数据采集-往期累计情况导出全部字段为空时显示null 2023-06-20 15:58:03 +08:00
Harryxzy d60d24ea2e 新建定量维度时数据透视没有值 2023-06-20 14:31:06 +08:00
钱涛 7719c503fe Merge branch 'release/2.8.4.2306.02' into feature/报表缓存 2023-06-19 14:22:11 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
钱涛 16cf63018f 重新核算或者回算时删除报表缓存 2023-06-19 09:54:02 +08:00
Harryxzy 6850c050b8 薪资核算人员去除 停薪_来自待定薪 2023-06-19 09:16:49 +08:00
Harryxzy d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
Harryxzy 1c6cf5feab 核算人员匹配规则(是否包含停薪列表)暂存 2023-06-16 15:47: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
钱涛 ec67c89e7d 报表排除掉未归档的数据 2023-06-16 13:49:40 +08:00
Harryxzy ee7936a9bf 考勤引用校验能够否删除 2023-06-16 13:33:38 +08:00
Harryxzy 512510c623 考勤引用校验能够否删除 2023-06-16 11:49:23 +08:00
Harryxzy 1805726387 限制无法打开他人工资单 2023-06-16 10:14:28 +08:00
Harryxzy f4b3a742f0 系统默认水印 2023-06-16 09:58:54 +08:00
钱涛 5e6a65e47e 获取报表缓存,暂存方法 2023-06-15 18:48:31 +08:00
钱涛 5926697c29 报表缓存 2023-06-15 17:34:52 +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
Harryxzy ee14b0435b 一键累计定时任务 2023-06-15 16:18:24 +08:00
Harryxzy 36fc2abffc 停薪action 2023-06-15 15:23:54 +08:00
Harryxzy b30c08d3ff 停薪action传个税扣缴义务人名 2023-06-15 14:48:58 +08:00
Harryxzy a044335406 停薪actionCheck 2023-06-15 11:12:12 +08:00
钱涛 87a9338a73 Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02 2023-06-15 10:44:42 +08:00
钱涛 2480525fa6 修复同步档案bug
缓存公共接口
2023-06-15 10:44:31 +08:00
sy c87a754888 薪酬系统,薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列 2023-06-15 10:23:03 +08:00
Harryxzy 9905f406c0 停薪action 2023-06-15 10:07:06 +08:00
Harryxzy d0c04688a8 停薪action 2023-06-15 10:05:27 +08:00
钱涛 1cdbe4d19d 薪酬开关配置 2023-06-14 16:26:25 +08:00
钱涛 912c80c97f 验证方式 2023-06-14 16:15:05 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
sy 3638fb469f 薪酬系统-薪资档案,列表导入、导出统一表头内容和顺序,不包括自选表头 2023-06-14 10:33:26 +08:00
sy 12b4977067 薪酬系统-福利台账,退差新增逻辑优化 2023-06-13 15:43:10 +08:00
sy 1460d32ae4 薪酬系统-社保福利,列表导入、导出统一表头内容和顺序,不包括自选表头 2023-06-13 14:49:26 +08:00
Harryxzy a74bddf326 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.4.2306.02 2023-06-13 13:19:13 +08:00
Harryxzy e034954d79 Merge branch 'fix/statisticsEditDelete' into release/2.8.4.2306.02 2023-06-13 10:19:37 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy b60904cc03 水印 - 邮件水印不支持图片 2023-06-12 18:55:27 +08:00
Harryxzy d303110737 Merge branch 'fix/statisticsEditDelete' into release/2.8.3.2306.01 2023-06-12 15:38:03 +08:00
钱涛 8bde871286 档案返回列表状态 2023-06-12 15:36:27 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
钱涛 34046646b3 还原脚本 2023-06-12 15:17:21 +08:00
Harryxzy 155a00623a 导入编辑自动锁定 根据confValue判断 2023-06-12 10:45:01 +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 849ea1e2d0 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-09 09:49:22 +08:00
Harryxzy 5bee0f3b4d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-09 09:48:56 +08:00
Harryxzy e24579f363 Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01 2023-06-09 09:48:27 +08:00
钱涛 892f99052b 报表数据接口返回报表id 2023-06-09 09:46:03 +08:00
Harryxzy 93a7dcd59f 数据透视 fix WeaTable 2023-06-08 18:04:25 +08:00
钱涛 f881fa2766 取消注释 2023-06-08 17:19:19 +08:00
Harryxzy e464ca8ba6 薪资账套中薪资项目可以删除 2023-06-08 15:30:52 +08:00
Harryxzy 4b574c9e57 报表数据透视提速 2023-06-08 14:00:51 +08:00
Harryxzy 3d11c74d32 报表数据透视fixbug 2023-06-08 12:25:11 +08:00
Harryxzy d013d14e31 系统薪资项目列表显示改造- 数据库适配 2023-06-08 11:38:53 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
钱涛 7b0648cc68 拦截工资单demo 2023-06-08 10:40:00 +08:00
Harryxzy 50fd5812d4 数据透视功能改为post 2023-06-08 10:24:28 +08:00
钱涛 458b04703d Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-08 10:15:59 +08:00
钱涛 a4679d7a5b 展示底层异常 2023-06-08 10:14:37 +08:00
Harryxzy 94edee7f8c Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01 2023-06-08 09:03:21 +08:00
sy 5a54b83b4a Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-07 18:41:22 +08:00
sy 054d880afa 薪酬系统-福利档案,likecondition条件取消mysql指定 2023-06-07 18:40:55 +08:00
钱涛 799b3d9f64 Merge branch 'feature/短信邮件' into release/2.8.3.2306.01 2023-06-07 17:32:48 +08:00
钱涛 7701420430 邮件去除图片 2023-06-07 17:19:00 +08:00
Harryxzy dcb28b052f 数据透视功能-分页+排序 2023-06-07 16:50:09 +08:00
Harryxzy deaa9acfa0 Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective 2023-06-07 15:44:51 +08:00
Harryxzy 4617005e1f 数据透视功能 2023-06-07 15:43:23 +08:00
sy 4c1e7da51b 薪酬系统-福利档案,福利档案导出增加工号信息 2023-06-07 15:40:38 +08:00
钱涛 77e9b0a74b Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-07 15:12:40 +08:00
Harryxzy 9e794c988a Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01 2023-06-07 14:36:27 +08:00
钱涛 3498005a11 工资单发放 2023-06-07 14:21:47 +08:00
Harryxzy a6356a7d3d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-07 12:27:29 +08:00
Harryxzy f4627b53f9 fix没有公式id内容bug 2023-06-07 12:23:05 +08:00
钱涛 37d9c04a30 去除发放状态中文转换 2023-06-07 09:43:54 +08:00
钱涛 d4c8a66fcf 注释优化 2023-06-07 09:31:46 +08:00
钱涛 4a258aa45b 替换短信发送方法 2023-06-06 16:40:09 +08:00
钱涛 f154753698 拦截短信 2023-06-06 15:02:53 +08:00
Harryxzy 1584a27fe8 个税扣缴义务人排序 2023-06-06 14:44:00 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 a308ee8d1f 获取员工短信内容 2023-06-06 14:21:35 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +08:00
Harryxzy 0d3a48e7ea 个税扣缴义务人排序 2023-06-05 15:14:25 +08:00
钱涛 91e3b335dd 工资单通道 2023-06-05 13:35:17 +08:00
Harryxzy 466412a444 Merge branch 'fix/salaryAcctSearchLockItem' into release/2.8.3.2306.01 2023-06-05 09:53:13 +08:00
Harryxzy 30e2c489ea Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-05 09:52:57 +08:00
sy f8e9e8513d Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01 2023-06-05 09:17:54 +08:00
Harryxzy 1294e86c8c 导入自动锁定添加开关 2023-06-02 15:25:46 +08:00
Harryxzy 52b592dd7e 薪资核算获取加锁的值时增加项目条件,提速 2023-06-02 15:06:07 +08:00
Harryxzy d53d7a33d7 删除锁定多余代码 2023-06-02 14:47:15 +08:00
钱涛 0da2bfa55a 邮件暂存 2023-06-02 14:38:56 +08:00
Harryxzy 74c5b4f19f 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
钱涛 4be4acc5d8 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2023-06-01 11:49:16 +08:00
sy 007328476a 薪酬系统-薪资核算,薪资核算列表工号查询逻辑优化 2023-06-01 11:17:06 +08:00
钱涛 3ce388a935 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-01 11:05:26 +08:00
钱涛 0472c7b757 显示字段管理默认使用列
报表空数据处理
2023-06-01 11:05:15 +08:00
Harryxzy 4e04b6e268 薪资核算导入,选择表单字段获取未分类 2023-06-01 10:30:33 +08:00
sy fb03cf98a7 薪酬系统,福利台账、薪资档案、薪资核算增加工号查询 2023-05-31 11:49:40 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
Harryxzy 0ec6e740d3 Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01 2023-05-29 16:48:18 +08:00
Harryxzy a2f4653411 当薪资档案列表为0时,由于查询了全量数据,导致速度慢 2023-05-29 16:17:13 +08:00
钱涛 65849f99b1 人员明细自定义列 2023-05-26 16:45:05 +08:00
钱涛 0734b5ce01 公式des 2023-05-26 15:40:08 +08:00
Harryxzy 7e841f6fd3 修复回算工资单合计列 2023-05-26 15:13:56 +08:00
钱涛 39ee8d9d35 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 14:45:04 +08:00
钱涛 fef828ef1d 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 11:17:25 +08:00
钱涛 ecdfc0c957 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-05-26 11:15:49 +08:00
钱涛 220848e92d 档案项目正序排列 2023-05-26 11:15:40 +08:00
Harryxzy af07cfd930 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-05-25 17:12:15 +08:00
Harryxzy b26e6069ad Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01 2023-05-25 17:11:58 +08:00
Harryxzy 25ffd06dd4 修复编辑薪资核算没有未分类 2023-05-25 17:06:03 +08:00
钱涛 399a615be6 人员明细 2023-05-25 13:51:27 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
Harryxzy 32e7959745 维度统计管理判断能否删除和编辑-2 2023-05-24 14:49:39 +08:00
Harryxzy 33a8ecb4f7 维度统计管理判断能否删除和编辑 2023-05-24 14:17:31 +08:00
sy 91a06a93a3 Merge remote-tracking branch 'remotes/origin/feature/v4-siTermDateRename-0525' into release/2.8.3.2306.01 2023-05-24 10:04:47 +08:00
sy a44f6bf3af 薪酬系统-福利档案,列表表头中的离职日期改为合同到期日期 2023-05-24 10:02:49 +08:00
钱涛 74c4305b9d 优化核算异常提示 2023-05-23 15:15:55 +08:00
Harryxzy 5768da7099 Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02 2023-05-22 14:03:51 +08:00
Harryxzy 1525cf89c7 Merge branch 'feature/initSalaryArchiveAction' into release/2.8.2.2305.02 2023-05-22 14:03:32 +08:00
Harryxzy a916e061d8 Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02 2023-05-22 14:03:22 +08:00
Harryxzy c7bdbe7b85 Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2023-05-22 14:03:07 +08:00
Harryxzy 20262169c9 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02 2023-05-22 14:02:28 +08:00
钱涛 64be49c61c 工资单适配微信 2023-05-22 10:12:23 +08:00
Harryxzy ebf966517b 修复保存日志获取不到id 2023-05-18 14:28:31 +08:00
钱涛 ff8dcf1769 核算异常信息 2023-05-17 17:38:12 +08:00
钱涛 404db31695 薪资项目系统项目排序靠后 2023-05-17 16:57:37 +08:00
钱涛 1534b0257d Merge branch 'feature/公式v2' into release/2.8.2.2305.02 2023-05-17 15:08:16 +08:00
钱涛 7ccf8cf607 字段管理不显示默认使用列 2023-05-17 14:59:12 +08:00
Harryxzy 72f2ca4439 修复核算编辑保存 2023-05-17 14:49:53 +08:00
钱涛 df07a8c9d1 Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02 2023-05-17 14:10:25 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10:12 +08:00
钱涛 a7cc99fdd3 公式异常信息 2023-05-16 18:01:38 +08:00
Harryxzy 083916eb0c 薪资核算编辑 带上公式 2023-05-16 15:41:11 +08:00
Harryxzy a3ee91db15 回算后不允许删除薪资核算记录 2023-05-16 15:05:02 +08:00
Harryxzy a6fc40a084 薪资核算 编辑列改造 2023-05-16 14:12:49 +08:00
Harryxzy 7c74149184 薪资核算导入 选择字段根据分类分组 2023-05-15 18:02:22 +08:00
Harryxzy 6fcfc2db9b 定薪action 2023-05-15 16:47:00 +08:00
sy e28ca6a2d0 薪酬系统-福利档案,生成福利档案列表表头过程中,过滤源数据中人员id为空的数据v2 2023-05-15 14:45:06 +08:00
sy cf6b35f6a0 薪酬系统-福利档案,生成福利档案列表表头过程中,过滤源数据中人员id为空的数据 2023-05-15 13:58:06 +08:00
Harryxzy 4ff15ca651 薪资核算结果编辑导入 记录 2023-05-15 10:28:17 +08:00
钱涛 fb271f435a 公式方法改造 2023-05-15 10:00:59 +08:00
钱涛 d0e5a3a643 Merge branch 'feature/报表v2' into release/2.8.2.2305.02 2023-05-15 09:29:00 +08:00
钱涛 d51c89bb82 公式方法改造 2023-05-15 09:28:22 +08:00
钱涛 f848b74f28 薪酬流程日志 2023-05-12 11:51:42 +08:00
钱涛 eaaf6359af Merge branch 'feature/公式' into release/2.8.2.2305.02 2023-05-12 09:16:54 +08:00
Harryxzy b0084cad9c 薪资核算编辑 手动编辑后自动锁定 2023-05-11 14:40:10 +08:00
Harryxzy 54ca46c653 薪资核算导入项自动锁定 2023-05-11 10:51:43 +08:00
钱涛 53f2c1ebb6 修复提示行号 2023-05-11 10:21:21 +08:00
Harryxzy d08a329000 Merge branch 'feature/维护工具' into release/2.8.2.2305.02 2023-05-11 10:09:10 +08:00
钱涛 6ec0b53fe5 默认档案起始发薪是入职时间 2023-05-11 10:00:21 +08:00
钱涛 3840f26464 公式异常处理 2023-05-10 18:55:23 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
钱涛 2941b5f304 删除报表同时删除项目 2023-05-09 17:37:05 +08:00
钱涛 ecd037424b 去除异常分页 2023-05-09 14:28:46 +08:00
钱涛 797d5095eb 适配if 2023-05-09 10:43:51 +08:00
sy bbba7f314d 薪酬系统-福利,福利档案、核算明细列表获取员工状态逻辑调整 2023-05-08 17:58:17 +08:00
钱涛 197506b72b 适配if 2023-05-08 14:12:33 +08:00
钱涛 6b19445a1a Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
2023-05-08 11:22:23 +08:00
钱涛 ccec800a75 公式升级 2023-05-08 11:21:09 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
Harryxzy b905390623 修复社保福利台账,根据核算创建人过滤 2023-05-06 09:50:48 +08:00
钱涛 7e940b4db4 减少单次核算的人员 2023-05-05 17:15:25 +08:00
钱涛 41e95ceadf 字段管理不显示id 2023-05-05 15:32:55 +08:00
钱涛 aa8f46e84f 删除sql,修改签名 2023-05-05 14:08:37 +08:00
钱涛 159b5811f6 Merge branch 'feature/报表' into release/2.7.4.2304.02 2023-05-05 09:26:29 +08:00
钱涛 0f38b6cbaa 去除mock校验 2023-05-04 19:43:35 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
sy 02e0d5a089 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-05-04 16:42:26 +08:00
sy 59b64b48ae 薪酬系统-福利档案,编辑保存日期格式校验逻辑优化 2023-05-04 16:14:00 +08:00
钱涛 9dc41706b2 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-05-04 14:40:50 +08:00
钱涛 85bf7e0036 数据库删除null 2023-05-04 14:36:49 +08:00
钱涛 2d609ef49d 删除报表 2023-05-04 13:57:55 +08:00
钱涛 ae719ad65b 修复人员过多时bug 2023-05-04 11:56:34 +08:00
Harryxzy 0d6355ca4a 修复回算工资单的合计列 2023-04-28 16:04:52 +08:00
钱涛 790d24b7db Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-28 14:38:11 +08:00
钱涛 0aabcd0471 将除重新核算的项目外的所有的值都锁定 2023-04-28 14:37:59 +08:00
钱涛 0bd16c3f25 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-28 14:07:32 +08:00
钱涛 20e4856c23 人员全部显示 2023-04-28 11:18:01 +08:00
钱涛 2d8b4b07d0 Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
2023-04-28 10:49:33 +08:00
钱涛 1641b70764 权限控制 2023-04-27 17:31:43 +08:00
钱涛 c7286fbae4 定量-组距式分组、定量-单项式分组 2023-04-27 17:18:20 +08:00
钱涛 d36cfe31b3 报表暂存 2023-04-27 16:05:03 +08:00
钱涛 1529a30768 薪资项目取消过滤档案,使得导入功能一页面为准 2023-04-27 09:22:20 +08:00
钱涛 433ce6cf91 暂存 2023-04-26 16:04:33 +08:00
钱涛 14fca43e18 暂存 2023-04-26 15:17:08 +08:00
钱涛 f47ad2a7a3 注释接口 2023-04-25 18:04:05 +08:00
sy 6ad8c84a04 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-25 17:40:05 +08:00
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
sy cb36dc2904 薪酬系统-福利档案,档案编辑功能增加对年月的格式校验 2023-04-25 17:38:54 +08:00
钱涛 59c32b24e6 补算 2023-04-25 17:08:42 +08:00
钱涛 77ce806b37 sysadmin不显示申报记录 2023-04-25 10:43:40 +08:00
钱涛 a611301651 Merge remote-tracking branch 'origin/release/2.7.4.2304.02' into release/2.7.4.2304.02 2023-04-25 10:12:01 +08:00
钱涛 c0060ba358 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-25 10:11:40 +08:00
sy cea8d14c18 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-25 09:22:03 +08:00
钱涛 17785b3c2b 导出报表 2023-04-24 18:08:06 +08:00
钱涛 7b4ebd788c 导出报表 2023-04-24 16:34:23 +08:00
钱涛 8d00e6ad45 报表年月 2023-04-24 14:57:54 +08:00
钱涛 cef3d26693 维护工具 2023-04-24 14:55:32 +08:00
sy 1f7c271519 薪酬系统-福利档案,待减员tab页删除待办,添加个税扣缴义务人范围过滤 2023-04-24 14:47:28 +08:00
钱涛 24dfa57850 报表 2023-04-24 14:09:27 +08:00
sy 61326928df Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-24 14:07:28 +08:00
Harryxzy e2570dc520 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02 2023-04-24 11:03:17 +08:00
sy 27969cff80 薪酬系统-福利台账,补差导入处理合计值为null的情况 2023-04-24 10:11:02 +08:00
钱涛 4034c5cdb0 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-24 09:26:46 +08:00
钱涛 c94d5169f0 维护工具 2023-04-24 09:19:18 +08:00
sy c686f52153 薪酬系统-福利台账,补差导入部分福利项缴费信息相关合计逻辑优化 2023-04-23 18:05:32 +08:00
钱涛 598ff0cf9a Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具 2023-04-23 18:00:41 +08:00
钱涛 5c936a0334 补算 2023-04-23 18:00:30 +08:00
Harryxzy 468dd092a7 恢复往期累计数据 接口 2023-04-23 17:43:02 +08:00
Harryxzy ad6b9a1eb0 Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具 2023-04-23 17:37:14 +08:00
Harryxzy 31235096bb 恢复往期累计数据 2023-04-23 17:37:06 +08:00
钱涛 f4ebcf987c 维护估计控制层 2023-04-23 17:30:43 +08:00
sy 37310f02f6 薪酬系统-福利台账,补差导入相关合计项计算逻辑优化 2023-04-23 16:35:52 +08:00
钱涛 413de52d6a 维护工具v1 2023-04-23 16:27:11 +08:00
sy c9a5228f3e Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-23 13:36:28 +08:00
sy d56e9aff82 薪酬系统,导出excel的title行背景置为灰色 2023-04-23 13:35:17 +08:00
钱涛 36863c3695 报表 2023-04-23 10:14:32 +08:00
钱涛 ce8ca9cdb8 分部实现逻辑 2023-04-21 13:52:57 +08:00
钱涛 4a9df2276d 分部计算类 2023-04-21 11:25:16 +08:00
钱涛 d2b304e690 全量数据 2023-04-20 18:04:18 +08:00
钱涛 135530d3b7 全量数据 2023-04-20 17:55:37 +08:00
Harryxzy 3a555c1866 修复已发 2023-04-20 13:08:58 +08:00
钱涛 ef171db128 公式函数 2023-04-19 19:28:05 +08:00
钱涛 19d5e979bb 修复删除报表和维度分页 2023-04-19 16:32:27 +08:00
钱涛 9994ae3df9 公式 2023-04-19 15:22:42 +08:00
钱涛 34f33d21d8 公式 2023-04-19 13:35:35 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
钱涛 95dd20dc7b 报表接口 2023-04-18 18:55:38 +08:00
sy 62af02522c 薪酬系统-福利台账,线下对比(列表、导入、导出)福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 aeab5c75f5 往期修复 2023-04-18 11:45:30 +08:00
钱涛 c5d9ea5421 累计个人养老金bug 2023-04-18 11:03:09 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
sy f68981baac 薪酬系统-福利台账,福利核算、核算明细列表逻辑优化(取消对档案状态的过滤) 2023-04-17 10:27:31 +08:00
钱涛 f619878f2c 暂存 2023-04-17 10:10:39 +08:00
钱涛 6933d63cb1 自定义报表项目 2023-04-17 09:46:01 +08:00
钱涛 bc590b9ee8 自定义报表 2023-04-14 15:18:18 +08:00
钱涛 bc0b84ee4b 档案验证 2023-04-14 10:51:05 +08:00
钱涛 8a2ec10b65 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-14 10:31:41 +08:00
钱涛 abf255d03c 暂存 2023-04-14 10:31:20 +08:00
Harryxzy b5d3acf418 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01 2023-04-14 09:04:23 +08:00
钱涛 5cb6752c4c Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 17:32:17 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +08:00
钱涛 87701c7229 暂存 2023-04-13 15:13:05 +08:00
钱涛 2d8b538897 Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表 2023-04-13 14:54:22 +08:00
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +08:00
钱涛 15d6a63df6 薪酬上下文 2023-04-13 11:53:43 +08:00
钱涛 deb2e367f4 薪酬上下文 2023-04-13 11:53:08 +08:00
钱涛 59a38954bc Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
2023-04-13 09:35:29 +08:00
钱涛 5ec4f9e649 暂存 2023-04-13 09:32:20 +08:00
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +08:00
钱涛 dc5c776d97 暂存 2023-04-12 15:03:19 +08:00
钱涛 f0eb9c8994 养老金最终版 2023-04-12 13:57:13 +08:00
钱涛 671bbc6bfb 养老金最终版 2023-04-12 10:51:52 +08:00
钱涛 58dbdb0d05 养老金 2023-04-12 09:39:53 +08:00
钱涛 1cbb889748 报表删除 2023-04-11 18:43:33 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
钱涛 0749fffcdb 统计维度 2023-04-11 14:00:41 +08:00
Harryxzy e21b53c2df Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01 2023-04-11 14:00:26 +08:00
Harryxzy bbe7edaa22 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-04-11 13:56:18 +08:00
钱涛 d7ab77dab1 暂存 2023-04-11 13:43:00 +08:00
Harryxzy 0bfe0b62a7 fix 字段重复无法保存 2023-04-11 11:43:32 +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
钱涛 95c8ee6a4f 修复mybatis 2023-04-11 11:31:20 +08:00
钱涛 bbcaa1a1e8 暂存 2023-04-11 11:02:03 +08:00
Harryxzy 8c58cf01b3 字段拷贝调整 2023-04-11 10:48:41 +08:00
Harryxzy 482f4dfc25 薪资项目名不允许包含大括号 2023-04-11 10:36:06 +08:00
Harryxzy a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
Harryxzy 0ef8a2ae12 Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01 2023-04-11 10:16:28 +08:00
Harryxzy 593ad0d3a4 Merge branch 'fix/specialAddDeduction_cannotImport' into release/2.7.3.2304.01 2023-04-11 10:16:00 +08:00
sy 6bb5f8ddb4 Merge remote-tracking branch 'remotes/origin/feature/v4-closeEncryptSettingWithChange-0406' into release/2.7.3.2304.01 2023-04-11 10:10:59 +08:00
sy 8544abe1bc Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01 2023-04-11 10:08:05 +08:00
Harryxzy c3dfc5692e 薪资项目拷贝 2023-04-11 09:56:20 +08:00
钱涛 09b2bf54e1 暂存 2023-04-11 09:22:09 +08:00
钱涛 ce0b8ce186 暂存 2023-04-10 12:43:48 +08:00
钱涛 739904d48f 暂存 2023-04-10 09:47:33 +08:00
Harryxzy d9f041c9bb 账套删除前校验是否存在工资单模板 2023-04-07 16:06:47 +08:00
Harryxzy 207d338ec2 薪资账套重复薪资项目 2023-04-07 15:14:07 +08:00
钱涛 b0284022c1 核算导出全部功能修复 2023-04-07 14:39:22 +08:00
钱涛 b30a58c1d9 报表功能 2023-04-07 14:38:38 +08:00
Harryxzy d5f6d053b3 修复累计专项附加扣除导出全部bug 2023-04-06 16:20:58 +08:00
Harryxzy 75d66e4cb9 专项附加扣除导入 批量更新分片 2023-04-06 16:07:42 +08:00
钱涛 bb76df3718 个人养老金 2023-04-04 17:29:56 +08:00
Harryxzy accb0d3d2b 社保福利台账 - 合计列 2023-04-04 17:21:29 +08:00
sy 6a9d2a6fab Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01 2023-04-04 16:28:25 +08:00
sy add7051759 薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件 2023-04-04 16:28:15 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
钱涛 cb46fccb16 工资单推送 2023-04-03 18:49:28 +08:00
sy eb1d441de7 薪酬系统, 关闭加密方法优化 2023-04-03 16:07:37 +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 5847f3f449 Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01 2023-04-03 11:31:49 +08:00
Harryxzy c97407c2ac 工资单模板修复 2023-04-03 11:31:09 +08:00
Harryxzy dcfe6479ed Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01 2023-04-03 11:12:20 +08:00
Harryxzy 4faa9e36a6 取消待办优化 2023-03-31 10:17:31 +08:00
Harryxzy 2e85f72362 工资单发放系统异常 2023-03-31 09:40:55 +08:00
Harryxzy 40b38b5347 社保福利档案列表提速 2023-03-30 22:52:52 +08:00
sy 31bf7cfd99 薪酬系统-薪资核算和档案,excel导出行高自适应 2023-03-30 17:26:55 +08:00
Harryxzy 30660ce04b 工资单模板,无法修改薪资项为0时不显示 2023-03-30 13:33:52 +08:00
sy 0427ec5ed4 薪酬系统, 关闭加密方法优化 2023-03-30 11:44:21 +08:00
Harryxzy 52decb10ff Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-03-30 11:03:22 +08:00
Harryxzy f0c80f3287 薪资档案导入无法带出工号数据 2023-03-30 10:02:09 +08:00
Harryxzy 295331d1a5 按照工号导入,支持不输入姓名 2023-03-30 09:49:49 +08:00
Harryxzy 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +08:00
Harryxzy ef3260085f 修复重新核算,往期累计删多数据 2023-03-28 14:18:01 +08:00
Harryxzy b331152d27 修复合计列 2023-03-28 13:59:57 +08:00
Harryxzy d99e6147d3 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-03-28 13:40:12 +08:00
Harryxzy 952a8e845c 修复合计列 2023-03-28 11:00:18 +08:00
Harryxzy 2dc40a7b91 取消待办 2023-03-28 10:10:54 +08:00
Harryxzy 95cf271c80 修复薪资档案导入,重复数据报错行数少一 2023-03-28 09:31:00 +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
钱涛 9f6950d8ae 工资单发放 2023-03-20 17:36:29 +08:00
钱涛 052eebe83a 解决工资单人名缺失 2023-03-16 19:17:33 +08:00
Harryxzy 1ab7fcc7b8 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02 2023-03-16 17:20:43 +08:00
钱涛 f79569fe4f 解决工资单人名缺失 2023-03-16 17:19:02 +08:00
Harryxzy 3304ffdbd5 薪资核算导入,添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
钱涛 8430397d03 外部人员终极版 2023-03-16 16:10:29 +08:00
Harryxzy e1b4927eaa 删除多余代码 2023-03-16 14:52:08 +08:00
sy dc2cb5f448 薪酬系统-薪资核算,薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
Harryxzy b9c40955ac Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02 2023-03-16 11:38:38 +08:00
Harryxzy cdf7dd916b 往期累计情况编辑 2023-03-16 11:37:43 +08:00
Harryxzy 6a7e5eacdc 社保福利台账合计列 2023-03-16 11:17:18 +08:00
Harryxzy 521de26b51 Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02 2023-03-16 09:54:49 +08:00
Harryxzy 16cfe18b90 往期累计情况导入BUG 2023-03-16 09:53:46 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 81650888c7 非系统人员 2023-03-15 18:21:04 +08:00
钱涛 ace15ca7a1 非系统人员 2023-03-15 18:03:46 +08:00
Harryxzy ca03e0785e 工资单发放详情导出没有部门信息 2023-03-15 17:09:02 +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
Harryxzy 1f9597195f 外部人员-个税扣缴义务人service获取人员信息改变写法 2023-03-15 15:49:20 +08:00
Harryxzy a9fb24145d 修复往期累计情况,无法导入编辑 2023-03-15 14:14:53 +08:00
Harryxzy 6418e4ad6e 往期累计情况,获取当月税款所属期数据无法导入bug, 2023-03-15 13:38:13 +08:00
钱涛 db09f8047e 注释 2023-03-15 11:04:54 +08:00
钱涛 6bb6e350a8 冲突 2023-03-15 10:43:05 +08:00
sy 3059829619 Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328 2023-03-15 10:22:37 +08:00
sy acc382b835 薪酬系统-薪资核算,核算导出excel格式改造 2023-03-15 10:20: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
钱涛 6f9769bae2 手机号 2023-03-15 10:07:40 +08:00
钱涛 5b88cda35c 账套外部人员接入 2023-03-15 09:13:29 +08:00
钱涛 5f465aa914 外部人员范围列表和删除接口 2023-03-14 15:22:50 +08:00
钱涛 5c75b3cf8e 去除无用代码 2023-03-14 14:22:45 +08:00
钱涛 b54d754c4b 删除个税扣缴义务人人员范围改异步 2023-03-14 11:04:25 +08:00
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
Harryxzy 0c409c627c employeeService查询外部 fixBug 2023-03-13 16:16:05 +08:00
Harryxzy 362f5abdf6 Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员 2023-03-13 16:12:51 +08:00
Harryxzy d5a97c8192 employeeService查询外部 fixBug 2023-03-13 16:12:10 +08:00
钱涛 ad616f80d3 Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员 2023-03-13 16:04:28 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +08:00
Harryxzy 7b0e1cb1f3 employeeService查询外部 fixBug 2023-03-13 15:57:12 +08:00
Harryxzy 32b1a2db48 employeeService查询外部 2023-03-13 15:53:56 +08:00
钱涛 2d091dbd33 异步同步人员校验 2023-03-10 17:15:15 +08:00
Harryxzy 351d892281 Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02 2023-03-10 15:43:24 +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
Harryxzy 8dabfb28b9 个税扣缴义务人删除人员范围时,不设置最后发薪日期 2023-03-10 13:50:52 +08:00
钱涛 d8c13b70d2 内外部人员匹配标识 2023-03-08 18:01:19 +08:00
钱涛 cb6b53c6af Merge remote-tracking branch 'origin/release/2.7.1.2303.02' into release/2.7.1.2303.02 2023-03-08 17:53:20 +08:00
钱涛 ff4dfe4dad fix日期转换,申报表所属月不显示 2023-03-08 17:53:13 +08:00
sy dbf9e878e5 Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02 2023-03-08 17:52:09 +08:00
Harryxzy 401947fabc Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02 2023-03-08 17:50:01 +08:00
钱涛 160116e946 Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员 2023-03-08 16:37:11 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 2c13c138a6 校验每次只能申报一个扣缴义务人 2023-03-07 17:44:21 +08:00
Harryxzy 4ce79438e6 工资单没有工号BUG 2023-03-07 17:43:51 +08:00
Harryxzy 5067d50722 EmployeeBiz修改调用方式-2 2023-03-07 17:20:30 +08:00
Harryxzy 068f7e6535 EmployeeBiz修改调用方式 2023-03-07 17:14:25 +08:00
sy 3e03b5d920 薪酬系统-社保福利,福利核算进度条逻辑优化 2023-03-07 16:52:09 +08:00
sy b6ee197fe6 薪酬系统,梳理Mapper类使用方式 2023-03-07 14:21:01 +08:00
Harryxzy b702286995 考勤数据,详情数据 前端渲染方式改变 2023-03-07 11:36:45 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 a423790a35 获取人员信息 2023-03-06 17:57:20 +08:00
钱涛 88de36f260 Merge branch 'release/2.7.1.2303.02' into feature/外部人员 2023-03-06 13:59:36 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
Harryxzy 762c484d36 个税扣缴义务人名称扩充至40 2023-03-03 15:47:30 +08:00
钱涛 9b8e89bf9f 去除lang3 2023-03-03 14:55:26 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
Harryxzy 1cbd1d2958 自定义福利调整 2023-03-03 09:24:44 +08:00
钱涛 ca20ed8ca2 Merge branch 'release/2.6.3.2303.01' into feature/外部人员 2023-03-02 19:48:40 +08:00
sy 7f0d87a017 Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01 2023-03-02 18:14:19 +08:00
钱涛 26b8996d42 公司名 2023-03-02 17:59:58 +08:00
Harryxzy 3f0160ebe5 Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01 2023-03-02 17:19:44 +08:00
Harryxzy 6fe6dd6043 Merge remote-tracking branch 'origin/fix/V3_replenSalaryTemplateItemChange_0309' into release/2.6.3.2303.01 2023-03-02 17:19:04 +08:00
Harryxzy 83d5a882b9 Merge branch 'fix/V3_addUpSituationShowAsMonth_0309' into release/2.6.3.2303.01 2023-03-02 17:18:39 +08:00
Harryxzy 50e1f2c432 Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01 2023-03-02 17:18:10 +08:00
钱涛 6de22b142d 1、工资单模板
2、一键累计
2023-03-02 17:11:42 +08:00
Harryxzy f48e98cb11 补发工资单模块,薪资项目名称修改时,展示同步修改 2023-03-02 14:51:51 +08:00
Harryxzy 50d6cc4d9a 往期累计情况,按照税款所属期月份进行展示 2023-03-02 14:04:12 +08:00
钱涛 e73ed7142f 正常核算工资单模板同步项目名称 2023-03-02 13:37:28 +08:00
钱涛 fd9b592384 修复核算未分类项目不显示 2023-03-02 11:25:25 +08:00
Harryxzy fdb5774ae4 考勤引用列表改造 2023-03-02 11:23:57 +08:00
Harryxzy 56399c127b 社保福利方案自定义福利列表改造 2023-03-02 10:46:53 +08:00
钱涛 a37e874614 修复工资单模板显示问题 2023-03-02 10:41:21 +08:00
钱涛 a8fc666e79 fix json转换问题 2023-03-02 10:12:00 +08:00
Harryxzy 5455bc739a Merge branch 'fix/V3_exportAddWorkCode' into develop 2023-03-01 16:20:25 +08:00
Harryxzy e7f2d7b496 薪资档案导出,添加工号 2023-03-01 16:19:09 +08:00
钱涛 14bee7f6d5 修复未分类无法保存 2023-03-01 09:58:55 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00
钱涛 8c8d79aba3 档案字段删除 2023-02-27 18:27:11 +08:00
钱涛 0138351665 修复账套项目可删除 2023-02-27 17:51:26 +08:00
sy 3e2cf917ae Merge branch 'feature/v4-siArchivesChangeByTaxRange-0302' into develop 2023-02-24 14:01:56 +08:00
sy 0e164b7989 薪酬系统-社保福利,福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发,不需打开福利档案列表触发 2023-02-24 13:53:57 +08:00
钱涛 26a6327d44 调薪bug 2023-02-23 18:09:05 +08:00
钱涛 a8cb586358 公式删除校验 2023-02-23 15:48:18 +08:00
钱涛 affa437506 加密显示配置 2023-02-23 15:18:33 +08:00
钱涛 1c2028f551 公式删除优化 2023-02-23 14:52:24 +08:00
钱涛 245803cfe8 获取人员状态 2023-02-23 10:28:27 +08:00
钱涛 e3c1efcc47 sql操作的扩展 2023-02-23 09:19:34 +08:00
钱涛 ee5e5fa127 调薪说明 2023-02-22 19:12:53 +08:00
钱涛 41c56b1bd4 调薪说明 2023-02-22 19:07:13 +08:00
钱涛 5f9a7af0fa 修复数据采集按部门搜索 2023-02-22 17:58:19 +08:00
sy 1a5afd6c6d Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02 2023-02-22 14:10:46 +08:00
钱涛 49cd56e359 档案列表重构 2023-02-21 18:05:58 +08:00
钱涛 cb484b8ff9 回算项公式使用不可删除 2023-02-21 17:19:32 +08:00
钱涛 eac70e7cde 薪资项目和社保福利方案分权 2023-02-21 17:02:39 +08:00
钱涛 187e60ec15 薪资项目分权 2023-02-21 16:39:17 +08:00
钱涛 8e31cec138 Merge branch 'feature/公式改造' into release/2.6.2.2302.02 2023-02-21 14:48:43 +08:00
钱涛 eee39ae972 jar引用变更 2023-02-21 14:33:15 +08:00
钱涛 84e63d4d40 加密日志 2023-02-21 13:58:30 +08:00
钱涛 4f22df09f0 支持6位小数 2023-02-20 14:40:18 +08:00
钱涛 73dcd3a53a fix账套删除人员信息字段 2023-02-20 11:54:44 +08:00
钱涛 77cff0ba24 档案字段被公式引用不允许删除 2023-02-17 18:03:46 +08:00
钱涛 bccdd07ba0 修改名称对应修改公式 2023-02-17 17:52:29 +08:00
钱涛 c7d1bbfa35 更新名称 2023-02-17 17:19:17 +08:00
钱涛 dc24b03efd 薪资项目删除校验 2023-02-17 15:58:33 +08:00
钱涛 abeb4d891d 薪资项目删除校验 2023-02-17 14:37:59 +08:00
钱涛 da9b548480 公式 2023-02-17 10:54:18 +08:00
钱涛 1d0a02554e 公式 2023-02-16 14:53:03 +08:00
sy 39cb3b0df1 薪酬系统-福利档案,方案明细中添加福利项上下限数据 2023-02-16 13:14:17 +08:00
钱涛 b57bdcc7eb 接口报错时打印参数 2023-02-16 10:47:30 +08:00
钱涛 91bd28d21a 清除公式 2023-02-16 10:44:13 +08:00
钱涛 1bdc304ddf 清除公式 2023-02-16 09:16:00 +08:00
钱涛 53c767b239 还原脚本 2023-02-15 17:36:29 +08:00
钱涛 a2e9c482a4 修复账套根据名称查询bug
去除调整前后值的限制
2023-02-15 16:38:54 +08:00
sy 6b34c0e916 薪酬系统-福利档案,修改福利方案传参对象 2023-02-15 15:52:49 +08:00
sy 7da1bfff6b 薪酬系统-福利台账,核算明细导出时企业年金单位数值有误相关问题修复 2023-02-15 09:55:33 +08:00
钱涛 4f0dc060ee Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02 2023-02-14 16:00:05 +08:00
钱涛 1c93dab9f0 获取人员档案 2023-02-14 15:41:03 +08:00
钱涛 0337db02df Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02 2023-02-14 15:37:17 +08:00
钱涛 dee7c11eda 修复账套新增异常 2023-02-14 10:53:58 +08:00
钱涛 44819a0903 工资单后台校验 2023-02-13 17:25:13 +08:00
钱涛 2748f04d0a 档案为空不生效 2023-02-13 17:23:05 +08:00
钱涛 8b594c1882 自发起调薪流程 2023-02-13 14:53:35 +08:00
钱涛 78cb59f07f 暂存 2023-02-13 13:27:44 +08:00
钱涛 602051e1ed Merge branch 'release/2.6.1.2301.02' into release/2.6.2.2302.02 2023-02-13 11:02:00 +08:00
钱涛 49894ad6a2 修复申报表总数 2023-02-13 10:59:09 +08:00
钱涛 6792b4c5aa Merge branch 'feature/通过userid查询工资单详情' 2023-02-10 16:45:45 +08:00
钱涛 d1b4ae4a0b 过滤 2023-02-10 16:38:43 +08:00
Harryxzy 3b657db52a 线下对比Oracle导入报错 2023-02-10 09:59:18 +08:00
Harryxzy 510a2e7d29 处理工资单发放历史数据执行时间提前 2023-02-09 19:43:43 +08:00
Harryxzy d30870e28d 调薪不支持字符 2023-02-09 19:24:25 +08:00
钱涛 4186526743 Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02 2023-02-09 19:04:02 +08:00
钱涛 0f9222e1e4 fix年终奖申报备注为0 2023-02-09 19:03:53 +08:00
fcli 5b50903b55 Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02 2023-02-09 18:48:35 +08:00
fcli e99abfddcd feat: 保存更新判断薪资档案引用 2023-02-09 18:47:48 +08:00
Harryxzy 8790938029 Merge branch 'fix/employeeRange_exportBUG' into release/2.6.1.2301.02 2023-02-09 17:41:20 +08:00
Harryxzy cbc1c13e4d Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02 2023-02-09 17:40:49 +08:00
钱涛 8d011d8d49 Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02 2023-02-09 17:32:00 +08:00
钱涛 995689bb1d Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02 2023-02-09 17:31:42 +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
fcli 5ee8097b3e Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02 2023-02-09 17:22:53 +08:00
钱涛 b6429eb41c 通过id查询工资单详情 2023-02-09 17:05:07 +08:00
钱涛 2c37086e70 账套群组保持不变 2023-02-09 15:33:35 +08:00
fcli fdf343dbbd fix: 字段管理可以切换薪资引用 2023-02-09 11:08:03 +08:00
Harryxzy 69dd9cc61c 个税扣缴义务人、薪资账套 导入添加员工状态导入功能 2023-02-08 17:48:14 +08:00
sy 390d2d7851 薪酬系统-福利台账,补缴起始缴纳月之前的福利默认为空 2023-02-08 14:50:45 +08:00
sy 5657d5cc64 薪酬系统-福利台账,福利补缴方式一和二不允许补缴起始缴纳月之前的月份 2023-02-08 13:04:23 +08:00
Harryxzy 22027cde6b Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02 2023-02-08 12:14:39 +08:00
Harryxzy 091221d0d4 我的薪资福利分页BUG 2023-02-08 12:12:45 +08:00
sy de5b5d4c19 薪酬系统-福利台账,福利缴纳周期核算时考虑起始缴纳月相关逻辑,福利补缴不允许补缴起始缴纳月之前的月份 2023-02-08 11:33:17 +08:00
fcli 0a1198f17d fix: 个税扣缴义务人范围非空判断 2023-02-06 17:16:11 +08:00
钱涛 2ff5ff0dce 考勤列表和导出 2023-02-06 16:28:56 +08:00
钱涛 0fb9fb51a0 修复调薪记录显示问题 2023-02-06 11:08:59 +08:00
钱涛 a3775babd3 考勤引用 2023-02-06 10:33:12 +08:00
sy 45d9fa4c12 薪酬系统-福利台账,补缴核算时按照补缴月份考虑缴纳周期 2023-02-03 17:04:30 +08:00
钱涛 258c880543 申报表字段缺失 2023-02-03 15:14:04 +08:00
sy 9a4b58b2ee 薪酬系统-福利台账,只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑 2023-02-03 13:38:12 +08:00
钱涛 cdfced412f Merge branch 'feature/年终奖' into release/2.6.1.2301.02 2023-02-02 16:13:05 +08:00
钱涛 abdd85effd Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02 2023-02-02 16:12:41 +08:00
fcli 003dfe0d35 feat: 请求方式修改 2023-02-02 15:47:17 +08:00
sy 2e7ea046f2 薪酬系统-福利台账,补缴核算过程加入福利方案缴纳周期逻辑 2023-02-02 14:47:39 +08:00
钱涛 810cfe7f5e 考勤引用本身报表 2023-02-01 14:03:13 +08:00
fcli 3f145e133b feat: 添加是否补发参数 2023-02-01 13:39:14 +08:00
fcli 5851ea20be feat: 发放模板获取可用分组或项目 2023-02-01 13:10:05 +08:00
fcli 78f8630465 feat: 薪资账套项目列表分权 2023-02-01 11:23:43 +08:00
fcli dec7c89856 feat: 发放模板获取可用分组或项目 2023-02-01 11:22:38 +08:00
钱涛 f76ac415ba 修复年终奖备注字符不对应 2023-02-01 10:05:02 +08:00
sy 6abc2068ea 薪酬系统-福利方案,福利方案新增、编辑、查看方法改进,福利核算加入福利方案中的缴纳周期因素 2023-01-31 17:40:34 +08:00
fcli e92ea00b02 fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
2023-01-31 14:31:46 +08:00
钱涛 9bedcf6d38 年终奖 2023-01-31 14:15:27 +08:00
fcli da47210b22 fix: 薪资档案根据薪资项目分权展示 2023-01-31 14:05:40 +08:00
Harryxzy ced891c3c0 薪资账套-人员范围导入(下载模板BUG) 2023-01-31 09:41:14 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
sy ae6822dc91 薪酬系统-福利方案,福利方案对象的相关数据载体(po,dto)增加缴纳周期相关新字段,并对sql中的查询字段进行添加 2023-01-30 17:29:07 +08:00
sy 63ae86978f 薪酬系统-福利档案,导出excel文件名添加日期信息 2023-01-30 09:31:31 +08:00
钱涛 d881b63327 年终奖 2023-01-29 14:58:51 +08:00
fcli 80019a029c feat: 获取部分字段 2023-01-28 13:56:02 +08:00
Harryxzy 5bdb3ca0fe Merge branch 'fix/setSendStatusBUG' into release/2.6.1.2301.02 2023-01-18 10:20:19 +08:00
钱涛 570065330b 修复考勤导入异常 2023-01-18 10:02:23 +08:00
fcli bd2597541d feat: 字段管理 2023-01-18 09:38:43 +08:00
Harryxzy dc3bd34e0f 薪资回算sendStatus值update漏写 2023-01-14 13:59:13 +08:00
sy 57753bfb4a Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01 2023-01-12 18:32:11 +08:00
sy 3ed6c43a93 薪酬系统-福利台账,补缴原方式新增时,未设置基数情况下的逻辑优化 2023-01-12 18:31:36 +08:00
sy 3abffc2ee9 Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01 2023-01-12 17:24:55 +08:00
sy 28d515b41a 薪酬系统-福利台账,补缴导入空值时处理逻辑优化 2023-01-12 17:23:26 +08:00
钱涛 2a52671451 支持钉钉打开工资单 2023-01-12 15:47:20 +08:00
fcli 24e0e180be feat: 薪资项目分权,修改查询 2023-01-12 14:20:09 +08:00
fcli 5aff04c834 feat: 薪资项目分权oracle异常问题 2023-01-12 14:19:54 +08:00
fcli 3ec5c34589 feat: 薪资项目分权oracle异常问题 2023-01-12 14:19:50 +08:00
fcli f1bdd0ada9 feat: 薪资项目分权,修改落库 2023-01-12 14:19:46 +08:00
fcli 4bcd355254 feat: 薪资项目分权,修改查询 2023-01-12 14:19:43 +08:00
fcli 90b2edb96c feat: 薪资项目分权代码合并 2023-01-12 14:19:39 +08:00
钱涛 77dadfab4d 账套项目去重 2023-01-12 14:09:04 +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
Harryxzy 6460edc013 去重 2023-01-11 09:47:57 +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 fd5048bd2d fixBug 2023-01-09 15:20:26 +08:00
Harryxzy fd470c56aa 薪资账套人员范围导入 2023-01-09 15:12:44 +08:00
sy b33771d9e4 薪酬系统-福利档案,列表数据展示添加入职日期、离职日期字段 2023-01-09 14:49:58 +08:00
钱涛 830304fabb 系统配置 2023-01-09 14:41:10 +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
钱涛 31a075cee5 删除配置 2023-01-06 14:40:23 +08:00
sy 25ee041638 Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01 2023-01-06 14:07:53 +08:00
sy f722535ba1 薪酬系统-福利台账,补缴新增仅缴纳部分福利项时的台账统计逻辑优化 2023-01-06 11:20:44 +08:00
fcli d1f62e8b49 Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01 2023-01-06 09:06:41 +08:00
fcli d700d7a300 Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01 2023-01-06 09:06:20 +08:00
sy b0436236eb Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01 2023-01-05 17:24:33 +08:00
sy 6c730669c7 薪酬系统-福利台账,补缴新增方式二,按照指定核算月获取缴纳基数功能问题修复 2023-01-05 17:21:31 +08:00
钱涛 6d3c2ca856 Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01 2023-01-05 16:24:51 +08:00
钱涛 dfd8f90df1 考勤同步日志控制 2023-01-05 16:24:40 +08:00
sy d807b72ee7 Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01 2023-01-05 16:16:17 +08:00
sy f1a123dfa4 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229 2023-01-05 16:12:47 +08:00
Harryxzy 708f1c396a Merge branch 'fix/V3-can'tReCalcBug-0105' into release/2.5.3.2301.01 2023-01-05 15:44:21 +08:00
fcli 143de10689 Merge remote-tracking branch 'origin/fix/addUpSituationValidation' into release/2.5.3.2301.01 2023-01-05 15:42:39 +08:00
Harryxzy dc08340c73 fix个税申报后无法重新核算bug 2023-01-05 11:50:01 +08:00
sy ac99625e29 薪酬系统-福利台账,补缴新增社保缴纳明细保存问题修复 2023-01-05 09:53:26 +08:00
fcli 2d9ce61d5d feat: 往期累计一键清空校验bug修复,分页解密时机修改 2023-01-05 09:49:25 +08:00
fcli eb3c75197b feat: 往期累计一键清空校验bug修复 2023-01-05 09:40:43 +08:00
fcli 8e0bf2b693 feat: 往期累计一键清空校验bug修复 2023-01-05 09:25:07 +08:00
sy d25fc4a579 薪酬系统-福利台账,调差默认配置数据获取逻辑优化 2023-01-04 17:41:09 +08:00
sy b786de5e4d 薪酬系统-福利档案,列表查询逻辑优化 2023-01-04 16:30:37 +08:00
sy 5f59ff399d 薪酬系统-福利台账,补缴功能优化只选社保或养老保险时的单位缴纳逻辑 2023-01-04 16:05:19 +08:00
fcli 3863a10c27 fix: 一月份不累计上年数据 2023-01-04 14:15:59 +08:00
sy f53d788583 薪酬系统-福利档案,高级搜索功能支持根据个税扣缴义务人检索 2023-01-03 17:58:14 +08:00
钱涛 4a0a18bb07 修复考勤引用超出人员范围异常 2023-01-03 10:22:42 +08:00
sy 17e6e9d934 薪酬系统-福利台账,补缴获取指定月的缴纳基数,增加技术字符串判空,增加所属社保类字段 2023-01-03 10:09:14 +08:00
sy 19cca7a156 薪酬系统-福利台账,补缴获取指定月的缴纳基数,优化空数据处理 2022-12-30 18:20:10 +08:00
sy e6e1637119 薪酬系统-福利台账,调差新增增加时判断是否已有调差数据的 2022-12-29 17:35:58 +08:00
Harryxzy 4726b9560c Merge branch 'fix/V3-backItemImportBug-1229' into release/2.5.2.22.12.04 2022-12-29 15:05:40 +08:00
Harryxzy dd03efaf9e Merge branch 'feature/V3-salaryArchiveAddWorkCode-1229' into release/2.5.2.22.12.04 2022-12-29 15:04:18 +08:00
sy ee72dcd3f0 薪酬系统-福利台账,调差列表展示默认数据时,处理核算人员外的默认人员数据逻辑优化 2022-12-29 14:43:54 +08:00
sy ea763bd20c Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04 2022-12-29 10:19:49 +08:00
sy a9168afe58 薪酬系统-福利台账,初次核算前为台账项设置基础数值(socialPay,fundPay,otherPay) 2022-12-29 10:17:54 +08:00
sy e4df660cd9 Merge branch 'feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04 2022-12-29 10:07:22 +08:00
sy 42d57163a9 薪酬系统-福利台账,福利核算无核算人员时,直接进度完成 2022-12-29 10:05:52 +08:00
sy 7fba73d3f4 薪酬系统-福利台账,福利核算无核算人员时,直接进度完成 2022-12-29 09:24:07 +08:00
sy 84aeb5059f 薪酬系统-福利台账,调差方式3时的福利项 2022-12-28 17:01:15 +08:00
fcli 8ccc1a0ec3 Merge branch 'feature/加密方法&分页merge' into release/2.5.2.22.12.04 2022-12-28 15:43:33 +08:00
sy 2f4d580793 薪酬系统-福利台账,调差列表优化,默认配置带出单位缴费数据 2022-12-28 11:58:38 +08:00
sy 494462092d 薪酬系统-福利台账,补缴方式选择指定月的缴纳基数获取功能 2022-12-27 17:34:46 +08:00
sy af15ffcc23 薪酬系统-福利台账,补缴新增功能改造v1 2022-12-27 14:01:08 +08:00
fcli 45292dfc4f feat: null处理 2022-12-27 11:39:52 +08:00
Harryxzy 6262f62292 薪资回算Excel导入BUG 2022-12-26 23:17:32 +08:00
Harryxzy d7127e29e4 薪资档案中默认显示工号 2022-12-26 14:58:41 +08:00
sy c49017f63b Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-23 18:45:48 +08:00
sy 011d66e298 薪酬系统-福利台账,补差数据导入,过滤未启用福利项 2022-12-23 18:45:10 +08:00
sy fe5847aed6 Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-23 17:51:30 +08:00
sy df2ac4754d 薪酬系统-福利台账,补差数据导入,缴纳费用非有效数值型数据,直接跳过 2022-12-23 17:50:12 +08:00
sy cea78e6594 Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-23 16:35:33 +08:00
sy 5f4ddeabd4 薪酬系统-福利台账,补差数据待编辑数据过滤空值字段 2022-12-23 16:34:12 +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 43511f7922 Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03 2022-12-21 16:39:55 +08:00
sy 28d1d16844 薪酬系统-福利台账,补差数据参与薪资核算 2022-12-21 11:12:14 +08:00
钱涛 85739933a5 单次核算5000 2022-12-20 16:45:09 +08:00
sy e75d0c5872 薪酬系统-福利台账,补差数据导入逻辑问题修复,福利类合计为0时,不允许补差其包含的福利项 2022-12-20 15:20:42 +08:00
sy cd671b5ae2 薪酬系统-福利台账,补差数据导入逻辑问题修复 2022-12-20 09:25:55 +08:00
Harryxzy 07292531db 重新回算提示 2022-12-19 18:03:17 +08:00
sy 547e7cd662 薪酬系统-福利台账,补差数据导入时,拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差 2022-12-19 17:26:44 +08:00
sy 2f10986e2b 薪酬系统-福利台账,重新核算时,保留已有补差数据,但是bill_batch统计信息只统计补差相关缴费数额,不统计补差相关人数信息 2022-12-19 14:47:49 +08:00
sy f1ebf947de Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-19 11:44:43 +08:00
sy 53d48d63b0 薪酬系统-福利台账,补差新增数据时,过滤重复数据 2022-12-19 11:43:20 +08:00
Harryxzy ddea8c9066 回算工资单发放调整 2022-12-19 11:12:26 +08:00
sy 8157cafc98 薪酬系统-福利档案,取消停缴功能,添加人员是否在对应的个税扣缴义务人下的判断 2022-12-19 10:01:32 +08:00
钱涛 6ce7ef0b7e Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03 2022-12-16 17:58:03 +08:00
fcli 4b2549f420 Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03 2022-12-16 17:57:17 +08:00
Harryxzy eaa9b7515f 工资单发放详情模板名称调整 2022-12-16 15:53:34 +08:00
Harryxzy 0ace75ab06 工资单发放模板展示 2022-12-16 14:55:11 +08:00
Harryxzy 82577f97e0 舍入规则保存错误 2022-12-16 11:22:43 +08:00
sy 69e0d7e441 薪酬系统-福利台账,补差tab添加 2022-12-16 11:13:28 +08:00
钱涛 2fbd66ac19 操作者 2022-12-16 10:32:45 +08:00
fcli c70964a8e2 feat: 继承类问题修改 2022-12-16 10:18:26 +08:00
fcli bf870cc9aa feat: 继承类问题修改 2022-12-16 10:11:41 +08:00
fcli 8f39d5d12a Merge branch 'feature/加密方法' into feature/加密方法&分页merge 2022-12-16 10:01:09 +08:00
fcli 78447c002b feat: 继承类问题修改 2022-12-16 10:01:00 +08:00
fcli 5295821dc1 Merge branch 'feature/加密方法' into feature/加密方法&分页merge 2022-12-16 09:46:55 +08:00
fcli 68f9c8b9db feat: 继承类问题修改 2022-12-16 09:46:39 +08:00
钱涛 02f3c164a3 Merge branch 'release/2.4.1.2212.02' 2022-12-16 09:25:58 +08:00
sy 237f42f2ae 薪酬系统-福利台账,核算进度条逻辑优化 2022-12-15 18:03:28 +08:00
sy cf08bbd842 薪酬系统-福利台账,补差相关加解密替换为新方法 2022-12-15 17:11:38 +08:00
sy 0787fb4d05 Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2022-12-15 17:08:21 +08:00
钱涛 b59ba320df 人员去重 2022-12-15 16:59:00 +08:00
Harryxzy b9b0a6f1c5 回算批量更新 2022-12-15 11:32:32 +08:00
Harryxzy 41a3583d61 修复回算按钮 2022-12-15 11:12:36 +08:00
sy 7b22cb8818 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-15 10:55:57 +08:00
Harryxzy 4ed3f47b36 薪资账套修改回算公式后不生效问题 2022-12-14 22:34:12 +08:00
Harryxzy 5f37281757 添加backcalctype 2022-12-14 18:21:25 +08:00
钱涛 c71b73799a 取消插件 2022-12-14 15:02:22 +08:00
fcli 7f7f4442ca Merge branch 'feature/加密方法' into feature/加密方法&分页merge 2022-12-14 14:56:24 +08:00
fcli beeadfc35c feat: 加解密处理 2022-12-14 14:55:57 +08:00
Harryxzy 4fa7f9a5e7 回算-加解密开关 2022-12-14 14:45:24 +08:00
Harryxzy 2136bbbd7f Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215 2022-12-14 13:57:21 +08:00
Harryxzy 27602626cf 回算加密 2022-12-14 13:57:03 +08:00
fcli b162afcbdd Merge branch 'feature/加密方法' into feature/加密方法&分页merge 2022-12-14 13:51:22 +08:00
fcli ad3f7595bd feat: 空指针处理 2022-12-14 13:51:01 +08:00
Harryxzy 75220416bc merge new解密 2022-12-14 12:32:42 +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
fcli d039781b74 feat: develop处理合并 2022-12-14 11:03:33 +08:00
fcli dea2353ef2 Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java
2022-12-14 10:57:41 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
sy 1e31dad7ad 薪酬系统-福利档案,待减员页面删除待办功能优化 2022-12-13 16:58:35 +08:00
Harryxzy 3b6418263f 薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
2022-12-13 16:39:39 +08:00
钱涛 4d677b4d58 mock公式运行 2022-12-13 16:13:45 +08:00
钱涛 c3cb3105fd 暂存 2022-12-13 10:53:43 +08:00
fcli 1c6acb497c feat: 加密统一,累计附加扣除详细 2022-12-13 10:49:51 +08:00
fcli eabc983100 feat: 加密统一,社保福利档案&薪资核算结果 2022-12-13 10:15:31 +08:00
sy 32cffdccf5 薪酬系统-福利档案,批量减员逻辑变更,自动减员逻辑变更,无福利方案时,不关注最终缴纳月 2022-12-12 17:53:05 +08:00
sy 1fb706b7da 薪酬系统-福利档案,删除待办功能添加批量处理逻辑 2022-12-12 16:55:22 +08:00
fcli 1431308cc5 feat: 加密统一,薪资核算结果 2022-12-12 16:42:44 +08:00
sy 1b376464c4 薪酬系统-福利档案,删除待办功能(待减员页面) 2022-12-12 15:43:12 +08:00
fcli 93db32b758 feat: 加密统一,累计附加扣除&社保福利模块 2022-12-12 15:40:01 +08:00
sy ae72d25431 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-12 13:43:16 +08:00
钱涛 5e893160b4 加密方法 2022-12-12 10:36:06 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +08:00
钱涛 8dc2ddc3c8 加密方法 2022-12-12 09:37:15 +08:00
钱涛 309cb2047d 配置文件 2022-12-09 15:28:29 +08:00
sy 43157d25e3 薪酬系统-福利台账,补差列表v1 2022-12-09 14:50:29 +08:00
钱涛 389022e0ea 配置文件 2022-12-09 10:12:25 +08:00
钱涛 77d3046966 所有个税扣缴义务人的树形 2022-12-08 17:48:46 +08:00
钱涛 30e8fd3733 流程中个税扣缴义务人已处理 2022-12-08 16:48:37 +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
fcli 269bfeee18 feat: 查询列表加快 2022-12-08 16:39:57 +08:00
fcli 89574f278b feat: 查询列表加快 2022-12-08 16:31:16 +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
fcli fcca6950ac feat: 修复bug 2022-12-08 15:45:15 +08:00
Harryxzy ce76bc8b43 薪资账套list返回个税扣缴义务人id 2022-12-08 15:42:21 +08:00
Harryxzy 8e573f8bd7 补发工资单详情查看 2022-12-08 15:25:16 +08:00
sy ab6c0940c2 薪酬系统-福利台账,补差数据导出功能 2022-12-08 14:51:23 +08:00
钱涛 2c1421999b Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01 2022-12-08 11:32:03 +08:00
钱涛 ea20dfb9ff fix调薪action 2022-12-08 10:53:51 +08:00
钱涛 399563088d 流程生成人员范围 2022-12-08 10:49:51 +08:00
sy 979bb82661 薪酬系统-福利台账,调差数据保存时,增加新数据id信息的返回 2022-12-08 10:18:27 +08:00
sy c94e28e68c 薪酬系统-福利台账,核算功能相关临时表数据删除逻辑优化 2022-12-08 10:10:48 +08:00
钱涛 fb39dbe0c4 流程生成人员范围 2022-12-07 20:16:14 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
Harryxzy aed596523f 公司单发放详情报错 2022-12-07 18:00:31 +08:00
sy f31e176cab 薪酬系统-福利台账,billBatch统计数据刷新方法优化(不需要统计补差数据中的人数信息) 2022-12-07 17:50:25 +08:00
sy ccfffc200e 薪酬系统-福利台账,补差数据导入功能 2022-12-07 17:09:53 +08:00
钱涛 5079753c34 sql测试 2022-12-07 16:19:22 +08:00
钱涛 f20cecf042 sql测试 2022-12-07 16:17:29 +08:00
钱涛 cdb7f3a0a2 sql测试 2022-12-07 15:47:35 +08:00
Harryxzy ecda5027de fix 回算归档 2022-12-07 15:27:20 +08:00
Harryxzy c4b17974ae fix 归档,薪资核算不存在BUG 2022-12-07 15:21:29 +08:00
Harryxzy f89c5d2970 工资单模板编辑补发模板 2022-12-07 15:03:39 +08:00
Harryxzy 19022fc505 fix 编辑工资单模板,补发显示部分 2022-12-07 10:34:41 +08:00
钱涛 1e03eca738 单独调薪检查action 2022-12-07 09:17:31 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
Harryxzy 5078fa9b87 fix 工资单发放报错 2022-12-06 15:59:38 +08:00
sy 70a5854dc7 薪酬系统-福利台账,调差数据保存时,增加公司费用数值字段的校验 2022-12-06 15:40:40 +08:00
Harryxzy c0d916c286 薪资回算功能,工资单部分 2022-12-06 15:29:08 +08:00
sy 3fa017b13a 薪酬系统-福利台账,补差福利项列表功能和补差模板导出功能 2022-12-06 11:44:04 +08:00
钱涛 11d1ee1a21 批量调薪action 2022-12-06 10:26:36 +08:00
钱涛 2f8f5f299e 批量调薪action 2022-12-06 09:52:55 +08:00
钱涛 5b1615675d 批量调薪action 2022-12-06 09:41:26 +08:00
fcli 2877d58a1f feat: sqlserver bug修复 2022-12-05 17:51:28 +08:00
sy bea06f1d88 薪酬系统-福利台账,可调差人员列表功能返回格式增加target字段 2022-12-05 16:56:05 +08:00
fcli acab57aa36 feat: 撤回范围修复 2022-12-05 16:05:38 +08:00
钱涛 23dd15a568 批量调薪action 2022-12-05 16:01:08 +08:00
sy a04f4a915f 薪酬系统-福利台账,可调差人员列表功能取消分页逻辑 2022-12-05 15:42:49 +08:00
fcli ff7b1047bc feat: 发放异常拦截 2022-12-05 14:06:22 +08:00
Harryxzy fa6e41d62e Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01 2022-12-05 10:43:09 +08:00
Harryxzy 1b570fe1aa 放开管理员限制 2022-12-05 10:34:25 +08:00
Harryxzy 012d8dfb07 社保福利流程,放开个税扣缴义务人限制 2022-12-05 10:13:16 +08:00
sy 014190f6d0 薪酬系统-福利台账,补缴列表查询优化,增加缴纳状态筛选 2022-12-05 10:09:43 +08:00
Harryxzy 6fe28ec41c 定薪流程,放开个税扣缴义务人限制 2022-12-05 09:57:27 +08:00
fcli 4fa64c6a8f feat: mapper异常修复 2022-12-05 09:52:05 +08:00
sy 33aa8ea507 薪酬系统-福利档案,档案数据通过导入excel入库前,根据人员id和个税扣缴义务人进行去重 2022-12-02 17:57:09 +08:00
Harryxzy 3ff3fd8e44 薪资回算-薪资核算部分(剩余核算归档) 2022-12-02 17:35:14 +08:00
sy 22a7258229 薪酬系统-福利台账,福利核算添加核算进度查询逻辑 2022-12-02 17:08:35 +08:00
钱涛 991338a10e 合计行异步处理 2022-12-02 16:58:19 +08:00
fcli c7b3341a13 feat: 查询异常问题修改 2022-12-01 17:41:10 +08:00
钱涛 013f67469e 显示定制列的入职日期和离职日期 2022-12-01 14:33:21 +08:00
钱涛 ac0b0a7e25 公式提醒 2022-12-01 13:59:38 +08:00
sy e462992206 薪酬系统-福利台账,社保调差撤回功能优化 2022-12-01 11:50:37 +08:00
sy 119640e272 薪酬系统-福利台账,在福利台账重新核算时,删除调差数据时增加人员id筛选 2022-12-01 10:50:34 +08:00
sy da7b9d8e6a 薪酬系统-福利台账,社保调差数据删除逻辑,在福利台账重新核算时,删除已有调查记录 2022-12-01 10:22:47 +08:00
sy 5436742c74 薪酬系统-福利台账,社保调差列表查询功能优化 2022-11-30 17:57:25 +08:00
钱涛 6cffbf4db7 取消安全级别 2022-11-30 16:59:58 +08:00
sy d3d2074aed 薪酬系统-福利台账,在社保核算月数据删除时,社保调差数据被删除 2022-11-30 15:55:23 +08:00
sy 4d01c324e0 薪酬系统-福利台账,社保调差保存功能优化 2022-11-30 15:05:24 +08:00
sy ee7309ffd1 薪酬系统-福利台账,社保调差项公司支出费用统计功能优化,对于已存在调差项,给出提示,并且不进行计算 2022-11-30 14:07:28 +08:00
钱涛 a2ab9471be 核算记录id 2022-11-30 14:06:01 +08:00
钱涛 d8f99abb18 调薪,调薪校验流程接口 2022-11-30 11:23:58 +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 f68219ff87 薪酬系统-福利档案,高级搜索分部逻辑优化 2022-11-28 16:58:20 +08:00
sy 5486d3f849 薪酬系统-福利台账,社保调差字段类型调整 2022-11-28 16:25:52 +08:00
sy d9c7a6c0e3 薪酬系统-福利台账,社保调差撤回v2 2022-11-28 15:50:52 +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
钱涛 8f75380f67 扩展sql字符 2022-11-28 10:39:46 +08:00
sy ff20acd15a 薪酬系统-福利台账,调差记录表po和配置表po 2022-11-28 09:55:29 +08:00
Harryxzy 85fef5c5f8 Merge branch 'master' into feature/V3-backItem-1215 2022-11-28 09:26:59 +08:00
钱涛 0b2c01fb4c 人员信息获取 2022-11-25 15:54:31 +08:00
钱涛 4b75ba67e9 人员分片 2022-11-25 14:48:49 +08:00
sy dc69a479ec Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04 2022-11-25 14:44:45 +08:00
sy 366c1a8367 薪酬系统-福利台账,退差数据保存优化,分批查询 2022-11-25 14:43:45 +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
钱涛 8d43e20c84 Merge branch 'feature/同步人员' into release/2.3.1.2211.04 2022-11-25 10:44:21 +08:00
sy eeea00a408 薪酬系统-福利台账,退差保存数据功能优化 2022-11-25 10:17:35 +08:00
sy bc20d37797 薪酬系统-福利台账,退差保存数据来源增加个税扣缴义务人筛选 2022-11-24 20:35:51 +08:00
钱涛 7808019c43 新增核算时间变量 2022-11-24 17:33:48 +08:00
钱涛 832b40e40a 新增核算时间变量 2022-11-24 17:21:16 +08:00
sy e412be8d5e 薪酬系统-福利台账,退差数据编辑、删除后,刷新bill_batch表中统计数据 2022-11-24 14:19:58 +08:00
sy bbc58281f3 薪酬系统-福利台账,调差保存v2 2022-11-24 13:29:40 +08:00
sy 931b3d8a82 薪酬系统-福利台账,修改退差数据单条查看返回格式v2 2022-11-24 11:04:12 +08:00
sy dfcd7d88b0 薪酬系统-福利台账,修改退差数据单条查看返回格式 2022-11-24 10:43:20 +08:00
钱涛 c2371ffcb3 取消缓冲时间 2022-11-24 10:30:00 +08:00
sy a631ecc3d9 Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201 2022-11-24 09:48:30 +08:00
sy d976ede775 薪酬系统-福利台账,退差数据新增后,刷新bill_batch表中统计数据 2022-11-24 09:46:06 +08:00
sy e736cee6fd Merge branch 'feature/v2-addWelfareArchives-1117' into feature/v3-siAccountRecession-1117
# Conflicts:
#	src/com/engine/salary/service/SIAccountService.java
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2022-11-24 09:39:13 +08:00
sy 0f50520aa9 薪酬系统-福利台账,抽取bill_batch表中统计数据刷新方法 2022-11-24 09:31:44 +08:00
sy 27dd8b4450 薪酬系统-福利台账,调差保存v1 2022-11-24 09:17:08 +08:00
钱涛 c5aa1aded7 缓存类 2022-11-23 18:36:33 +08:00
钱涛 2ab7049fa0 单个核算 2022-11-23 18:30:53 +08:00
钱涛 5221c22b5c 优化公式选择档案项目和薪资项目 2022-11-23 17:02:17 +08:00
sy f1bd574c81 薪酬系统-福利台账,调差v2 2022-11-23 15:39:42 +08:00
钱涛 6405610456 计划任务日志 2022-11-23 15:24:29 +08:00
sy edf9e22d22 薪酬系统-福利台账,福利核算接口添加返回当前核算人id 2022-11-23 15:01:28 +08:00
sy d81883e3d2 薪酬系统-福利台账,调差v1 2022-11-23 14:49:44 +08:00
钱涛 829375d314 同步人员范围定时任务 2022-11-22 16:14:54 +08:00
钱涛 1307f485eb 同步人员范围 2022-11-22 15:53:05 +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
Harryxzy 036d2d540b 薪资回算-薪资账套部分 2022-11-22 14:36:59 +08:00
sy 2b29813f6b 薪酬系统-福利台账,退差数据导出 2022-11-22 13:35:09 +08:00
sy d7a4b30185 薪酬系统-福利台账,退差数据不参与薪资核算 2022-11-22 10:26:34 +08:00
sy 7c299e6199 薪酬系统-福利台账,退差数据新增v4 2022-11-22 09:46:37 +08:00
sy 15477cc8d5 薪酬系统-福利台账,退差数据新增v3 2022-11-21 17:52:28 +08:00
Harryxzy 5a3f035a41 修复定薪流程姓名重复BUG 2022-11-21 17:19:12 +08:00
sy aa7a3ced01 薪酬系统-福利台账,导入数据刷新统计数据优化 2022-11-21 16:53:00 +08:00
sy 955f8c255e 薪酬系统-福利台账,退差数据新增v2 2022-11-21 16:25:26 +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 e2a4a7157b Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117 2022-11-21 09:48:46 +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
Harryxzy 188096f931 Merge branch 'fix/salaryArchiveNoDataNEW' into release/2.2.2.2211.03 2022-11-17 19:04:58 +08:00
钱涛 cc711bc411 修复加锁顺序 2022-11-17 19:04:42 +08:00
Harryxzy f19e4c2569 fix发薪日期为一个月最后一天时,薪资档案不显示NEW 2022-11-17 19:03:59 +08:00
钱涛 d07ded883f 修复加锁顺序 2022-11-17 18:53:22 +08:00
Harryxzy 11c4b1e4f7 Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03 2022-11-17 18:35:12 +08:00
sy 47406b67c2 薪酬系统-福利档案,导入数据时,对于时间字符串,允许excel默认格式设置 2022-11-17 17:07:04 +08:00
钱涛 4779cc861e 相同itemid 2022-11-17 17:04:14 +08:00
Harryxzy f762fd7030 调薪编辑、删除 放开校验限制 2022-11-17 16:51:07 +08:00
Harryxzy 57f8bb6a6a fix immMAP 2022-11-17 16:30:29 +08:00
fcli e6eaf96bcd feat: 沿用上月增加校验 2022-11-17 15:39:39 +08:00
sy e0175f3ae7 薪酬系统-福利档案,导入数据时,若设置了福利方案,则该福利类型的起始缴纳月必填 2022-11-17 15:32:43 +08:00
钱涛 10ffe88810 核算锁定 2022-11-17 15:17:49 +08:00
fcli b03e5efbcf feat: 沿用上月增加校验 2022-11-17 15:13:59 +08:00
fcli 0aa59757c5 feat: 沿用上月增加校验 2022-11-17 15:13:55 +08:00
sy fee892e17b 薪酬系统-福利档案,导入数据在设置福利档案时,对其下未设置福利项数值的字段默认为0,并参与基数上下限校验 2022-11-17 15:08:30 +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 b3cd118c21 feat: 自动累计功能 2022-11-17 14:28:15 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
Harryxzy 2bc1453ad8 Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03 2022-11-17 14:28:07 +08:00
fcli 0aabfcd68a feat: 薪资范围需求 2022-11-17 14:25:10 +08:00
sy 57300125cd 薪酬系统-福利台账,正常缴纳/补缴导入时候,刷新台账统计 2022-11-17 13:39:50 +08:00
fcli e8347b88cc feat: 薪资范围问题 2022-11-17 11:11:58 +08:00
sy 4073907a2c 薪酬系统-福利台账,福利台账导入后刷新统计数据v1 2022-11-17 10:09:01 +08:00
Harryxzy 1eaef7fcd4 fix分页时,数据不显示 2022-11-17 09:53:40 +08:00
sy e333f2acc2 薪酬系统-福利台账,福利档案福利基数字段显示问题 2022-11-17 09:36:00 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
Harryxzy 9f17c6e99a fixBUG 2022-11-16 17:22:22 +08:00
sy ad0b89b91a 薪酬系统-福利台账,退差数据单条查看v1 2022-11-16 17:02:54 +08:00
Harryxzy 1740c99df6 fix immutableBug 2022-11-16 16:47:09 +08:00
sy 002de586d5 薪酬系统-福利台账,退差数据列表功能v3 2022-11-16 16:14:21 +08:00
sy 7be9424f73 薪酬系统-福利台账,退差数据列表功能v2 2022-11-16 15:45:36 +08:00
Harryxzy 1e307e2f87 薪资回算,薪资账套中薪资回算项目展示 2022-11-16 15:18:43 +08:00
Harryxzy 1bcb02d2e0 fix薪资账套关闭状态下无法删除bug 2022-11-16 14:22:25 +08:00
Harryxzy 94f3c9720a 回算功能-fix mybatis报错 2022-11-16 14:13:50 +08:00
sy a4924c19ee 薪酬系统-福利台账,退差数据列表功能v1 2022-11-16 14:05:43 +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
sy b647089eaf 薪酬系统-福利台账,退差数据新增功能v1 2022-11-15 17:58:37 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
sy 969bc6b413 薪酬系统-福利档案,福利档案新增接口v5 2022-11-15 11:13:16 +08:00
Harryxzy 323c1ec0e0 查看编辑调薪 2022-11-15 09:34:58 +08:00
fcli daa3d4ca9f feat: 薪资发放范围 2022-11-15 09:19:57 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +08:00
sy 2e71ee7a35 薪酬系统-福利档案,福利档案新增接口v4 2022-11-14 10:22:15 +08:00
sy f3dc63244f 薪酬系统-福利档案,福利档案新增接口v3 2022-11-11 11:15:33 +08:00
sy 86dbb87f1b 薪酬系统-福利档案,福利档案新增接口v2 2022-11-11 09:11:53 +08:00
sy 451968f122 Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117 2022-11-11 08:56:30 +08:00
sy 647dd80a20 薪酬系统-福利档案,福利档案新增接口v1 2022-11-11 08:56:05 +08:00
Harryxzy 15749ecc10 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
2022-11-10 11:25:01 +08:00
Harryxzy c786dc2d14 个税申报功能-重启时间和薪资核算创建时间比较 2022-11-10 11:11:41 +08:00
Harryxzy 9dab99d3c5 个税申报功能-fix重启后回到开启 2022-11-10 10:28:03 +08:00
Harryxzy 1abd3d47f2 个税申报功能-重启状态前端展示开启 2022-11-10 10:14:29 +08:00
Harryxzy 3d4be3265e 个税申报功能-重启 2022-11-10 09:46:30 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
钱涛 f5622df8fe Merge branch 'feature/report1110' into release/2.1.3.2211.03
# Conflicts:
#	src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
2022-11-09 19:03:14 +08:00
fcli 63ee9c9b8e fix: 一键累计添加日期与校验 2022-11-09 18:57:28 +08:00
sy 23e7065403 Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03 2022-11-09 17:42:15 +08:00
钱涛 b55c339bb0 获取上月数据 2022-11-09 17:26:51 +08:00
fcli 815e37e50b fix: 一键累计添加日期与校验 2022-11-09 16:55:00 +08:00
Harryxzy 02a6ab11ce Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
2022-11-09 16:44:49 +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
钱涛 e63c72f51e 逆向解密 2022-11-09 15:47:09 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
Harryxzy e2e383bd79 数据采集-Fix数据采集Long类型判断 2022-11-09 15:36:07 +08:00
fcli 07f9976d63 fix: 加解密处理 2022-11-09 14:32:04 +08:00
fcli 0b26eeec7e fix: 加解密处理 2022-11-09 14:32:00 +08:00
sy 2c691d1838 薪酬系统-福利档案增员问题修复 2022-11-09 11:25:46 +08:00
fcli e3b7f7c732 fix: sql优化 2022-11-09 10:41:06 +08:00
fcli dd5c2ba4ce fix: 管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员 2022-11-09 10:41:00 +08:00
fcli eb7311f0f3 fix: 管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员 2022-11-09 10:40:55 +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 fafc157e63 feat: 专项附加扣除模块 2022-11-09 10:40:19 +08:00
fcli dffee9206f feat: 专项附加扣除模块 2022-11-09 10:40:05 +08:00
fcli 171f726bd3 feat: 专项附加扣除模块 2022-11-09 10:40:01 +08:00
fcli 5e69d07b7c feat: 专项附加扣除模块 2022-11-09 10:39:55 +08:00
Harryxzy 775580f994 --- 2022-11-09 10:20:46 +08:00
sy b66fe2b593 薪酬系统-福利档案导入,增加对社保、公积金、其他福利方案设置是否为正确的福利类型 2022-11-09 09:53:13 +08:00
Harryxzy 8a704a9f5b 个税申报开关-添加新建判断 2022-11-08 16:27:29 +08:00
Harryxzy 0630fb7b7d 个税申报开关-查询是否开启 2022-11-08 13:58:21 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 21ccf6cbcb sql解密 2022-11-08 11:10:56 +08:00
钱涛 729389dcef Merge branch 'release/2.1.3.2211.03' into feature/report1110 2022-11-08 09:33:00 +08:00
sy defa7dacc3 薪酬系统-福利档案全量增员、全量减员添加个税扣缴义务人筛选逻辑 2022-11-07 17:15:42 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
钱涛 2da0455c46 修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
2022-11-07 15:11:24 +08:00
钱涛 f2fdbca8f7 脱敏表配置 2022-11-07 11:31:21 +08:00
2076 changed files with 183737 additions and 12102 deletions

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<settings>
<setting name="mapUnderscoreToCamelCase" value="true"></setting>
<setting name="jdbcTypeForNull" value="NULL"/>
</settings>
<plugins>
<plugin interceptor="weaver.conn.mybatis.MyBatisCachePlugin"></plugin>
</plugins>
<environments default="development">
<environment id="development">
<transactionManager type="JDBC"/>
<dataSource type="weaver.conn.mybatis.MyBatisDataSourceFactory">
</dataSource>
</environment>
</environments>
<databaseIdProvider type="weaver.conn.mybatis.DatabaseIdProvider">
</databaseIdProvider>
<mappers>
<!--mapper resource="MyBatis/mapper/WorkflowBaseMapper.xml"/-->
<!--package name="*.mapper"></package 不可行Mybatis不支持通配符这是spring的ant匹配模式提供的-->
<package name="weaver.conn.mybatis.mapper"></package><!-- 示例Mapper -->
<!-- 项目Mapper -->
<package name="com.weaver.mapper"></package>
<package name="weaver.general.mapper"></package>
<package name="weaver.hrm.mapper"></package>
<package name="weaver.workflow.mapper"></package>
<package name="weaver.interfaces.mapper"></package>
<package name="weaver.portal.mapper"></package>
<package name="com.api.formmode.mybatis.mapper"></package>
<package name="com.cloudstore.dev.api.mapper"></package>
<package name="com.engine.integration.mapper"></package>
<package name="com.engine.salary.mapper"></package>
<package name="com.engine.organization.mapper"></package>
<!-- 需要把现在的配置文件都调整到WEB-INF/config/mapper目录下 -->
<!-- 在WEB-INF/config/mapper目录下配置的xml文件也不必加入这里的package -->
</mappers>
</configuration>

View File

@ -0,0 +1,451 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.ElogTableCheckerMapper">
<insert id="recordVersion">
insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version})
</insert>
<select id="getVersion" resultType="java.lang.Long">
select version from hrsa_elog_version where maintable = #{mainTable}
</select>
<update id="createMainTable">
create table ${mainTable}
(
id bigint comment 'ID',
create_time datetime default current_timestamp ,
update_time datetime default current_timestamp ,
creator bigint,
delete_type int,
tenant_key varchar(10),
uuid char(36),
log_date datetime default current_timestamp ,
log_operator varchar(50),
operatorName varchar(50),
targetId varchar(50),
targetName text,
modulename varchar(100),
functionname varchar(100),
interfaceName varchar(100),
requesturl varchar(200),
requesturi varchar(200),
operateType varchar(50),
operatetypename varchar(100),
operatedesc varchar(1000),
params longtext,
belongmainid varchar(36),
clientIp varchar(50),
groupid varchar(50),
device varchar(200),
groupNameLabel varchar(500),
redoService varchar(200),
redoContext longtext,
cancelService varchar(200),
cancelContext longtext,
totalruntime bigint,
mainruntime bigint,
log_result varchar(100),
fromterminal varchar(100),
resultdesc text,
old_content varchar(1000),
link_type varchar(20),
link_id bigint,
old_link_id bigint,
PRIMARY KEY (id)
)
</update>
<update id="createMainTable" databaseId="oracle">
create table ${mainTable}
(
id number(*,0) not null primary key,
create_time date default sysdate,
update_time date default sysdate,
creator number(*,0),
delete_type number(*,0),
tenant_key varchar2(10),
uuid varchar2(36),
log_date date default sysdate,
log_operator varchar2(50),
operatorName varchar2(50),
targetId varchar2(50),
targetName varchar2(4000),
modulename varchar2(100),
functionname varchar2(100),
interfaceName varchar2(100),
requesturl varchar2(200),
requesturi varchar2(200),
operateType varchar2(50),
operatetypename varchar2(100),
operatedesc varchar2(1000),
params clob,
belongmainid varchar2(36),
clientIp varchar2(200),
groupid varchar2(50),
device varchar2(200),
groupNameLabel varchar2(500),
redoService varchar2(200),
redoContext varchar2(4000),
cancelService varchar2(200),
cancelContext varchar2(4000),
totalruntime number(*,0),
mainruntime number(*,0),
log_result varchar2(4000),
fromterminal varchar2(100),
resultdesc varchar2(4000),
old_content varchar2(1000),
link_type varchar2(20),
link_id number(*,0),
old_link_id number(*,0)
)
</update>
<update id="createMainTable" databaseId="sqlserver">
create table ${mainTable}
(
id bigint not null primary key,
create_time datetime default getdate(),
update_time datetime default getdate(),
creator bigint default '-1',
delete_type bigint default 0,
tenant_key nvarchar(10),
uuid nvarchar(36),
log_date datetime default getdate(),
device nvarchar(500),
log_operator bigint default '-1',
operatorname nvarchar(100),
targetid bigint default '-1',
targetname nvarchar(3000),
modulename nvarchar(100),
functionname nvarchar(100),
interfacename nvarchar(100),
requesturl nvarchar(200),
requesturi nvarchar(200),
operatetype nvarchar(50),
operatetypename nvarchar(100),
operatedesc nvarchar(3000),
params nvarchar(max),
belongmainid nvarchar(36),
clientip nvarchar(200),
groupid nvarchar(50),
groupnamelabel nvarchar(1000),
redoservice nvarchar(200),
redocontext nvarchar(3000),
cancelservice nvarchar(200),
cancelcontext nvarchar(3000),
totalruntime bigint default 0,
mainruntime bigint default 0,
log_result nvarchar(100),
fromterminal nvarchar(100),
resultdesc nvarchar(3000),
old_content nvarchar(3000),
link_type nvarchar(20),
link_id bigint default 0,
old_link_id bigint default 0
)
</update>
<update id="createMainTable" databaseId="postgresql">
create table ${mainTable}
(
id int8 not null primary key,
create_time timestamp default current_timestamp,
update_time timestamp default current_timestamp,
creator int8,
delete_type int,
tenant_key varchar(10),
uuid varchar(36),
log_date timestamp default current_timestamp,
log_operator varchar(50),
operatorName varchar(50),
targetId varchar(50),
targetName text,
modulename varchar(100),
functionname varchar(100),
interfaceName varchar(100),
requesturl varchar(200),
requesturi varchar(200),
operateType varchar(50),
operatetypename varchar(100),
operatedesc varchar(1000),
params text,
belongmainid varchar(36),
clientIp varchar(200),
groupid varchar(50),
device varchar(200),
groupNameLabel varchar(500),
redoService varchar(200),
redoContext text,
cancelService varchar(200),
cancelContext text,
totalruntime int4,
mainruntime int4,
log_result varchar(100),
fromterminal varchar(100),
resultdesc text,
old_content varchar(1000),
link_type varchar(20),
link_id int4,
old_link_id int4
)
</update>
<update id="createDetailTable">
create table ${detailTable}
(
id bigint not null primary key,
create_time datetime default current_timestamp ,
update_time datetime default current_timestamp ,
creator bigint,
delete_type int,
tenant_key varchar(10),
uuid varchar(36),
mainid varchar(36),
dataid varchar(50),
belongdataid varchar(50),
tableName varchar(200),
tablenamelabelid varchar(50),
tablenamedesc varchar(50),
fieldName varchar(200),
fieldnamelabelid varchar(200),
newValue longtext,
oldValue longtext,
newrealvalue longtext,
oldrealvalue longtext,
fieldDesc varchar(200),
showorder int default 0,
isdetail int default 0
)
</update>
<update id="createDetailTable" databaseId="postgresql">
create table ${detailTable}
(
id int8 not null primary key,
create_time timestamp default current_timestamp ,
update_time timestamp default current_timestamp ,
creator int8,
delete_type int8,
tenant_key varchar(10),
uuid varchar(36),
mainid varchar(36),
dataid varchar(50),
belongdataid varchar(50),
tableName varchar(200),
tablenamelabelid varchar(50),
tablenamedesc varchar(50),
fieldName varchar(200),
fieldnamelabelid varchar(200),
newValue text,
oldValue text,
newrealvalue text,
oldrealvalue text,
fieldDesc varchar(200),
showorder int8 default 0,
isdetail int8 default 0
)
</update>
<update id="createDetailTable" databaseId="oracle">
create table ${detailTable}
(
id number(*,0) not null primary key,
create_time date default sysdate,
update_time date default sysdate,
creator number(*,0),
delete_type number(*,0),
tenant_key varchar2(10),
uuid varchar2(36),
mainid varchar2(36),
dataid varchar2(50),
belongdataid varchar2(50),
tableName varchar2(200),
tablenamelabelid varchar2(50),
tablenamedesc varchar2(50),
fieldName varchar2(200),
fieldnamelabelid varchar2(200),
newValue CLOB,
oldValue CLOB,
newrealvalue CLOB,
oldrealvalue CLOB,
fieldDesc varchar2(200),
showorder number(*,0) default 0,
isdetail number(*,0) default 0
)
</update>
<update id="createDetailTable" databaseId="sqlserver">
create table ${detailTable}
(
id bigint not null primary key,
create_time datetime default getdate(),
update_time datetime default getdate(),
creator bigint,
delete_type bigint,
tenant_key nvarchar(10),
uuid nvarchar(36),
mainid nvarchar(36),
dataid nvarchar(50),
belongdataid nvarchar(50),
tableName nvarchar(200),
tablenamelabelid nvarchar(50),
tablenamedesc nvarchar(50),
fieldName nvarchar(200),
fieldnamelabelid nvarchar(200),
newValue nvarchar(max),
oldValue nvarchar(max),
newrealvalue nvarchar(max),
oldrealvalue nvarchar(max),
fieldDesc varchar(200),
showorder bigint default 0,
isdetail bigint default 0
)
</update>
<!-- 获取表结构 -->
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" >
SELECT
COLUMN_NAME columnName,
DATA_TYPE dataTypeStr,
COLUMN_TYPE columnType,
CHARACTER_MAXIMUM_LENGTH fieldLength,
IS_NULLABLE isNullableStr,
COLUMN_DEFAULT columnDefault,
COLUMN_COMMENT columnComment
FROM
INFORMATION_SCHEMA.COLUMNS
where
table_name = #{tableName}
and TABLE_SCHEMA = (select database())
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="postgresql">
select *
from pg_tables
where tableowner = (select current_user)
and tablename = #{tableName}
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="oracle">
SELECT
COLUMN_NAME columnName
FROM
user_tab_columns
where
TABLE_NAME=UPPER(#{tableName})
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="sqlserver">
SELECT
COLUMN_NAME columnName
FROM
INFORMATION_SCHEMA.COLUMNS
where
table_name = #{tableName}
and TABLE_catalog = (select DB_NAME())
</select>
<update id="createElogTable">
${createElogSql}
</update>
<!--查询表索引信息-->
<select id="getTableIndex" resultType="java.util.Map">
SELECT COLUMN_KEY
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = #{tableName}
AND COLUMN_NAME = #{columnName}
AND TABLE_SCHEMA = (SELECT DATABASE()) LIMIT 1
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="postgresql">
SELECT COLUMN_KEY
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = #{tableName}
AND COLUMN_NAME = #{columnName}
AND TABLE_SCHEMA = (SELECT current_database()) limit 1 offset 0
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="oracle">
SELECT *
FROM user_ind_columns
WHERE TABLE_NAME = UPPER(#{tableName})
AND COLUMN_NAME = UPPER(#{columnName})
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="sqlserver">
SELECT a.name,
c.name,
d.name
FROM sysindexes a
JOIN sysindexkeys b ON
a.id = b.id
AND a.indid = b.indid
JOIN sysobjects c ON
b.id = c.id
JOIN syscolumns d ON
b.id = d.id
AND b.colid = d.colid
WHERE a.indid NOT IN (0,
255)
AND c.name = #{tableName}
and d.name = #{columnName}
</select>
<!--查询表索引信息-->
<select id="getDataBase" resultType="java.util.Map">
SELECT DATABASE() as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="postgresql">
SELECT current_database() as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="oracle">
SELECT user as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="sqlserver">
SELECT db_name() as databasename
</select>
<update id="createTableIndex">
create index idx${id} on ${tableName} (${columnName})
</update>
<update id="createTableIndex" databaseId="oracle">
create index idx${id} on ${tableName} (${columnName})
</update>
<update id="createTableIndex" databaseId="sqlserver">
create index idx${id} on ${tableName} (${columnName})
</update>
<select id="getAllExistTables" resultType="java.lang.String">
SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA = (SELECT DATABASE())
AND TABLE_NAME IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="oracle">
SELECT
TABLE_NAME
FROM
USER_TABLES
WHERE TABLE_NAME IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
UPPER(#{tableName})
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="sqlserver">
SELECT table_name
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_catalog = (select DB_NAME())
AND table_name IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="postgresql">
SELECT tablename
FROM pg_tables
WHERE tableowner = (select current_user)
AND tablename IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
</mapper>

View File

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.LocalElogAopDaoMapper">
<insert id="insertElogContext">
insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename,
log_operator, operatorname, targetid, targetname, interfacename, operatetype,
operatedesc,
params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice,
cancelcontext, device, groupid,
belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result,
fromTerminal, resultDesc, old_content,
link_type, link_id, old_link_id, create_time, update_time, delete_type, creator
${cusColumns})
values (#{logContent.id}, #{logContent.uuid}, #{logContent.date},
#{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName},
#{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName},
#{logContent.logTargetid}
, #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType},
#{logContent.operatedesc},
#{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel},
#{logContent.redoService},
#{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr},
#{logContent.device}, #{logContent.groupId},
#{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri},
#{logContent.totalRunTime}, #{logContent.mainRunTime}
, #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc},
#{logContent.old_content}, #{logContent.link_type}
, #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time},
#{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator}
${cusValus})
</insert>
<insert id="insertElogDetail">
insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator,
newRealValue, oldRealValue, tableNameDesc,
tableNameLabelId, fieldNameLabelId, create_time, update_time
${cusColumns})
values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder},
#{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key},
#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time}
${cusValus})
</insert>
<insert id="batchInsertDetail">
${sql}
</insert>
<select id="queryElogContextById" resultType="java.lang.Integer">
select 1
from ${tableName}
where id = #{id}
</select>
<insert id="insertElogDetailPrepared">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
values
<foreach collection="list" item="detailContext" separator=",">
( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type})
</foreach>
</insert>
<insert id="insertElogDetailPrepared" databaseId="sqlserver">
<foreach collection="list" item="detailContext" separator=";">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
VALUES
(
#{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
)
</foreach>
</insert>
<insert id="insertElogDetailPreparedHasCustonInfo">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time
${cusColumns})
values
<foreach collection="list" item="detailContext" separator=",">
( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}
${detailContext.cusValus})
</foreach>
</insert>
<update id="rollBackElogById">
update ${tableName}
set delete_type = 3
where id = #{id}
</update>
<update id="rollBackDetailElogByUUID">
update ${tableName}
set delete_type = 3
where mainid = #{mainid}
</update>
<insert id="insertElogDetailPrepared" databaseId="oracle">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
<foreach collection="list" item="detailContext" separator=" union all ">
SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
FROM DUAL
</foreach>
</insert>
<insert id="insertElogDetailPreparedHasCustonInfo" databaseId="oracle">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time
${cusColumns})
<foreach collection="list" item="detailContext" separator=" union all ">
SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}
${detailContext.cusValus}
FROM DUAL
</foreach>
</insert>
</mapper>

View File

@ -0,0 +1,412 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.LocalElogDaoMapper">
<select id="queryElogList" resultType="java.util.Map">
select ${columns},DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="postgresql">
select ${columns},to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="oracle">
select d.*,to_char(d.log_date,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName} d
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by d.log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="sqlserver">
select ${columns},convert(nvarchar(19),log_date,120) createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map">
select ${columns},DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="postgresql">
select ${columns},to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="oracle">
select d.*,to_char(d.log_date,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName} d
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by d.log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="sqlserver">
select ${columns},convert(nvarchar(19),log_date,120) createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map">
select ${columns}, DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="postgresql">
select ${columns}, to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="oracle">
select ${columns}, to_char(log_date,'yyyy-mm-dd HH24:mi:ss') createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="sqlserver">
select ${columns}, convert(nvarchar(19),log_date,120) createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="elogCountByMorePermission" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="elogCount" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="elogCountPapi" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="queryDetailElogList" resultType="java.util.Map">
select *,DATE_FORMAT(create_time,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="postgresql">
select *,to_char(create_time::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="oracle">
select *,to_char(create_time,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="sqlserver">
select *,convert(nvarchar(19),create_time,120) createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryAllChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
</select>
<select id="queryAllMainData" resultType="java.util.Map">
select *
from ${tableName}
where uuid = #{uuid}
</select>
<select id="queryAllMainChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
and isdetail = '0'
</select>
<select id="queryAllDetailChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
and isdetail = '1'
</select>
<select id="elogDetailCount" resultType="java.util.Map">
select count(1) counts from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
</select>
<!-- <select id="queryOperators" resultType="com.weaver.teams.domain.user.SimpleEmployee">-->
<!-- select log_operator id, max(log_date) updateTime-->
<!-- from ${tableName}-->
<!-- where targetid = #{targetId}-->
<!-- and operatetype = #{operateType}-->
<!-- group by log_operator-->
<!-- order by updateTime desc-->
<!-- </select>-->
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by log_date desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="postgresql">
select log_operator employeeId, max(log_date) date
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by log_date desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity"
databaseId="postgresql">
select log_operator employeeId, max(log_date) date from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by date desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date" from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> TO_DATE(#{startDate}, 'SYYYY-MM-DD HH24:MI:SS')
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> TO_DATE(#{endDate}, 'SYYYY-MM-DD HH24:MI:SS')
</if>
group by log_operator order by "date" desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity"
databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date" from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by "date" desc
</select>
<select id="queryElogContextById" resultType="java.lang.Integer">
select 1
from ${tableName}
where id = #{id}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map">
select operatorname,
targetname,
modulename,
operatetypename,
DATE_FORMAT(log_date, "%Y-%m-%d %H:%i:%S") createdate
from ${tableName}
where belongmainid = #{traceId}
order by log_date desc, id desc LIMIT #{offset}, #{pageSize}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="postgresql">
select operatorname,
targetname,
modulename,
operatetypename,
to_char(log_date::timestamp, 'YYYY-MM-DD HH24:MI:SS') createdate
from ${tableName}
where belongmainid = #{traceId}
order by log_date desc, id desc limit #{pageSize}
offset #{offset}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="oracle">
SELECT operatorname, targetname, modulename, operatetypename
FROM (SELECT TMP.*, ROWNUM ROW_ID
FROM (select t.*, to_char(log_date, 'yyyy-mm-dd HH24:mi:ss') createdate
from ${tableName} t
where belongmainid = #{traceId}
order by log_date desc, id desc) TMP
WHERE ROWNUM &lt;= (#{pageSize} + #{offset}))
WHERE ROW_ID &gt; #{offset}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="sqlserver">
select atmp.operatorname, atmp.targetname, atmp.modulename, atmp.operatetypename
from (select atmp.*, row_number() over(order by log_date desc ,id desc ) as rownumber
from (select top(#{pageSize}) atmp.*
from (select *, convert(nvarchar(19), log_date, 120) createdate
from ${tableName}
where belongmainid = #{traceId}) atmp
order by log_date desc, id desc) atmp) atmp
where rownumber &gt; #{offset}
order by log_date desc, id desc
</select>
<select id="queryElogTraceInfoCount" resultType="java.lang.Integer">
select count(id) id
from ${tableName}
where belongmainid = #{traceId}
</select>
<select id="queryLogInfoByCustom" resultType="java.util.Map">
select * from ${tableName}
<where>${sql}</where>
</select>
<select id="queryAllChangesData" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
order by showorder asc, id asc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="postgresql">
select log_operator employeeId, max(log_date) date
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryAllChangesDataPages" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
order by showorder asc, id asc
</select>
<select id="queryAllChangesPageCounts" resultType="java.lang.Integer">
select count(*)
from ${tableName}
where mainid = #{mainid}
</select>
<select id="elogCountOnlyNum" resultType="java.lang.Long">
select count(*) from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
</mapper>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.QueryCurretValusMapper">
<select id="queryValues" resultType="java.util.Map">
${querySql} limit 1
</select>
</mapper>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,5 @@
log=false
defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.2.2504.01
openFormulaForcedEditing=false

View File

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="GB2312"?>
<config name="薪酬管理权限" key="salary">
<module name="算薪" key="calculate">
<page name="社保福利档案" key="siArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="社保福利台账" key="siAccount">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资账套" key="salarySob">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资档案" key="salaryArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="调薪管理" key="adjustRecord">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资核算" key="salaryAcct">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="工资单" key="salaryBill">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="个税申报" key="taxDeclaration">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="数据采集" key="collection">
<page name="累计专项附加扣除" key="addUpDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="专项附加扣除" key="specialAddDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="其他免税扣除" key="otherDeduction">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="往期累计情况" key="addUpSituation">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="考勤引用" key="attendQuote">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="浮动数据" key="variableArchive">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="报表" key="report">
<page name="报表" key="report">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
<module name="设置" key="config">
<page name="个税扣缴义务人" key="taxAgent">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="社保福利方案" key="siScheme">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="薪资项目管理" key="salaryItem">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
<page name="字段管理" key="salaryField">
<opt name="查询" key="query"/>
<opt name="管理" key="admin"/>
</page>
</module>
</config>

View File

@ -1,3 +0,0 @@
update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}' where id = 1651742702735 ;
update hrsa_formula set formulaRunScript = 'if(salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}' where id = 1651742702735 ;

View File

@ -1,31 +0,0 @@
INSERT INTO hrsa_formula (id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:37:47', '2022-05-31 18:37:47')
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:43:58', '2022-05-31 18:43:58')
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:45:54', '2022-05-31 18:45:54')
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-31 18:47:42', '2022-05-31 18:47:42')
/
delete from hrsa_salary_item where sys_salary_item_id in (674853617092214800,674853617092214801,674853617092214802,674853617092214803)
/
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800
/
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801
/
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802
/
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803
/

View File

@ -1,200 +0,0 @@
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214787, '工资薪金合计', 'wagesTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651736817711, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:58', '2022-05-10 16:03:02', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214788, '全年一次性奖金合计', 'annualBonusTotal', 1, 5, 22, 0, 0, 2, 2, 2, 1, 1651737358294, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:58', '2022-05-10 16:03:07', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214789, '税前扣款合计', 'preTaxDeductionsTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651737635353, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:58', '2022-05-10 16:03:22', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214790, '本月(次)应税收入合计', 'income', 1, 5, 22, 1, 0, 2, 2, 2, 0, 1651737859216, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:58', '2022-05-10 16:03:25', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214791, '当前累计应税收入合计', 'addUpIncome', 1, 5, 22, 1, 0, 2, 2, 2, 0, 1651738034028, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:58', '2022-05-10 16:03:28', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214792, '养老个人', 'endowmentInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651749914746, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214793, '医疗个人', 'medicalInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651749958879, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214795, '失业个人', 'unemploymentInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651750005281, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214796, '公积金个人', 'housingProvidentFund', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651750034689, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214797, '本月(次)专项扣除合计', 'specialDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 7, 1651738826550, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 16:03:40', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214798, '当前累计专项扣除合计', 'addUpSpecialDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 7, 1651739000845, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214799, '累计子女教育', 'addUpChildEducation', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739053212, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214800, '累计住房贷款利息', 'addUpHousingLoanInterest', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739100651, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214801, '累计住房租金', 'addUpHousingRent', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739151122, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214802, '累计继续教育', 'addUpContinuingEducation', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739212437, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214803, '累计赡养老人', 'addUpSupportElderly', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739310959, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214804, '当前累计专项附加扣除合计', 'addUpSpeAddiDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 6, 1651739411365, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214805, '本月(次)其他扣除合计', 'otherDeduction', 1, 5, 22, 0, 0, 2, 2, 2, 8, 1651739815651, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214806, '当前累计其他扣除合计', 'addUpOtherDeduction', 1, 5, 22, 0, 0, 2, 2, 2, 5, 1651740238860, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214807, '本月(次)减除费用', 'subtraction', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651740311026, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:56:11', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214808, '当前累计减除费用', 'addUpSubtraction', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651740397225, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:32:59', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214809, '本月(次)工资薪金税税率', 'taxRate', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651742185837, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214810, '本月(次)工资薪金税速算扣除数', 'quickDeductionFactor', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651742702735, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214811, '当前累计应纳税所得额', 'addUpTaxableIncome', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651745445982, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 16:04:12', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214812, '当前累计应纳税额', 'addUpTaxPayable', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651748888864, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 16:04:14', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214813, '当前累计已扣缴税额合计', 'addUpAdvanceTax', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651748978482, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 16:04:18', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214814, '本月(次)应补税额', 'refundedOrSupplementedTax', 1, 6, 16, 1, 0, 2, 2, 2, 1, 1651749111981, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214815, '本月(次)实发薪资合计', 'netSalaryTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651749240004, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 16:04:24', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861648655892480, '基本工资', 'baseSalary', 1, 1, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:57:46', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861768948531201, '岗位工资', 'postSalary', 1, 1, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:57:57', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861880508628992, '考勤扣款', 'attendanceDeduction', 1, 2, 9, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:58:04', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093121, '税后报销合计', 'afterTaxReimbursementTotal', 1, 5, 22, 0, 0, 3, 2, 1, 1, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:58:06', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093122, '年金个人', 'annuity', 1, 2, 12, 0, 0, 2, 2, 2, 7, 1651749398360, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093123, '商业健康保险', 'commercialHealthInsurance', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749448800, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:00', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093124, '税延养老保险', 'taxDeferredEndowmentInsurance', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749487187, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093125, '财产原值', 'originalValueOfProperty', 1, 2, 12, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:58:29', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093126, '允许扣除的税费', 'deductedTax', 1, 2, 12, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:58:42', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093127, '其他', 'other', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749540147, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093128, '本月(次)费用', 'fee', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093129, '本月(次)免税收入', 'taxFreeIncome', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:58:54', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093130, '减按计税比例', 'lessTaxProportion', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646657, '税后调整合计', 'afterTaxAdjustmentTotal', 1, 5, 22, 0, 0, 2, 2, 1, 1, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:59:09', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646658, '当前累计减免税额合计', 'addUpTaxDeduction', 1, 5, 22, 0, 0, 2, 2, 1, 5, 0, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646659, '本月(次)准允扣除的捐赠额', 'allowedDonation', 1, 5, 22, 0, 0, 2, 2, 2, 8, 1651749595061, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646660, '当前累计准备扣除的捐赠额', 'addUpAllowedDonation', 1, 5, 22, 0, 0, 2, 2, 2, 5, 1651749675268, '', 0, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 15:54:31', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646661, '本月(次)减免税额', 'taxDeduction', 1, 5, 22, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:01', '2022-05-10 16:00:25', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646662, '税后扣款合计', 'afterTaxDeductionsTotal', 1, 5, 22, 0, 0, 2, 2, 1, 1, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:02', '2022-05-10 16:00:37', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919424520683521, '税后扣款', 'afterTaxDeductions', 1, 4, 15, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:02', '2022-05-10 16:00:39', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919682288984064, '税后报销', 'afterTaxReimbursement', 1, 3, 13, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:02', '2022-05-10 16:00:40', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919776783499264, '税后调整', 'afterTaxAdjustment', 1, 3, 14, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:02', '2022-05-10 16:00:48', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674920588574261248, '年终奖', 'annualBonus', 1, 1, 2, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-03-28 10:33:02', '2022-05-10 16:00:51', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697532371614588928, '当前累计社保个人合计', 'addUpSocialSecurityTotal', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801433504, '', 0, 1, 0, 0, 'all_teams', '2022-03-07 10:22:55', '2022-05-06 09:44:23', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697532667749400576, '当前累计公积金个人合计', 'addUpAccumulationFundTotal', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801586972, '', 0, 1, 0, 0, 'all_teams', '2022-03-07 10:22:55', '2022-05-06 09:46:40', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697536344384012289, '当前累计企业(职业)年金及其他福利个人合计', 'addUpEnterpriseAndOther', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801667770, '', 0, 1, 0, 0, 'all_teams', '2022-03-07 10:22:56', '2022-05-06 09:48:07', 'number');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651736817711, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.基本工资}+{薪资项目.岗位工资}', 'salaryItem_baseSalary+salaryItem_postSalary', 1, 0, '2022-05-05 15:46:58', '2022-05-05 15:46:58');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737358294, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.年终奖}', 'salaryItem_annualBonus', 1, 0, '2022-05-05 15:55:58', '2022-05-05 15:55:58');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737635353, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.考勤扣款}', 'salaryItem_attendanceDeduction', 1, 0, '2022-05-05 16:00:35', '2022-05-05 16:00:35');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737859216, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.工资薪金合计}+{薪资项目.全年一次性奖金合计}-{薪资项目.税前扣款合计}', 'salaryItem_wagesTotal+salaryItem_annualBonusTotal-salaryItem_preTaxDeductionsTotal', 1, 0, '2022-05-05 16:04:19', '2022-05-05 16:04:19');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651738034028, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)应税收入合计}+{往期累计情况.累计收入额}', 'salaryItem_income+addUpSituation_addUpIncome', 1, 0, '2022-05-05 16:07:14', '2022-05-05 16:07:14');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749914746, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.养老保险个人}', 'welfare_9001socialPer', 1, 0, '2022-05-05 19:25:15', '2022-05-05 19:25:15');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749958879, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.医疗保险个人}', 'welfare_9002socialPer', 1, 0, '2022-05-05 19:25:59', '2022-05-05 19:25:59');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651750005281, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.失业保险个人}', 'welfare_9004socialPer', 1, 0, '2022-05-05 19:26:45', '2022-05-05 19:26:45');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651750034689, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.住房公积金个人}', 'welfare_9006fundPer', 1, 0, '2022-05-05 19:27:15', '2022-05-05 19:27:15');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651738826550, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.养老个人}+{薪资项目.医疗个人}+{薪资项目.失业个人}+{薪资项目.公积金个人}', 'salaryItem_endowmentInsurance+salaryItem_medicalInsurance+salaryItem_unemploymentInsurance+salaryItem_housingProvidentFund', 1, 0, '2022-05-05 16:20:27', '2022-05-05 16:20:27');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739000845, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)专项扣除合计}+{往期累计情况.累计社保个人合计}+{往期累计情况.累计公积金个人合计}', 'salaryItem_specialDeduction+addUpSituation_addUpSocialSecurityTotal+addUpSituation_addUpAccumulationFundTotal', 1, 0, '2022-05-05 16:23:21', '2022-05-05 16:23:21');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739053212, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计子女教育}', 'addUpDeductions_addUpChildEducation', 1, 0, '2022-05-05 16:24:13', '2022-05-05 16:24:13');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739100651, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{往期累计情况.累计住房贷款利息}', 'addUpSituation_addUpHousingLoanInterest', 1, 0, '2022-05-05 16:25:01', '2022-05-05 16:25:01');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739151122, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{往期累计情况.累计住房租金}', 'addUpSituation_addUpHousingRent', 1, 0, '2022-05-05 16:25:51', '2022-05-05 16:25:51');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739212437, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{往期累计情况.累计继续教育}', 'addUpSituation_addUpContinuingEducation', 1, 0, '2022-05-05 16:26:52', '2022-05-05 16:26:52');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739310959, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{往期累计情况.累计赡养老人}', 'addUpSituation_addUpSupportElderly', 1, 0, '2022-05-05 16:28:31', '2022-05-05 16:28:31');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739411365, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.累计子女教育}+{薪资项目.累计住房贷款利息}+{薪资项目.累计住房租金}+{薪资项目.累计继续教育}+{薪资项目.累计赡养老人}', 'salaryItem_addUpChildEducation+salaryItem_addUpHousingLoanInterest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly', 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739815651, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.年金个人}+{薪资项目.商业健康保险}+{薪资项目.税延养老保险}+{薪资项目.财产原值}+{薪资项目.允许扣除的税费}+{薪资项目.其他}', 'salaryItem_annuity+salaryItem_commercialHealthInsurance+salaryItem_taxDeferredEndowmentInsurance+salaryItem_originalValueOfProperty+salaryItem_deductedTax+salaryItem_other', 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740238860, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)其他扣除合计}+{往期累计情况.累计其他免税扣除}+{往期累计情况.累计企业(职业)年金及其他福利}', 'salaryItem_otherDeduction+addUpSituation_addUpOtherDeduction+addUpSituation_addUpEnterpriseAndOther', 1, 0, '2022-05-05 16:43:59', '2022-05-05 16:43:59');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740311026, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '5000', '5000', 1, 0, '2022-05-05 16:45:11', '2022-05-05 16:45:11');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740397225, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)减除费用}+{往期累计情况.累计减除费用}', 'salaryItem_subtraction+addUpSituation_addUpSubtraction', 1, 0, '2022-05-05 16:46:37', '2022-05-05 16:46:37');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651742185837, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.当前累计应纳税所得额}<=0){0;}else if({薪资项目.当前累计应纳税所得额}<=36000){0.03;}else if({薪资项目.当前累计应纳税所得额}<=144000){0.1;}else if({薪资项目.当前累计应纳税所得额}<=300000){0.2;}else if({薪资项目.当前累计应纳税所得额}<=420000){0.25;}else if({薪资项目.当前累计应纳税所得额}<=660000){0.3;}else if({薪资项目.当前累计应纳税所得额}<=960000){0.35;}else{0.45;}', 'if(salaryItem_addUpTaxableIncome<=0){0;}else if(salaryItem_addUpTaxableIncome<=36000){0.03;}else if(salaryItem_addUpTaxableIncome<=144000){0.1;}else if(salaryItem_addUpTaxableIncome<=300000){0.2;}else if(salaryItem_addUpTaxableIncome<=420000){0.25;}else if(salaryItem_addUpTaxableIncome<=660000){0.3;}else if(salaryItem_addUpTaxableIncome<=960000){0.35;}else{0.45;}', 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651742702735, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if(<=36000){{薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}', 'if(<=36000){salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}', 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651745445982, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.当前累计应税收入合计}-{薪资项目.当前累计专项扣除合计}-{薪资项目.当前累计专项附加扣除合计}-{薪资项目.当前累计其他扣除合计}-{薪资项目.当前累计减除费用}-{薪资项目.当前累计准备扣除的捐赠额}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation', 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651748888864, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.当前累计应纳税所得额}*{薪资项目.本月(次)工资薪金税税率}-{薪资项目.本月(次)工资薪金税速算扣除数}', 'salaryItem_addUpTaxableIncome*salaryItem_taxRate-salaryItem_quickDeductionFactor', 1, 0, '2022-05-05 19:08:09', '2022-05-05 19:08:09');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651748978482, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{往期累计情况.累计已预扣预缴税额}', 'addUpSituation_addUpAdvanceTax', 1, 0, '2022-05-05 19:09:38', '2022-05-05 19:09:38');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749111981, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.当前累计应纳税额}-{薪资项目.当前累计已扣缴税额合计}-{薪资项目.当前累计减免税额合计}', 'salaryItem_addUpTaxPayable-salaryItem_addUpAdvanceTax-salaryItem_addUpTaxDeduction', 1, 0, '2022-05-05 19:11:52', '2022-05-05 19:11:52');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749240004, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)应税收入合计}-{薪资项目.本月(次)专项扣除合计}-{薪资项目.本月(次)应补税额}+{薪资项目.税后调整合计}+{薪资项目.税后报销合计}-{薪资项目.税后扣款合计}', 'salaryItem_income-salaryItem_specialDeduction-salaryItem_refundedOrSupplementedTax+salaryItem_afterTaxAdjustmentTotal+salaryItem_afterTaxReimbursementTotal-salaryItem_afterTaxDeductionsTotal', 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749398360, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.企业年金个人}', 'welfare_9007otherPer', 1, 0, '2022-05-05 19:16:38', '2022-05-05 19:16:38');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749448800, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.商业健康保险}', 'otherDeduction_businessHealthyInsurance', 1, 0, '2022-05-05 19:17:29', '2022-05-05 19:17:29');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749487187, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.税延养老保险}', 'otherDeduction_taxDelayEndowmentInsurance', 1, 0, '2022-05-05 19:18:07', '2022-05-05 19:18:07');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749540147, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.其他}', 'otherDeduction_otherDeduction', 1, 0, '2022-05-05 19:19:00', '2022-05-05 19:19:00');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749595061, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.准予扣除的捐赠额}', 'otherDeduction_deductionAllowedDonation', 1, 0, '2022-05-05 19:19:55', '2022-05-05 19:19:55');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749675268, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)准允扣除的捐赠额}+{往期累计情况.累计准予扣除的捐赠额}', 'salaryItem_allowedDonation+addUpSituation_addUpAllowedDonation', 1, 0, '2022-05-05 19:21:15', '2022-05-05 19:21:15');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801433504, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.社保个人合计}+{往期累计情况.累计社保个人合计}', 'welfare_socialPerSum+addUpSituation_addUpSocialSecurityTotal', 1, 0, '2022-05-06 09:43:54', '2022-05-06 09:43:54');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801586972, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.公积金个人合计}+{往期累计情况.累计公积金个人合计}', 'welfare_fundPerSum+addUpSituation_addUpAccumulationFundTotal', 1, 0, '2022-05-06 09:46:27', '2022-05-06 09:46:27');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801667770, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.其他福利个人合计}+{往期累计情况.累计企业(职业)年金及其他福利}', 'welfare_otherPerSum+addUpSituation_addUpEnterpriseAndOther', 1, 0, '2022-05-06 09:47:48', '2022-05-06 09:47:48');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651736818266, '基本工资', 1651736817711, 'salaryItem_baseSalary', '{薪资项目.基本工资}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 15:46:58', '2022-05-05 15:46:58');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651736818329, '岗位工资', 1651736817711, 'salaryItem_postSalary', '{薪资项目.岗位工资}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 15:46:58', '2022-05-05 15:46:58');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737360610, '年终奖', 1651737358294, 'salaryItem_annualBonus', '{薪资项目.年终奖}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 15:55:58', '2022-05-05 15:55:58');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737636061, '考勤扣款', 1651737635353, 'salaryItem_attendanceDeduction', '{薪资项目.考勤扣款}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:00:35', '2022-05-05 16:00:35');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859281, '工资薪金合计', 1651737859216, 'salaryItem_wagesTotal', '{薪资项目.工资薪金合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:04:19', '2022-05-05 16:04:19');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859342, '全年一次性奖金合计', 1651737859216, 'salaryItem_annualBonusTotal', '{薪资项目.全年一次性奖金合计}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 16:04:19', '2022-05-05 16:04:19');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859401, '税前扣款合计', 1651737859216, 'salaryItem_preTaxDeductionsTotal', '{薪资项目.税前扣款合计}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 16:04:19', '2022-05-05 16:04:19');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738035450, '本月(次)应税收入合计', 1651738034028, 'salaryItem_income', '{薪资项目.本月(次)应税收入合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:07:14', '2022-05-05 16:07:14');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738035488, '累计收入额', 1651738034028, 'addUpSituation_addUpIncome', '{往期累计情况.累计收入额}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-05 16:07:14', '2022-05-05 16:07:14');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738832854, '养老个人', 1651738826550, 'salaryItem_endowmentInsurance', '{薪资项目.养老个人}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:20:27', '2022-05-05 16:20:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738837363, '医疗个人', 1651738826550, 'salaryItem_medicalInsurance', '{薪资项目.医疗个人}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 16:20:27', '2022-05-05 16:20:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738837909, '失业个人', 1651738826550, 'salaryItem_unemploymentInsurance', '{薪资项目.失业个人}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 16:20:27', '2022-05-05 16:20:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738838429, '公积金个人', 1651738826550, 'salaryItem_housingProvidentFund', '{薪资项目.公积金个人}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 16:20:27', '2022-05-05 16:20:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739002623, '本月(次)专项扣除合计', 1651739000845, 'salaryItem_specialDeduction', '{薪资项目.本月(次)专项扣除合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:23:21', '2022-05-05 16:23:21');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739002682, '累计社保个人合计', 1651739000845, 'addUpSituation_addUpSocialSecurityTotal', '{往期累计情况.累计社保个人合计}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-05 16:23:21', '2022-05-05 16:23:21');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739003139, '累计公积金个人合计', 1651739000845, 'addUpSituation_addUpAccumulationFundTotal', '{往期累计情况.累计公积金个人合计}', 'number', 'addUpSituation', 2, 1, 0, '2022-05-05 16:23:21', '2022-05-05 16:23:21');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739054270, '累计子女教育', 1651739053212, 'addUpDeductions_addUpChildEducation', '{累计专项附加扣除.累计子女教育}', 'number', 'addUpDeductions', 0, 1, 0, '2022-05-05 16:24:13', '2022-05-05 16:24:13');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739101122, '累计住房贷款利息', 1651739100651, 'addUpSituation_addUpHousingLoanInterest', '{往期累计情况.累计住房贷款利息}', 'number', 'addUpSituation', 0, 1, 0, '2022-05-05 16:25:01', '2022-05-05 16:25:01');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739151221, '累计住房租金', 1651739151122, 'addUpSituation_addUpHousingRent', '{往期累计情况.累计住房租金}', 'number', 'addUpSituation', 0, 1, 0, '2022-05-05 16:25:51', '2022-05-05 16:25:51');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739213082, '累计继续教育', 1651739212437, 'addUpSituation_addUpContinuingEducation', '{往期累计情况.累计继续教育}', 'number', 'addUpSituation', 0, 1, 0, '2022-05-05 16:26:52', '2022-05-05 16:26:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739311009, '累计赡养老人', 1651739310959, 'addUpSituation_addUpSupportElderly', '{往期累计情况.累计赡养老人}', 'number', 'addUpSituation', 0, 1, 0, '2022-05-05 16:28:31', '2022-05-05 16:28:31');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411502, '累计子女教育', 1651739411365, 'salaryItem_addUpChildEducation', '{薪资项目.累计子女教育}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411637, '累计住房贷款利息', 1651739411365, 'salaryItem_addUpHousingLoanInterest', '{薪资项目.累计住房贷款利息}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411715, '累计住房租金', 1651739411365, 'salaryItem_addUpHousingRent', '{薪资项目.累计住房租金}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411773, '累计继续教育', 1651739411365, 'salaryItem_addUpContinuingEducation', '{薪资项目.累计继续教育}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739412718, '累计赡养老人', 1651739411365, 'salaryItem_addUpSupportElderly', '{薪资项目.累计赡养老人}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 16:30:11', '2022-05-05 16:30:11');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739819892, '年金个人', 1651739815651, 'salaryItem_annuity', '{薪资项目.年金个人}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739822564, '商业健康保险', 1651739815651, 'salaryItem_commercialHealthInsurance', '{薪资项目.商业健康保险}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739826637, '税延养老保险', 1651739815651, 'salaryItem_taxDeferredEndowmentInsurance', '{薪资项目.税延养老保险}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739828954, '财产原值', 1651739815651, 'salaryItem_originalValueOfProperty', '{薪资项目.财产原值}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739829915, '允许扣除的税费', 1651739815651, 'salaryItem_deductedTax', '{薪资项目.允许扣除的税费}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739830465, '其他', 1651739815651, 'salaryItem_other', '{薪资项目.其他}', 'number', 'salaryItem', 5, 1, 0, '2022-05-05 16:36:56', '2022-05-05 16:36:56');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740240713, '本月(次)其他扣除合计', 1651740238860, 'salaryItem_otherDeduction', '{薪资项目.本月(次)其他扣除合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:43:59', '2022-05-05 16:43:59');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740241221, '累计其他免税扣除', 1651740238860, 'addUpSituation_addUpOtherDeduction', '{往期累计情况.累计其他免税扣除}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-05 16:43:59', '2022-05-05 16:43:59');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740241717, '累计企业(职业)年金及其他福利', 1651740238860, 'addUpSituation_addUpEnterpriseAndOther', '{往期累计情况.累计企业(职业)年金及其他福利}', 'number', 'addUpSituation', 2, 1, 0, '2022-05-05 16:43:59', '2022-05-05 16:43:59');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740397497, '本月(次)减除费用', 1651740397225, 'salaryItem_subtraction', '{薪资项目.本月(次)减除费用}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 16:46:37', '2022-05-05 16:46:37');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740397989, '累计减除费用', 1651740397225, 'addUpSituation_addUpSubtraction', '{往期累计情况.累计减除费用}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-05 16:46:37', '2022-05-05 16:46:37');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742185950, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742185995, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186035, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186085, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186122, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186155, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 5, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186199, '当前累计应纳税所得额', 1651742185837, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 6, 1, 0, '2022-05-05 17:16:26', '2022-05-05 17:16:26');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742704826, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705308, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705782, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705831, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742706306, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742706368, '当前累计应纳税所得额', 1651742702735, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 5, 1, 0, '2022-05-05 17:25:03', '2022-05-05 17:25:03');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745446904, '当前累计应税收入合计', 1651745445982, 'salaryItem_addUpIncome', '{薪资项目.当前累计应税收入合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745447442, '当前累计专项扣除合计', 1651745445982, 'salaryItem_addUpSpecialDeduction', '{薪资项目.当前累计专项扣除合计}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745447969, '当前累计专项附加扣除合计', 1651745445982, 'salaryItem_addUpSpeAddiDeduction', '{薪资项目.当前累计专项附加扣除合计}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745448475, '当前累计其他扣除合计', 1651745445982, 'salaryItem_addUpOtherDeduction', '{薪资项目.当前累计其他扣除合计}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745451616, '当前累计减除费用', 1651745445982, 'salaryItem_addUpSubtraction', '{薪资项目.当前累计减除费用}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745452097, '当前累计准备扣除的捐赠额', 1651745445982, 'salaryItem_addUpAllowedDonation', '{薪资项目.当前累计准备扣除的捐赠额}', 'number', 'salaryItem', 5, 1, 0, '2022-05-05 18:10:46', '2022-05-05 18:10:46');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888918, '当前累计应纳税所得额', 1651748888864, 'salaryItem_addUpTaxableIncome', '{薪资项目.当前累计应纳税所得额}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 19:08:09', '2022-05-05 19:08:09');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888952, '本月(次)工资薪金税税率', 1651748888864, 'salaryItem_taxRate', '{薪资项目.本月(次)工资薪金税税率}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 19:08:09', '2022-05-05 19:08:09');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888989, '本月(次)工资薪金税速算扣除数', 1651748888864, 'salaryItem_quickDeductionFactor', '{薪资项目.本月(次)工资薪金税速算扣除数}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 19:08:09', '2022-05-05 19:08:09');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748978520, '累计已预扣预缴税额', 1651748978482, 'addUpSituation_addUpAdvanceTax', '{往期累计情况.累计已预扣预缴税额}', 'number', 'addUpSituation', 0, 1, 0, '2022-05-05 19:09:38', '2022-05-05 19:09:38');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112037, '当前累计应纳税额', 1651749111981, 'salaryItem_addUpTaxPayable', '{薪资项目.当前累计应纳税额}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 19:11:52', '2022-05-05 19:11:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112068, '当前累计已扣缴税额合计', 1651749111981, 'salaryItem_addUpAdvanceTax', '{薪资项目.当前累计已扣缴税额合计}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 19:11:52', '2022-05-05 19:11:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112116, '当前累计减免税额合计', 1651749111981, 'salaryItem_addUpTaxDeduction', '{薪资项目.当前累计减免税额合计}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 19:11:52', '2022-05-05 19:11:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240040, '本月(次)应税收入合计', 1651749240004, 'salaryItem_income', '{薪资项目.本月(次)应税收入合计}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240082, '本月(次)专项扣除合计', 1651749240004, 'salaryItem_specialDeduction', '{薪资项目.本月(次)专项扣除合计}', 'number', 'salaryItem', 1, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240117, '本月(次)应补税额', 1651749240004, 'salaryItem_refundedOrSupplementedTax', '{薪资项目.本月(次)应补税额}', 'number', 'salaryItem', 2, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240164, '税后调整合计', 1651749240004, 'salaryItem_afterTaxAdjustmentTotal', '{薪资项目.税后调整合计}', 'number', 'salaryItem', 3, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240199, '税后报销合计', 1651749240004, 'salaryItem_afterTaxReimbursementTotal', '{薪资项目.税后报销合计}', 'number', 'salaryItem', 4, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240245, '税后扣款合计', 1651749240004, 'salaryItem_afterTaxDeductionsTotal', '{薪资项目.税后扣款合计}', 'number', 'salaryItem', 5, 1, 0, '2022-05-05 19:14:00', '2022-05-05 19:14:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749398399, '企业年金个人', 1651749398360, 'welfare_9007otherPer', '{社保福利.企业年金个人}', 'number', 'welfare', 0, 1, 0, '2022-05-05 19:16:38', '2022-05-05 19:16:38');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749448843, '商业健康保险', 1651749448800, 'otherDeduction_businessHealthyInsurance', '{其他免税扣除.商业健康保险}', 'number', 'otherDeduction', 0, 1, 0, '2022-05-05 19:17:29', '2022-05-05 19:17:29');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749487225, '税延养老保险', 1651749487187, 'otherDeduction_taxDelayEndowmentInsurance', '{其他免税扣除.税延养老保险}', 'number', 'otherDeduction', 0, 1, 0, '2022-05-05 19:18:07', '2022-05-05 19:18:07');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749540213, '其他', 1651749540147, 'otherDeduction_otherDeduction', '{其他免税扣除.其他}', 'number', 'otherDeduction', 0, 1, 0, '2022-05-05 19:19:00', '2022-05-05 19:19:00');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749596472, '准予扣除的捐赠额', 1651749595061, 'otherDeduction_deductionAllowedDonation', '{其他免税扣除.准予扣除的捐赠额}', 'number', 'otherDeduction', 0, 1, 0, '2022-05-05 19:19:55', '2022-05-05 19:19:55');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749675326, '本月(次)准允扣除的捐赠额', 1651749675268, 'salaryItem_allowedDonation', '{薪资项目.本月(次)准允扣除的捐赠额}', 'number', 'salaryItem', 0, 1, 0, '2022-05-05 19:21:15', '2022-05-05 19:21:15');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749675365, '累计准予扣除的捐赠额', 1651749675268, 'addUpSituation_addUpAllowedDonation', '{往期累计情况.累计准予扣除的捐赠额}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-05 19:21:15', '2022-05-05 19:21:15');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749914793, '养老保险个人', 1651749914746, 'welfare_9001socialPer', '{社保福利.养老保险个人}', 'number', 'welfare', 0, 1, 0, '2022-05-05 19:25:15', '2022-05-05 19:25:15');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749958917, '医疗保险个人', 1651749958879, 'welfare_9002socialPer', '{社保福利.医疗保险个人}', 'number', 'welfare', 0, 1, 0, '2022-05-05 19:25:59', '2022-05-05 19:25:59');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651750005320, '失业保险个人', 1651750005281, 'welfare_9004socialPer', '{社保福利.失业保险个人}', 'number', 'welfare', 0, 1, 0, '2022-05-05 19:26:45', '2022-05-05 19:26:45');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651750034727, '住房公积金个人', 1651750034689, 'welfare_9006fundPer', '{社保福利.住房公积金个人}', 'number', 'welfare', 0, 1, 0, '2022-05-05 19:27:15', '2022-05-05 19:27:15');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801435862, '社保个人合计', 1651801433504, 'welfare_socialPerSum', '{社保福利.社保个人合计}', 'number', 'welfare', 0, 1, 0, '2022-05-06 09:43:54', '2022-05-06 09:43:54');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801436423, '累计社保个人合计', 1651801433504, 'addUpSituation_addUpSocialSecurityTotal', '{往期累计情况.累计社保个人合计}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-06 09:43:54', '2022-05-06 09:43:54');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801587331, '公积金个人合计', 1651801586972, 'welfare_fundPerSum', '{社保福利.公积金个人合计}', 'number', 'welfare', 0, 1, 0, '2022-05-06 09:46:27', '2022-05-06 09:46:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801587794, '累计公积金个人合计', 1651801586972, 'addUpSituation_addUpAccumulationFundTotal', '{往期累计情况.累计公积金个人合计}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-06 09:46:27', '2022-05-06 09:46:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801669969, '其他福利个人合计', 1651801667770, 'welfare_otherPerSum', '{社保福利.其他福利个人合计}', 'number', 'welfare', 0, 1, 0, '2022-05-06 09:47:48', '2022-05-06 09:47:48');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801670474, '累计企业(职业)年金及其他福利', 1651801667770, 'addUpSituation_addUpEnterpriseAndOther', '{往期累计情况.累计企业(职业)年金及其他福利}', 'number', 'addUpSituation', 1, 1, 0, '2022-05-06 09:47:48', '2022-05-06 09:47:48');
INSERT INTO hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291652, 'taxAgentName', 0, 0, 0, '2022-02-23 17:32:08', '2022-02-23 17:32:08', 0, 'all_teams');
INSERT INTO hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291653, 'username', 1, 0, 0, '2022-02-23 17:32:08', '2022-02-23 17:32:08', 0, 'all_teams');
INSERT INTO hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291654, 'departmentName', 2, 0, 0, '2022-02-23 17:32:08', '2022-02-23 17:32:08', 0, 'all_teams');
ALTER TABLE hrsa_salary_sob_item ADD COLUMN can_delete int(0) NULL COMMENT '是否可删除0不可删除1可删除' AFTER tenant_key;
ALTER TABLE hrsa_salary_sob_item ADD can_delete int NULL
GO

View File

@ -1,74 +0,0 @@
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368900, 4, 703459464954929153, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368899, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368902, 4, 703458434280095745, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368901, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368903, 4, 703458558739300353, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368901, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368905, 4, 674914626953093123, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368904, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368906, 4, 674914626953093124, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368904, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368907, 4, 674914626953093127, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368904, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368908, 4, 674916065864646659, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368904, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368910, 4, 704467747234045953, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368909, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368911, 4, 704468391612751873, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368909, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368912, 4, 704468443048992769, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368909, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368913, 4, 704468490269204481, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368909, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368914, 4, 704468528928063488, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 704495325212368909, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368915, 4, 703459151591383041, 1, 0, 0, '2022-03-14 11:32:32', '2022-03-17 16:14:11', 0, 'all_teams', 0, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312448, 1, 703459151591383041, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:23', 0, 'all_teams', 0, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312449, 1, 674861648655892480, 1, 1, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614083, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312450, 1, 674861768948531201, 1, 1, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614083, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312451, 1, 674861880508628992, 1, 1, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614083, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312452, 1, 674920588574261248, 1, 1, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614083, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312453, 1, 674853617092214790, 1, 0, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614083, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312454, 1, 674853617092214791, 1, 0, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614083, 5);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312455, 1, 674914626953093129, 1, 0, 0, '2022-03-14 11:32:28', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614083, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312456, 1, 703419929857687552, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614083, 7);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312457, 1, 674853617092214792, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614092, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312458, 1, 674853617092214793, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312459, 1, 674853617092214795, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312460, 1, 674853617092214796, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614092, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312461, 1, 700599184238075904, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614092, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312462, 1, 700599446244319233, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 5);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312463, 1, 674853617092214797, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312464, 1, 697532371614588928, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 7);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312465, 1, 697532667749400576, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614092, 8);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312466, 1, 697536344384012289, 1, 0, 0, '2022-03-18 16:24:49', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614092, 9);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312467, 1, 674853617092214798, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614092, 10);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312468, 1, 674853617092214803, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614103, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312469, 1, 674853617092214802, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614103, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312470, 1, 674853617092214801, 1, 0, 0, '2022-03-14 11:32:29', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614103, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312471, 1, 674853617092214800, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614103, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312472, 1, 674853617092214799, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614103, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312473, 1, 705641858303836161, 1, 0, 0, '2022-03-17 13:48:51', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614103, 5);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312474, 1, 674853617092214804, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614103, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312475, 1, 674853617092214807, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312476, 1, 674853617092214808, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312477, 1, 674914626953093122, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312478, 1, 674914626953093123, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614110, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312479, 1, 674914626953093124, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312480, 1, 674914626953093127, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614110, 5);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312481, 1, 674853617092214805, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614110, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312482, 1, 674853617092214806, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614110, 7);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312483, 1, 674916065864646659, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 8);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312484, 1, 674916065864646660, 1, 0, 0, '2022-03-18 16:30:21', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614110, 9);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312485, 1, 674853617092214811, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614119, 0);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312486, 1, 674853617092214809, 1, 0, 0, '2022-03-14 11:32:30', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 1);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312487, 1, 674853617092214810, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 2);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312488, 1, 674853617092214812, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 3);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312489, 1, 674853617092214813, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 4);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312490, 1, 674916065864646661, 1, 1, 0, '2022-03-18 16:33:37', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 5);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312491, 1, 674916065864646658, 1, 1, 0, '2022-03-18 16:33:37', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614119, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312492, 1, 674853617092214814, 1, 0, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614119, 7);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312493, 1, 674853617092214815, 1, 1, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:23', 0, 'all_teams', 703433961629614126, 6);
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312494, 1, 700769462612156416, 1, 1, 0, '2022-03-14 11:32:31', '2022-03-18 16:59:24', 0, 'all_teams', 703433961629614126, 7);
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614083, 1, '收入以及免税', 0, '', '2022-03-11 14:49:01', '2022-03-11 14:49:01', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614092, 1, '专项扣除', 1, '', '2022-03-11 14:49:27', '2022-03-11 14:49:27', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614103, 1, '累计专项附加扣除', 2, '', '2022-03-11 14:49:27', '2022-03-11 14:49:27', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614110, 1, '其他扣除等信息', 3, '', '2022-03-11 14:49:27', '2022-03-11 14:49:27', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614119, 1, '税款计算', 4, '', '2022-03-11 14:49:27', '2022-03-11 14:49:27', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614126, 1, '应发实发', 5, '', '2022-03-11 14:49:28', '2022-03-11 14:49:28', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368899, 4, '所得项目', 0, '', '2022-03-15 17:52:48', '2022-03-15 18:14:53', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368901, 4, '收入及免税', 1, '', '2022-03-15 17:52:48', '2022-03-15 18:14:53', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368904, 4, '其他扣除等信息', 2, '', '2022-03-15 17:52:48', '2022-03-15 18:14:53', 0, 0, 'all_teams');
INSERT INTO hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368909, 4, '税款计算', 3, '', '2022-03-15 17:52:48', '2022-03-15 18:14:53', 0, 0, 'all_teams');

View File

@ -1,3 +0,0 @@
update hrsa_salary_archive_item set delete_type = 1 where salary_archive_id in ( select id from hrsa_salary_archive where id in (select salary_archive_id from hrsa_salary_archive_tax_agent where tax_agent_id = 3));
update hrsa_salary_archive set delete_type = 1 where id in (select salary_archive_id from hrsa_salary_archive_tax_agent where tax_agent_id = 3);

View File

@ -1,53 +0,0 @@
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599184238075904, '社保个人合计', 'socialSecurityTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339100298, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:56', '2022-08-01 17:01:24', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599446244319233, '公积金个人合计', 'accumulationFundTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339063868, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:56', '2022-08-01 17:01:26', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458434280095745, '劳务收入', 'laborIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-06-17 09:01:56', '2022-08-01 16:55:45', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458558739300353, '劳务免税收入', 'laborTaxFreeIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-06-17 09:01:57', '2022-08-01 16:55:54', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459151591383041, '备注', 'description', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-06-17 09:01:57', '2022-06-17 09:01:57', 'string');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459464954929153, '所得项目', 'incomeItems', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-06-17 09:01:57', '2022-06-17 09:01:57', 'string');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704467747234045953, '劳务税减除费用', 'laborSubtraction', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340673739, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:57', '2022-08-01 17:03:47', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468391612751873, '劳务税应纳税所得额', 'laborTaxableIncome', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340916981, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:58', '2022-08-01 17:03:51', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468443048992769, '劳务税税率', 'laborTaxRate', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341397524, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:58', '2022-08-01 17:03:53', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468490269204481, '劳务税速算扣除数', 'laborQuickDeductionFactor', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341564390, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:58', '2022-08-01 17:03:54', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468528928063488, '劳务税应纳税额', 'laborTaxPayable', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341811881, '', 0, 1, 0, 0, 'all_teams', '2022-06-17 09:01:59', '2022-08-01 17:03:55', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (733975748932845568, '个税调差', 'taxAdjustment', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-06-17 09:01:59', '2022-06-17 09:01:59', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629570, '商业健康保险[劳务]', 'commercialHealthInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341909423, '', 0, 1, 0, 0, 'all_teams', '2022-07-21 14:00:00', '2022-08-01 17:00:38', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629571, '税延养老保险[劳务]', 'taxDeferredEndowmentInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341966905, '', 0, 1, 0, 0, 'all_teams', '2022-07-21 14:00:00', '2022-08-01 17:00:40', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629572, '其他[劳务]', 'other4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341993723, '', 0, 1, 0, 0, 'all_teams', '2022-07-21 14:00:00', '2022-08-01 17:00:41', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629573, '本月(次)准予扣除的捐赠额[劳务]', 'allowedDonation4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659342041963, '', 0, 1, 0, 0, 'all_teams', '2022-07-21 14:00:00', '2022-08-01 17:00:42', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629574, '备注[劳务]', 'description4', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-07-21 14:00:00', '2022-08-01 16:56:25', 'string');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629575, '已发薪资合计', 'issuedTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-07-28 17:26:52', '2022-08-01 16:59:28', 'number');
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629576, '补发薪资合计', 'ressueTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', '2022-07-28 17:26:52', '2022-08-01 16:59:40', 'number');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339063868, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.公积金个人合计}', 'welfare_fundPerSum', 92, 0, '2022-08-01 15:31:04', '2022-08-01 15:31:04');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339100298, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.社保个人合计}', 'welfare_socialPerSum', 92, 0, '2022-08-01 15:31:40', '2022-08-01 15:31:40');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340673739, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务收入}-{薪资项目.劳务免税收入}<=4000){800;}else{0.2*({薪资项目.劳务收入}-{薪资项目.劳务免税收入})}', 'if(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome<=4000){800;}else{0.2*(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome)}', 92, 0, '2022-08-01 15:57:54', '2022-08-01 15:57:54');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340916981, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.劳务收入}-{薪资项目.劳务免税收入}-{薪资项目.劳务税减除费用}', 'salaryItem_laborIncome-salaryItem_laborTaxFreeIncome-salaryItem_laborSubtraction', 92, 0, '2022-08-01 16:01:57', '2022-08-01 16:01:57');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341397524, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=20000){0.2;}else if({薪资项目.劳务税应纳税所得额}<=50000){0.3;}else{0.4;}', 'if(salaryItem_laborTaxableIncome<=20000){0.2;}else if(salaryItem_laborTaxableIncome<=50000){0.3;}else{0.4;}', 92, 0, '2022-08-01 16:09:57', '2022-08-01 16:09:57');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341564390, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=20000){0;}else if({薪资项目.劳务税应纳税所得额}<=50000){2000;}else{7000;}', 'if(salaryItem_laborTaxableIncome<=20000){0;}else if(salaryItem_laborTaxableIncome<=50000){2000;}else{7000;}', 92, 0, '2022-08-01 16:12:44', '2022-08-01 16:12:44');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341811881, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=0){0;}else{{薪资项目.劳务税应纳税所得额}*{薪资项目.劳务税税率}-{薪资项目.劳务税速算扣除数}}', 'if(salaryItem_laborTaxableIncome<=0){0;}else{salaryItem_laborTaxableIncome*salaryItem_laborTaxRate-salaryItem_laborQuickDeductionFactor}', 92, 0, '2022-08-01 16:16:52', '2022-08-01 16:16:52');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341909423, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.商业健康保险}', 'otherDeduction_businessHealthyInsurance', 92, 0, '2022-08-01 16:18:29', '2022-08-01 16:18:29');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341966905, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.税延养老保险}', 'otherDeduction_taxDelayEndowmentInsurance', 92, 0, '2022-08-01 16:19:27', '2022-08-01 16:19:27');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341993723, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.其他}', 'otherDeduction_otherDeduction', 92, 0, '2022-08-01 16:19:54', '2022-08-01 16:19:54');
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659342041963, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.准予扣除的捐赠额}', 'otherDeduction_deductionAllowedDonation', 92, 0, '2022-08-01 16:20:42', '2022-08-01 16:20:42');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339063886, '公积金个人合计', 1659339063868, 'welfare_fundPerSum', '{社保福利.公积金个人合计}', 'number', 'welfare', 1, 92, 0, '2022-08-01 15:31:04', '2022-08-01 15:31:04');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339100354, '社保个人合计', 1659339100298, 'welfare_socialPerSum', '{社保福利.社保个人合计}', 'number', 'welfare', 2, 92, 0, '2022-08-01 15:31:40', '2022-08-01 15:31:40');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673751, '劳务收入', 1659340673739, 'salaryItem_laborIncome', '{薪资项目.劳务收入}', 'number', 'salaryItem', 0, 92, 0, '2022-08-01 15:57:54', '2022-08-01 15:57:54');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673754, '劳务免税收入', 1659340673739, 'salaryItem_laborTaxFreeIncome', '{薪资项目.劳务免税收入}', 'number', 'salaryItem', 1, 92, 0, '2022-08-01 15:57:54', '2022-08-01 15:57:54');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917032, '劳务收入', 1659340916981, 'salaryItem_laborIncome', '{薪资项目.劳务收入}', 'number', 'salaryItem', 0, 92, 0, '2022-08-01 16:01:57', '2022-08-01 16:01:57');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917035, '劳务免税收入', 1659340916981, 'salaryItem_laborTaxFreeIncome', '{薪资项目.劳务免税收入}', 'number', 'salaryItem', 1, 92, 0, '2022-08-01 16:01:57', '2022-08-01 16:01:57');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917039, '劳务税减除费用', 1659340916981, 'salaryItem_laborSubtraction', '{薪资项目.劳务税减除费用}', 'number', 'salaryItem', 2, 92, 0, '2022-08-01 16:01:57', '2022-08-01 16:01:57');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341397539, '劳务税应纳税所得额', 1659341397524, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, '2022-08-01 16:09:57', '2022-08-01 16:09:57');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341564447, '劳务税应纳税所得额', 1659341564390, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, '2022-08-01 16:12:44', '2022-08-01 16:12:44');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811897, '劳务税应纳税所得额', 1659341811881, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, '2022-08-01 16:16:52', '2022-08-01 16:16:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811901, '劳务税税率', 1659341811881, 'salaryItem_laborTaxRate', '{薪资项目.劳务税税率}', 'number', 'salaryItem', 3, 92, 0, '2022-08-01 16:16:52', '2022-08-01 16:16:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811904, '劳务税速算扣除数', 1659341811881, 'salaryItem_laborQuickDeductionFactor', '{薪资项目.劳务税速算扣除数}', 'number', 'salaryItem', 4, 92, 0, '2022-08-01 16:16:52', '2022-08-01 16:16:52');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341909473, '商业健康保险', 1659341909423, 'otherDeduction_businessHealthyInsurance', '{其他免税扣除.商业健康保险}', 'number', 'otherDeduction', 0, 92, 0, '2022-08-01 16:18:29', '2022-08-01 16:18:29');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341966920, '税延养老保险', 1659341966905, 'otherDeduction_taxDelayEndowmentInsurance', '{其他免税扣除.税延养老保险}', 'number', 'otherDeduction', 0, 92, 0, '2022-08-01 16:19:27', '2022-08-01 16:19:27');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341993736, '其他', 1659341993723, 'otherDeduction_otherDeduction', '{其他免税扣除.其他}', 'number', 'otherDeduction', 0, 92, 0, '2022-08-01 16:19:54', '2022-08-01 16:19:54');
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659342041967, '准予扣除的捐赠额', 1659342041963, 'otherDeduction_deductionAllowedDonation', '{其他免税扣除.准予扣除的捐赠额}', 'number', 'otherDeduction', 0, 92, 0, '2022-08-01 16:20:42', '2022-08-01 16:20:42');

View File

@ -1,30 +0,0 @@
ICategoryPO hrsa_insurance_category
// hrsa_bill_inspect
// hrsa_bill_detail
// hrsa_social_archives
// hrsa_fund_archives
// hrsa_other_archives
hrsa_salary_item
hrsa_salary_sob_item_group
hrsa_sob_default_item_group
TaxDeclarationDetailPO
hrsa_attend_quote_data
hrsa_salary_archive
hrsa_tax_declaration
hrsa_tax_declaration_detail
HRSA_FORMULA
HRSA_FORMULA_VAR
hrsa_salary_send
hrsa_salary_send_info
HRSA_SYS_SALARY_ITEM
HRSA_SOB_DEFAULT_EMP_FIELD
hrsa_salary_sob_default_item

View File

@ -1 +0,0 @@
UPDATE hrsa_salary_sob_item set delete_type = 1 where id in (select * from hrsa_salary_sob_item where delete_type =0 and salary_item_id not in (select id from hrsa_salary_item where delete_type =0))

View File

@ -1,19 +0,0 @@
ALTER TABLE hrsa_tax_declaration ADD COLUMN income_category int(255) NOT NULL COMMENT '薪资类型。1正常工资薪金所得、4劳务所得' ;
ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int(255) NOT NULL ;
ALTER TABLE hrsa_tax_declaration ADD income_category int NULL
GO
ALTER TABLE hrsa_tax_declaration_detail ADD employee_type int NULL
GO
ALTER TABLE hrsa_tax_declaration add (
income_category number
)
/
ALTER TABLE hrsa_tax_declaration_detail add (
employee_type number
)
/

View File

@ -1,167 +0,0 @@
delete from hrsa_acct_result_temp where 1=1
;
delete from hrsa_add_up_deduction where 1=1
;
delete from hrsa_add_up_situation where 1=1
;
delete from hrsa_attend_quote where 1=1
;
delete from hrsa_attend_quote_data where 1=1
;
delete from hrsa_attend_quote_data_value where 1=1
;
delete from hrsa_attend_quote_field where 1=1
;
delete from hrsa_attend_quote_sync_set where 1=1
;
delete from hrsa_scheme_detail where 1=1
;
delete from hrsa_social_archives where 1=1
;
delete from hrsa_fund_archives where 1=1
;
delete from hrsa_other_archives where 1=1
;
delete from hrsa_bill_batch where 1=1
;
delete from hrsa_bill_detail where 1=1
;
delete from hrsa_bill_detail_temp where 1=1
;
delete from hrsa_bill_inspect where 1=1
;
delete from hrsa_insurance_category where 1=1
;
delete from hrsa_check_result where 1=1
;
delete from hrsa_check_result_record where 1=1
;
delete from hrsa_ck_result_detail_temp where 1=1
;
delete from hrsa_excel_acct_result where 1=1
;
delete from hrsa_other_deduction where 1=1
;
delete from hrsa_salary_acct_emp where 1=1
;
delete from hrsa_salary_acct_record where 1=1
;
delete from hrsa_salary_acct_result where 1=1
;
delete from hrsa_salary_archive where 1=1
;
delete from hrsa_salary_archive_dimission where 1=1
;
delete from hrsa_salary_archive_item where 1=1
;
delete from hrsa_salary_archive_tax_agent where 1=1
;
delete from hrsa_salary_item where 1=1
;
delete from hrsa_salary_send where 1=1
;
delete from hrsa_salary_send_info where 1=1
;
delete from hrsa_salary_sob where 1=1
;
delete from hrsa_salary_sob_adjust_rule where 1=1
;
delete from hrsa_salary_sob_emp_field where 1=1
;
delete from hrsa_salary_sob_item where 1=1
;
delete from hrsa_salary_sob_item_group where 1=1
;
delete from hrsa_salary_sob_range where 1=1
;
delete from hrsa_salary_template where 1=1
;
delete from hrsa_social_security_scheme where 1=1
;
delete from hrsa_sys_tax_rate_base where 1=1
;
delete from hrsa_sys_tax_rate_detail where 1=1
;
delete from hrsa_tax_agent where 1=1
;
delete from hrsa_tax_agent_emp where 1=1
;
delete from hrsa_tax_agent_emp_change where 1=1
;
delete from hrsa_tax_agent_admin where 1=1
;
delete from hrsa_tax_agent_manage_range where 1=1
;
delete from hrsa_tax_agent_base where 1=1
;
delete from hrsa_tax_agent_sub_admin where 1=1
;
delete from hrsa_tax_agent_sub_admin_emp where 1=1
;
delete from hrsa_tax_declaration where 1=1
;
delete from hrsa_tax_declaration_detail where 1=1
;
delete from hrsa_tax_rate_base where 1=1
;
delete from hrsa_tax_rate_detail where 1=1
;
delete from hrsa_salary_acct_result_report where 1=1
;
delete from hrsa_insurance_base_info where 1=1
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9001, '养老保险', 1, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9002, '医疗保险', 1, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9003, '工伤保险', 1, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9004, '失业保险', 1, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9005, '生育保险', 1, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9006, '住房公积金', 2, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9007, '企业年金', 3, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9008, '补充住房公积金', 2, 1, '1,2', 1, '2022-02-22 10:46:02', '2022-02-22 10:46:02', 0, 0, 'all_teams')
;
INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 0, '2022-05-23 18:58:53', '2022-05-23 19:12:12', 1, 0, 'all_teams');
---oracle
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9001, '养老保险', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9002, '医疗保险', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9003, '工伤保险', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9004, '失业保险', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9005, '生育保险', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9006, '住房公积金', 2, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9007, '企业年金', 3, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9008, '补充住房公积金', 2, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams')
;
INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 1, 0, 'all_teams');

View File

@ -1,23 +0,0 @@
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655976865885, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.累计子女教育}+{薪资项目.累计住房贷款利息}+{薪资项目.累计住房租金}+{薪资项目.累计继续教育}+{薪资项目.累计赡养老人}+{薪资项目.累计大病医疗}+{薪资项目.累计婴幼儿照护}', 'salaryItem_addUpChildEducation+salaryItem_addUpHousingLoanInterest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly+salaryItem_addUpIllnessMedical+salaryItem_addUpInfantCare', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865909, '累计赡养老人', 1655976865885, 'salaryItem_addUpSupportElderly', '{薪资项目.累计赡养老人}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865913, '累计继续教育', 1655976865885, 'salaryItem_addUpContinuingEducation', '{薪资项目.累计继续教育}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865917, '累计住房租金', 1655976865885, 'salaryItem_addUpHousingRent', '{薪资项目.累计住房租金}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865921, '累计住房贷款利息', 1655976865885, 'salaryItem_addUpHousingLoanInterest', '{薪资项目.累计住房贷款利息}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865924, '累计子女教育', 1655976865885, 'salaryItem_addUpChildEducation', '{薪资项目.累计子女教育}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865929, '累计大病医疗', 1655976865885, 'salaryItem_addUpIllnessMedical', '{薪资项目.累计大病医疗}', 'number', 'salaryItem', 5, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865933, '累计婴幼儿照护', 1655976865885, 'salaryItem_addUpInfantCare', '{薪资项目.累计婴幼儿照护}', 'number', 'salaryItem', 6, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'))
/
update hrsa_sys_salary_item set formula_id = 1655976865885 where id = 674853617092214804
/
update hrsa_salary_item set formula_id = 1655976865885 where sys_salary_item_id = 674853617092214804
/

View File

@ -0,0 +1,455 @@
delete from HtmlLabelIndex where id = 537997 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 537997,'薪酬管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537997 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537997 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'薪酬管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537997 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'Salary management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537997 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'薪酬管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 537998 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 537998,'我的薪资福利' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537998 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537998 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'我的薪资福利' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537998 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'My salary and benefits' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537998 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'我的薪資福利' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 537996 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 537996,'个税扣缴义务人' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537996 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537996 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'个税扣缴义务人' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537996 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'Individual income tax withholding agent' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537996 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'個稅扣繳義務人' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 537999 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 537999,'社保福利' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537999 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537999 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'社保福利' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537999 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'Social security benefits' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 537999 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'社保福利' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538000 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538000,'社保福利方案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538000 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538000 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'社保福利方案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538000 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'Social security welfare scheme' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538000 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'社保福利方案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538001 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538001,'社保福利档案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538001 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538001 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'社保福利档案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538001 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'Social security benefit file' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538001 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'社保福利檔案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538002 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538002,'社保福利台账' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538002 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538002 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'社保福利台账' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538002 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'Social security benefit account' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538002 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'社保福利台賬' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538003 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538003,'薪资项目管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538003 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538003 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'薪资项目管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538003 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'Salary item management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538003 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'薪資項目管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538004 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538004,'薪资档案' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538004 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538004 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'薪资档案' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538004 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'Salary file' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538004 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'薪資檔案' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538005 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538005,'数据采集' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538005 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538005 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'数据采集' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538005 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'data acquisition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538005 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'數據採集' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538006 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538006,'累计专项附加扣除' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538006 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538006 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'累计专项附加扣除' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538006 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'Accumulated special additional deduction' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538006 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'累計專項附加扣除' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538007 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538007,'其他免税扣除' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538007 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538007 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'其他免税扣除' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538007 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'Other tax exempt deductions' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538007 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'其他免稅扣除' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538008 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538008,'往期累计情况' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538008 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538008 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'往期累计情况' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538008 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'Cumulative situation in previous periods' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538008 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'往期累計情況' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538009 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538009,'考勤引用' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538009 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538009 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'考勤引用' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538009 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'Attendance reference' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538009 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'考勤引用' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538010 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538010,'薪资账套' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538010 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538010 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'薪资账套' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538010 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'Salary a / C set' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538010 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'薪資賬套' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538011 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538011,'薪资核算' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538011 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538011 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'薪资核算' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538011 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'Salary accounting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538011 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'薪資核算' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538012 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538012,'工资单发放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538012 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538012 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'工资单发放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538012 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'Payroll payment' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538012 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'工資單發放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538013 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538013,'个税申报表' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538013 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538013 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'个税申报表' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538013 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'Individual income tax return' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538013 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'個稅申報表' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 538014 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 538014,'个税税率表' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538014 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538014 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'个税税率表' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538014 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'Individual income tax rate table' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 538014 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'個稅稅率表' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,269 @@
Delete from LeftMenuInfo where id=100118;
/
Delete from LeftMenuConfig where infoid=100118;
/
call LMConfig_U_ByInfoInsert (1,0,-1);
/
call LMInfo_Insert (100118,537997,NULL,NULL,1,0,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100118;
/
Delete from LeftMenuInfo where id=100132;
/
Delete from LeftMenuConfig where infoid=100132;
/
call LMConfig_U_ByInfoInsert (2,100118,5);
/
call LMInfo_Insert (100132,538011,'','',2,100118,5,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/calculate' where id = 100132;
/
Delete from LeftMenuInfo where id=100125;
/
Delete from LeftMenuConfig where infoid=100125;
/
call LMConfig_U_ByInfoInsert (2,100118,2);
/
call LMInfo_Insert (100125,538004,'','',2,100118,2,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryFile' where id = 100125;
/
Delete from LeftMenuInfo where id=100130;
/
Delete from LeftMenuConfig where infoid=100130;
/
call LMConfig_U_ByInfoInsert (2,100126,0);
/
call LMInfo_Insert (100130,538009,'','',2,100126,0,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/attendance' where id = 100130;
/
Delete from LeftMenuInfo where id=100129;
/
Delete from LeftMenuConfig where infoid=100129;
/
call LMConfig_U_ByInfoInsert (2,100126,0);
/
call LMInfo_Insert (100129,538008,'','',2,100126,0,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/cumSituation' where id = 100129;
/
Delete from LeftMenuInfo where id=100120;
/
Delete from LeftMenuConfig where infoid=100120;
/
call LMConfig_U_ByInfoInsert (2,100118,0);
/
call LMInfo_Insert (100120,537999,'','',2,100118,0,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100120;
/
Delete from LeftMenuInfo where id=100123;
/
Delete from LeftMenuConfig where infoid=100123;
/
call LMConfig_U_ByInfoInsert (2,100120,1);
/
call LMInfo_Insert (100123,538002,'','',2,100120,1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBook' where id = 100123;
/
Delete from LeftMenuInfo where id=100122;
/
Delete from LeftMenuConfig where infoid=100122;
/
call LMConfig_U_ByInfoInsert (2,100120,0);
/
call LMInfo_Insert (100122,538001,'','',2,100120,0,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/archives' where id = 100122;
/
Delete from LeftMenuInfo where id=100135;
/
Delete from LeftMenuConfig where infoid=100135;
/
call LMConfig_U_ByInfoInsert (2,100118,8);
/
call LMInfo_Insert (100135,537996,'','',2,100118,8,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/taxAgent' where id = 100135;
/
Delete from LeftMenuInfo where id=100121;
/
Delete from LeftMenuConfig where infoid=100121;
/
call LMConfig_U_ByInfoInsert (2,100120,-1);
/
call LMInfo_Insert (100121,538000,'','',2,100120,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/programme' where id = 100121;
/
Delete from LeftMenuInfo where id=100126;
/
Delete from LeftMenuConfig where infoid=100126;
/
call LMConfig_U_ByInfoInsert (2,100118,3);
/
call LMInfo_Insert (100126,538005,'','',2,100118,3,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100126;
/
Delete from LeftMenuInfo where id=100127;
/
Delete from LeftMenuConfig where infoid=100127;
/
call LMConfig_U_ByInfoInsert (2,100126,-1);
/
call LMInfo_Insert (100127,538006,'','',2,100126,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/cumDeduct' where id = 100127;
/
Delete from LeftMenuInfo where id=100133;
/
Delete from LeftMenuConfig where infoid=100133;
/
call LMConfig_U_ByInfoInsert (2,100118,6);
/
call LMInfo_Insert (100133,538012,'','',2,100118,6,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/payroll' where id = 100133;
/
Delete from LeftMenuInfo where id=100128;
/
Delete from LeftMenuConfig where infoid=100128;
/
call LMConfig_U_ByInfoInsert (2,100126,0);
/
call LMInfo_Insert (100128,538007,'','',2,100126,0,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/otherDeduct' where id = 100128;
/
Delete from LeftMenuInfo where id=100119;
/
Delete from LeftMenuConfig where infoid=100119;
/
call LMConfig_U_ByInfoInsert (2,100118,-1);
/
call LMInfo_Insert (100119,537998,'','',2,100118,-1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/mySalary' where id = 100119;
/
Delete from LeftMenuInfo where id=100131;
/
Delete from LeftMenuConfig where infoid=100131;
/
call LMConfig_U_ByInfoInsert (2,100118,4);
/
call LMInfo_Insert (100131,538010,'','',2,100118,4,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/ledger' where id = 100131;
/
Delete from LeftMenuInfo where id=100124;
/
Delete from LeftMenuConfig where infoid=100124;
/
call LMConfig_U_ByInfoInsert (2,100118,1);
/
call LMInfo_Insert (100124,538003,'','',2,100118,1,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryItem' where id = 100124;
/
Delete from LeftMenuInfo where id=100134;
/
Delete from LeftMenuConfig where infoid=100134;
/
call LMConfig_U_ByInfoInsert (2,100118,7);
/
call LMInfo_Insert (100134,538013,'','',2,100118,7,2);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/declare' where id = 100134;
/

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,12 @@
ALTER TABLE hrsa_add_up_situation ADD (
add_up_illness_medical varchar2(255) NULL ,
add_up_tax_savings varchar2(255) NULL ,
add_up_infant_care varchar2(255) NULL
);
/
ALTER TABLE hrsa_add_up_deduction add (
add_up_illness_medical varchar2(255) NULL,
add_up_infant_care varchar2(255) NULL
);
/

View File

@ -0,0 +1,47 @@
INSERT INTO hrsa_formula (id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1653993466778, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房贷款利息}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993466787, '累计住房贷款利息', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{累计专项附加扣除.累计住房贷款利息}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993837931, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计住房租金}', 'addUpDeductions_addUpHousingRent', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993837947, '累计住房租金', 1653993837931, 'addUpDeductions_addUpHousingRent', '{累计专项附加扣除.累计住房租金}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993954233, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计继续教育}', 'addUpDeductions_addUpContinuingEducation', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993954257, '累计继续教育', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{累计专项附加扣除.累计继续教育}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653994061764, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计赡养老人}', 'addUpDeductions_addUpSupportElderly', 1, 0,to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'),to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653994061780, '累计赡养老人', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{累计专项附加扣除.累计赡养老人}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800;
/
update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801;
/
update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802;
/
update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803;
/
update hrsa_salary_item set formula_id = 1653993466778 where sys_salary_item_id = 674853617092214800;
/
update hrsa_salary_item set formula_id = 1653993837931 where sys_salary_item_id = 674853617092214801;
/
update hrsa_salary_item set formula_id = 1653993954233 where sys_salary_item_id = 674853617092214802;
/
update hrsa_salary_item set formula_id = 1653994061764 where sys_salary_item_id = 674853617092214803;
/

View File

@ -0,0 +1,131 @@
CREATE TABLE hrsa_tax_agent_emp
(
id NUMBER(38,0) primary key NOT NULL,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT 0,
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT '',
tax_agent_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
employee_name varchar2(255)
);
/
CREATE TABLE hrsa_tax_agent_emp_change
(
id NUMBER(38,0) primary key NOT NULL,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT 0,
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT '',
tax_agent_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
change_type number DEFAULT 0 ,
employee_name varchar2(255) DEFAULT NULL,
module_type NUMBER(4,0) DEFAULT 0
);
/
CREATE TABLE hrsa_tax_agent_admin
(
id NUMBER(38,0) primary key NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT 0,
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT ''
);
/
CREATE TABLE hrsa_tax_agent_manage_range
(
id NUMBER(38,0) primary key NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) DEFAULT 0,
tax_agent_sub_admin_id NUMBER(38,0) DEFAULT 0,
target_type number DEFAULT 1,
target_id NUMBER(38,0) NOT NULL,
employee_status varchar2(100) NOT NULL,
include_type number DEFAULT 1,
creator NUMBER(38,0) DEFAULT '0',
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT '',
range_type number DEFAULT 0
);
/
CREATE TABLE hrsa_tax_agent_base
(
id NUMBER(38,0) primary key NOT NULL,
devolution_status NUMBER(11,0) DEFAULT 0 ,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT '0',
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT ''
);
/
CREATE TABLE hrsa_tax_agent_sub_admin
(
id NUMBER(38,0) primary key NOT NULL,
tax_agent_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
description varchar2(100) ,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT '0',
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT '',
remark clob
);
/
CREATE TABLE hrsa_tax_agent_sub_admin_emp
(
id NUMBER(38,0) primary key NOT NULL,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) DEFAULT '0',
delete_type number DEFAULT 0 ,
tenant_key varchar2(10) DEFAULT '',
tax_agent_id NUMBER(38,0) NOT NULL,
tax_agent_sub_admin_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
employee_name varchar2(255)
);
/
ALTER TABLE hrsa_tax_agent add (
payment_agency varchar2(255)
);
/
ALTER TABLE hrsa_salary_sob add (
tax_agent_id NUMBER(38,0)
);
/
INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 1, 0, 'all_teams');
/
ALTER TABLE hrsa_bill_detail_temp add (
payment_organization NUMBER(38,0)
);
/
ALTER TABLE hrsa_bill_detail add (
payment_organization NUMBER(38,0)
);
/
ALTER TABLE hrsa_bill_batch add (
payment_organization NUMBER(38,0)
);
/

View File

@ -0,0 +1,9 @@
ALTER TABLE hrsa_tax_declaration add (
income_category number
);
/
ALTER TABLE hrsa_tax_declaration_detail add (
employee_type number
);
/

View File

@ -0,0 +1,44 @@
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (705641858303836162, '累计婴幼儿照护', 'addUpInfantCare', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655196897860, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703419929857687552, '当前累计免税收入', 'addUpTaxFreeIncome', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655197296054, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (705641858303836161, '累计大病医疗', 'addUpIllnessMedical', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655197430967, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655196897860, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计婴幼儿照护}', 'addUpDeductions_addUpInfantCare', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655197296054, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.本月(次)免税收入}+{往期累计情况.累计免税收入}', 'salaryItem_taxFreeIncome+addUpSituation_addUpTaxExemptIncome', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655197430967, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{累计专项附加扣除.累计大病医疗}', 'addUpDeductions_addUpIllnessMedical', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655196897869, '累计婴幼儿照护', 1655196897860, 'addUpDeductions_addUpInfantCare', '{累计专项附加扣除.累计婴幼儿照护}', 'number', 'addUpDeductions', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197296059, '本月(次)免税收入', 1655197296054, 'salaryItem_taxFreeIncome', '{薪资项目.本月(次)免税收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197296063, '累计免税收入', 1655197296054, 'addUpSituation_addUpTaxExemptIncome', '{往期累计情况.累计免税收入}', 'number', 'addUpSituation', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197430986, '累计大病医疗', 1655197430967, 'addUpDeductions_addUpIllnessMedical', '{累计专项附加扣除.累计大病医疗}', 'number', 'addUpDeductions', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (728615865977528321, 1, 705641858303836162, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 7);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845569, 1, 674853617092214787, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 8);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845572, 1, 674853617092214788, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 9);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845578, 1, 674853617092214789, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 10);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845567, 1, 733975748932845568, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 11);
/

View File

@ -0,0 +1,41 @@
delete from SystemRightDetail where rightid =2693;
/
delete from SystemRightsLanguage where id =2693;
/
delete from SystemRights where id =2693;
/
delete from SystemRightToGroup where rightid =2693;
/
delete from SystemRightType where id =36;
/
delete from SystemRightGroups where id =-22;
/
insert into SystemRights (id,rightdesc,righttype,detachable) values (2693,'薪酬管理权限','36',0);
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,8,'Salary management authority','Salary management authority');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,9,'薪酬管理權限','薪酬管理權限');
/
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,7,'薪酬管理权限','薪酬管理权限');
/
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43969,'薪酬总管理员','Salary:Chief',2693);
/
insert into SystemRightToGroup(rightid,groupid) values (2693,-22);
/
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-22,'SALARY','薪酬管理权限组','薪酬管理');
/
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (36,'薪酬管理','薪酬管理');
/

View File

@ -0,0 +1,29 @@
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655976865885, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.累计子女教育}+{薪资项目.累计住房贷款利息}+{薪资项目.累计住房租金}+{薪资项目.累计继续教育}+{薪资项目.累计赡养老人}+{薪资项目.累计大病医疗}+{薪资项目.累计婴幼儿照护}', 'salaryItem_addUpChildEducation+salaryItem_addUpHousingLoanInterest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly+salaryItem_addUpIllnessMedical+salaryItem_addUpInfantCare', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865909, '累计赡养老人', 1655976865885, 'salaryItem_addUpSupportElderly', '{薪资项目.累计赡养老人}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865913, '累计继续教育', 1655976865885, 'salaryItem_addUpContinuingEducation', '{薪资项目.累计继续教育}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865917, '累计住房租金', 1655976865885, 'salaryItem_addUpHousingRent', '{薪资项目.累计住房租金}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865921, '累计住房贷款利息', 1655976865885, 'salaryItem_addUpHousingLoanInterest', '{薪资项目.累计住房贷款利息}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865924, '累计子女教育', 1655976865885, 'salaryItem_addUpChildEducation', '{薪资项目.累计子女教育}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865929, '累计大病医疗', 1655976865885, 'salaryItem_addUpIllnessMedical', '{薪资项目.累计大病医疗}', 'number', 'salaryItem', 5, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865933, '累计婴幼儿照护', 1655976865885, 'salaryItem_addUpInfantCare', '{薪资项目.累计婴幼儿照护}', 'number', 'salaryItem', 6, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
update hrsa_sys_salary_item set formula_id = 1655976865885 where id = 674853617092214804;
/
update hrsa_salary_item set formula_id = 1655976865885 where sys_salary_item_id = 674853617092214804;
/

View File

@ -0,0 +1,22 @@
CREATE TABLE hrsa_salary_acct_result_report
(
id NUMBER(38,0) PRIMARY KEY NOT NULL,
salary_sob_id NUMBER(38,0) DEFAULT 0,
salary_acct_emp_id varchar2(200) DEFAULT '',
salary_acct_record_id NUMBER(38,0) DEFAULT 0,
employee_id varchar2(200) DEFAULT '',
tax_agent_id NUMBER(38,0) DEFAULT 0,
salary_item_id NUMBER(38,0) DEFAULT 0,
result_value varchar2(1000) DEFAULT '',
creator NUMBER(38,0) DEFAULT 0,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
delete_type number DEFAULT 0,
tenant_key varchar2(10) DEFAULT '',
department_id NUMBER(38,0) DEFAULT 0,
subcompany_id NUMBER(38,0) DEFAULT 0,
costcenter_id NUMBER(38,0) DEFAULT 0,
jobtitle_id NUMBER(38,0) DEFAULT 0,
location_id NUMBER(38,0) DEFAULT 0
);
/

View File

@ -0,0 +1,14 @@
CREATE TABLE hrsa_salary_sys_conf
(
id NUMBER(38,0) primary key NOT NULL,
conf_key varchar2(200) NOT NULL ,
conf_value varchar2(500) NOT NULL,
title varchar2(200) ,
module varchar2(200) ,
order_weight number ,
description varchar2(200) ,
delete_type number DEFAULT 0 ,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate
);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_salary_archive ADD (
tax_agent_id NUMBER(38,0) NULL ,
pay_start_date date NULL ,
pay_end_date date NULL
);
/

View File

@ -0,0 +1,137 @@
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599184238075904, '社保个人合计', 'socialSecurityTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339100298, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599446244319233, '公积金个人合计', 'accumulationFundTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339063868, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458434280095745, '劳务收入', 'laborIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458558739300353, '劳务免税收入', 'laborTaxFreeIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459151591383041, '备注', 'description', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459464954929153, '所得项目', 'incomeItems', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704467747234045953, '劳务税减除费用', 'laborSubtraction', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340673739, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468391612751873, '劳务税应纳税所得额', 'laborTaxableIncome', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340916981, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468443048992769, '劳务税税率', 'laborTaxRate', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341397524, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468490269204481, '劳务税速算扣除数', 'laborQuickDeductionFactor', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341564390, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468528928063488, '劳务税应纳税额', 'laborTaxPayable', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341811881, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (733975748932845568, '个税调差', 'taxAdjustment', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629570, '商业健康保险劳务', 'commercialHealthInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341909423, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629571, '税延养老保险劳务', 'taxDeferredEndowmentInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341966905, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629572, '其他劳务', 'other4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341993723, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629573, '本月(次)准予扣除的捐赠额劳务', 'allowedDonation4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659342041963, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629574, '备注劳务', 'description4', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629575, '已发薪资合计', 'issuedTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629576, '补发薪资合计', 'ressueTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339063868, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.公积金个人合计}', 'welfare_fundPerSum', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339100298, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{社保福利.社保个人合计}', 'welfare_socialPerSum', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340673739, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务收入}-{薪资项目.劳务免税收入}<=4000){800/}else{0.2*({薪资项目.劳务收入}-{薪资项目.劳务免税收入})}', 'if(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome<=4000){800/}else{0.2*(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome)}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340916981, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{薪资项目.劳务收入}-{薪资项目.劳务免税收入}-{薪资项目.劳务税减除费用}', 'salaryItem_laborIncome-salaryItem_laborTaxFreeIncome-salaryItem_laborSubtraction', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341397524, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=20000){0.2/}else if({薪资项目.劳务税应纳税所得额}<=50000){0.3/}else{0.4/}', 'if(salaryItem_laborTaxableIncome<=20000){0.2/}else if(salaryItem_laborTaxableIncome<=50000){0.3/}else{0.4/}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341564390, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=20000){0/}else if({薪资项目.劳务税应纳税所得额}<=50000){2000/}else{7000/}', 'if(salaryItem_laborTaxableIncome<=20000){0/}else if(salaryItem_laborTaxableIncome<=50000){2000/}else{7000/}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341811881, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({薪资项目.劳务税应纳税所得额}<=0){0/}else{{薪资项目.劳务税应纳税所得额}*{薪资项目.劳务税税率}-{薪资项目.劳务税速算扣除数}}', 'if(salaryItem_laborTaxableIncome<=0){0/}else{salaryItem_laborTaxableIncome*salaryItem_laborTaxRate-salaryItem_laborQuickDeductionFactor}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341909423, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.商业健康保险}', 'otherDeduction_businessHealthyInsurance', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341966905, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.税延养老保险}', 'otherDeduction_taxDelayEndowmentInsurance', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341993723, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.其他}', 'otherDeduction_otherDeduction', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659342041963, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{其他免税扣除.准予扣除的捐赠额}', 'otherDeduction_deductionAllowedDonation', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339063886, '公积金个人合计', 1659339063868, 'welfare_fundPerSum', '{社保福利.公积金个人合计}', 'number', 'welfare', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339100354, '社保个人合计', 1659339100298, 'welfare_socialPerSum', '{社保福利.社保个人合计}', 'number', 'welfare', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673751, '劳务收入', 1659340673739, 'salaryItem_laborIncome', '{薪资项目.劳务收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673754, '劳务免税收入', 1659340673739, 'salaryItem_laborTaxFreeIncome', '{薪资项目.劳务免税收入}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917032, '劳务收入', 1659340916981, 'salaryItem_laborIncome', '{薪资项目.劳务收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917035, '劳务免税收入', 1659340916981, 'salaryItem_laborTaxFreeIncome', '{薪资项目.劳务免税收入}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917039, '劳务税减除费用', 1659340916981, 'salaryItem_laborSubtraction', '{薪资项目.劳务税减除费用}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341397539, '劳务税应纳税所得额', 1659341397524, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341564447, '劳务税应纳税所得额', 1659341564390, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811897, '劳务税应纳税所得额', 1659341811881, 'salaryItem_laborTaxableIncome', '{薪资项目.劳务税应纳税所得额}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811901, '劳务税税率', 1659341811881, 'salaryItem_laborTaxRate', '{薪资项目.劳务税税率}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811904, '劳务税速算扣除数', 1659341811881, 'salaryItem_laborQuickDeductionFactor', '{薪资项目.劳务税速算扣除数}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341909473, '商业健康保险', 1659341909423, 'otherDeduction_businessHealthyInsurance', '{其他免税扣除.商业健康保险}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341966920, '税延养老保险', 1659341966905, 'otherDeduction_taxDelayEndowmentInsurance', '{其他免税扣除.税延养老保险}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341993736, '其他', 1659341993723, 'otherDeduction_otherDeduction', '{其他免税扣除.其他}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659342041967, '准予扣除的捐赠额', 1659342041963, 'otherDeduction_deductionAllowedDonation', '{其他免税扣除.准予扣除的捐赠额}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/

View File

@ -0,0 +1,53 @@
Alter table hrsa_bill_detail modify social_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail modify fund_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail modify other_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail modify social_per_json varchar2(4000);
/
Alter table hrsa_bill_detail modify fund_per_json varchar2(4000);
/
Alter table hrsa_bill_detail modify other_per_json varchar2(4000);
/
Alter table hrsa_bill_detail modify social_com_json varchar2(4000);
/
Alter table hrsa_bill_detail modify fund_com_json varchar2(4000);
/
Alter table hrsa_bill_detail modify other_com_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify social_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify fund_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify other_payment_base_string varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify social_per_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify fund_per_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify other_per_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify social_com_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify fund_com_json varchar2(4000);
/
Alter table hrsa_bill_detail_temp modify other_com_json varchar2(4000);
/

View File

@ -0,0 +1,5 @@
ALTER TABLE hrsa_social_security_scheme ADD (
shared_type varchar2(255) NULL ,
tax_agent_ids varchar2(500) NULL
);
/

View File

@ -0,0 +1,16 @@
CREATE TABLE HRSA_SALARY_ITEM_HIDE (
ID NUMBER(38,0) NOT NULL,
SALARY_SOB_ID NUMBER(38,0) NOT NULL,
SALARY_ITEM_ID NUMBER(38,0) NOT NULL,
IS_GROUP NUMBER NOT NULL,
ITEM_HIDE NUMBER(38,0) DEFAULT 0,
CREATOR NUMBER(38,0) NOT NULL,
DELETE_TYPE NUMBER DEFAULT 0 NOT NULL,
TENANT_KEY VARCHAR2(255 BYTE) NOT NULL,
CREATE_TIME DATE DEFAULT sysdate NOT NULL,
UPDATE_TIME DATE DEFAULT sysdate
);
/
ALTER TABLE HRSA_SALARY_ITEM_HIDE ADD CONSTRAINT SYS_C0024450 PRIMARY KEY ("ID");
/

View File

@ -0,0 +1,94 @@
CREATE TABLE hrsa_excel_bill_detail (
id NUMBER(20,0) NOT NULL,
employee_id NUMBER(20,0) NOT NULL,
bill_month VARCHAR2(30) NOT NULL,
bill_status NUMBER(11,0) NOT NULL,
payment_status NUMBER(11,0) NOT NULL,
supplementary_month VARCHAR2(50) NULL,
supplementary_projects VARCHAR2(50) NULL,
resource_from NUMBER(11,0) NOT NULL,
social_pay_org NUMBER(11,0) NULL,
social_account VARCHAR2(50) NULL,
social_scheme_id NUMBER(20,0) NULL,
social_payment_base_string CLOB NULL,
fund_pay_org NUMBER(11,0) NULL,
fund_account VARCHAR2(50) NULL,
supplement_fund_account VARCHAR2(50) NULL,
fund_scheme_id NUMBER(11,0) NULL,
fund_payment_base_string CLOB NULL,
other_pay_org NUMBER(11,0) NULL,
other_scheme_id NUMBER(20,0) NULL,
other_payment_base_string CLOB NULL,
social_per_json CLOB NULL,
social_per_sum CLOB NULL,
fund_per_json CLOB NULL,
fund_per_sum CLOB NULL,
other_per_json CLOB NULL,
other_per_sum CLOB NULL,
per_sum CLOB NULL,
social_com_json CLOB NULL,
social_com_sum CLOB NULL,
fund_com_json CLOB NULL,
fund_com_sum CLOB NULL,
other_com_json CLOB NULL,
other_com_sum CLOB NULL,
com_sum CLOB NULL,
social_sum CLOB NULL,
fund_sum CLOB NULL,
other_sum CLOB NULL,
total CLOB NULL,
creator NUMBER(20,0) NOT NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
delete_type NUMBER(11,0) NOT NULL,
tenant_key VARCHAR2(255 BYTE),
payment_organization NUMBER(20,0) NULL,
PRIMARY KEY ( id )
);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_salary_archive ADD (
run_status varchar2(255) NULL ,
add_type varchar2(255) NULL ,
stop_type varchar2(255) NULL
);
/

View File

@ -0,0 +1,30 @@
CREATE TABLE hrsa_insurance_base_info (
id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
payment_organization NUMBER(11,0) NULL,
social_archives_id NUMBER(38,0) NULL,
fund_archives_id NUMBER(38,0) NULL,
other_archives_id NUMBER(38,0) NULL,
tenant_key VARCHAR2(255 BYTE) NOT NULL,
creator NUMBER(11,0) NOT NULL,
delete_type NUMBER(11,0) NOT NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
run_status VARCHAR2(20 BYTE) NOT NULL,
PRIMARY KEY ( id )
);
/

View File

@ -0,0 +1,2 @@
ALTER TABLE hrsa_salary_sob_range ADD employee_statuses VARCHAR(255);
/

View File

@ -0,0 +1,41 @@
create table hrsa_special_add_deduction
(
id NUMBER(38, 0) primary key,
employee_id NUMBER(38, 0) not null,
tax_agent_id NUMBER(38, 0) not null,
children_education varchar2(255) default '' ,
continuing_education varchar2(255) default '' ,
housing_loan_interest varchar2(255) default '' ,
housing_rent varchar2(255) default '',
supporting_elder varchar2(255) default '' ,
serious_illness_treatment varchar2(255) default '' ,
infant_care varchar2(255) default '',
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
creator NUMBER(38, 0),
delete_type NUMBER(11, 0) default 0 ,
tenant_key varchar2(10) default ''
);
/
create sequence hrsa_special_a_d_id
start with 1
increment by 1
nomaxvalue
nocycle
nocache;
/
CREATE TRIGGER hrsa_spec_add_dct_trigger
before INSERT ON hrsa_special_add_deduction FOR each ROW WHEN (new.id IS NULL)
BEGIN
SELECT hrsa_special_a_d_id.nextval into:New.id from dual;
END;
/
CREATE TRIGGER hrsa_spec_add_dct_time_trigger
before UPDATE ON hrsa_special_add_deduction FOR each ROW WHEN (new.update_time IS NOT NULL)
BEGIN
SELECT sysdate into:new.update_time from dual;
END;
/

View File

@ -0,0 +1,119 @@
delete from HtmlLabelIndex where id = 539971 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 539971,'规则设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539971 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539971 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'规则设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539971 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'Rule Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539971 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'規則設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 539971 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539971) ;
/
delete from HtmlLabelIndex where id = 539970 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 539970,'应用设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539970 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539970 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'应用设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539970 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'Apply Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539970 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'應用設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 539970 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539970) ;
/
delete from HtmlLabelIndex where id = 539968 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 539968,'设置' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539968 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539968 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'设置' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539968 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'set up' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539968 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'設置' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 539968 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539968) ;
/
delete from HtmlLabelIndex where id = 539967 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 539967,'专项附加扣除' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539967 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539967 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'专项附加扣除' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539967 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'Special additional deduction' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 539967 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'專項附加扣除' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 539967 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539967) ;
/

View File

@ -0,0 +1,59 @@
Delete from LeftMenuInfo where id=100183;
/
Delete from LeftMenuConfig where infoid=100183;
/
call LMConfig_U_ByInfoInsert (2,100181,0);
/
call LMInfo_Insert (100183,539970,'','',2,100181,0,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/appconfig' where id = 100183;
/
Delete from LeftMenuInfo where id=100182;
/
Delete from LeftMenuConfig where infoid=100182;
/
call LMConfig_U_ByInfoInsert (2,100181,-1);
/
call LMInfo_Insert (100182,539971,'','',2,100181,-1,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/sysconfig-1' where id = 100182;
/
Delete from LeftMenuInfo where id=100180;
/
Delete from LeftMenuConfig where infoid=100180;
/
call LMConfig_U_ByInfoInsert (2,100126,0);
/
call LMInfo_Insert (100180,539967,'','',2,100126,0,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/specialAddDeduction' where id = 100180;
/
Delete from LeftMenuInfo where id=100181;
/
Delete from LeftMenuConfig where infoid=100181;
/
call LMConfig_U_ByInfoInsert (2,100118,9);
/
call LMInfo_Insert (100181,539968,'','',2,100118,9,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100181;
/

View File

@ -0,0 +1,8 @@
alter table HRSA_SALARY_ITEM add SHARED_TYPE number(11) ;
/
alter table HRSA_SALARY_ITEM add TAX_AGENT_IDS varchar2(1024);
/
ALTER TABLE HRSA_SALARY_ACCT_RECORD ADD LOCK_SALARY_ITEM_IDS varchar2(2000);
/

View File

@ -0,0 +1,69 @@
CREATE TABLE hrsa_compensation_log (
id NUMBER(20,0) NOT NULL,
payment_agency NUMBER(20,0) NULL,
payment_organization NUMBER(20,0) NULL,
employee_id NUMBER(20,0) NULL,
welfare_type NUMBER(11,0) NULL,
category_type VARCHAR2(100) NULL,
country_total VARCHAR2(512) NULL,
company_total VARCHAR2(512) NULL,
adjustment_total VARCHAR2(512) NULL,
adjust_to NUMBER(20,0) NULL,
bill_month VARCHAR2(30) NULL,
creator NUMBER(20,0) NULL,
delete_type NUMBER(11,0) NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
tenant_key VARCHAR2(10) NULL,
PRIMARY KEY ( id )
);
/
CREATE TABLE hrsa_compensation_config (
id NUMBER(20,0) NOT NULL,
payment_agency NUMBER(20,0) NULL,
payment_organization NUMBER(20,0) NULL,
employee_id NUMBER(20,0) NULL,
welfare_type NUMBER(11,0) NULL,
category_type VARCHAR2(100) NULL,
adjust_to NUMBER(20,0) NULL,
creator NUMBER(20,0) NULL,
delete_type NUMBER(11,0) NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
tenant_key VARCHAR2(10) NULL,
PRIMARY KEY ( id )
);
/

View File

@ -0,0 +1,60 @@
create table HRSA_SALARY_SEND_RANGE
(
ID NUMBER(38) not null
primary key,
SALARY_SEND_ID NUMBER(38),
GRANT_TYPE VARCHAR2(64),
CREATE_TIME TIMESTAMP(6) default sysdate,
CREATOR NUMBER(38),
UPDATE_TIME TIMESTAMP(6) default sysdate,
DELETE_TYPE NUMBER(11) default 0,
TENANT_KEY VARCHAR2(10)
);
/
create sequence HRSA_S_S_R_ID
start with 1
increment by 1
nomaxvalue
nocycle
nocache;
/
CREATE TRIGGER HRSA_S_S_R_TRIGGER
before INSERT ON HRSA_SALARY_SEND_RANGE FOR each ROW WHEN (NEW.ID IS NULL)
BEGIN
SELECT HRSA_S_S_R_ID.nextval into:NEW.ID from dual;
END;
/
create table HRSA_SALARY_SEND_RANGE_OBJ
(
ID NUMBER(38) not null
primary key,
SALARY_SEND_ID NUMBER(38) not null,
SALARY_SEND_RANGE_ID NUMBER(38) not null,
RANGE_TYPE NUMBER(11) not null,
TARGET_TYPE NUMBER(11) not null,
TARGET_ID NUMBER(38) not null,
CREATOR NUMBER(38),
CREATE_TIME DATE default sysdate,
UPDATE_TIME DATE default sysdate,
DELETE_TYPE NUMBER(11) default 0,
TENANT_KEY VARCHAR2(10)
);
/
create sequence HRSA_S_S_R_O_ID
start with 1
increment by 1
nomaxvalue
nocycle
nocache;
/
CREATE TRIGGER HRSA_S_S_R_O_TRIGGER
before INSERT ON HRSA_SALARY_SEND_RANGE_OBJ FOR each ROW WHEN (NEW.ID IS NULL)
BEGIN
SELECT HRSA_S_S_R_O_ID.nextval into:NEW.ID from dual;
END;
/

View File

@ -0,0 +1,48 @@
CREATE TABLE hrsa_salary_sob_back_item (
id NUMBER(38,0) primary key NOT NULL,
salary_sob_id NUMBER(38,0) DEFAULT NULL NULL,
salary_item_id NUMBER(38,0) DEFAULT NULL NULL,
salary_item_code VARCHAR2(255) DEFAULT NULL NULL,
data_type VARCHAR2(255) DEFAULT NULL NULL,
rounding_mode NUMBER(38,0) DEFAULT NULL NULL,
pattern NUMBER(38,0) DEFAULT NULL NULL,
value_type NUMBER(38,0) DEFAULT NULL NULL,
formula_id NUMBER(38,0) DEFAULT NULL NULL,
back_calc_type NUMBER(38,0) DEFAULT NULL NULL,
tenant_key VARCHAR2(255) DEFAULT NULL NULL,
creator NUMBER(38,0) DEFAULT NULL NULL,
delete_type NUMBER(38,0) DEFAULT NULL NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate
);
/
alter table hrsa_salary_acct_record add back_calc_status NUMBER(38,0) null;
/
alter table hrsa_salary_acct_result add origin_result_value VARCHAR2(1000) null;
/
alter table hrsa_salary_acct_result_report add origin_result_value VARCHAR2(1000) null;
/
alter table hrsa_salary_send add salary_acct_type NUMBER(38,0) null;
/
alter table hrsa_salary_send add send_status NUMBER(38,0) null;
/
alter table hrsa_salary_send_info add salary_acct_type NUMBER(38,0) null;
/
alter table hrsa_salary_template add replenish_name VARCHAR2(100) null;
/
alter table hrsa_salary_template add replenish_rule VARCHAR2(255) null;
/
alter table hrsa_salary_template add replenish_salary_item_setting CLOB null;
/
alter table hrsa_acct_result_temp add origin_result_value VARCHAR2(1000) null;
/

View File

@ -0,0 +1,92 @@
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629577, '年终奖收入', 'annualIncome', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629578, '年终奖税率', 'annualTaxRate', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1675043440772, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629579, '年终奖速算扣除数', 'annualQuickDeductionFactor', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674894163247, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629580, '年终奖应纳税额', 'annualTax', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674896933031, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629581, '应发年终奖', 'annualPayable', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674897014605, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629600, '年终奖免税收入', 'annualTaxFreeIncome', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629601, '其他(年终奖)', 'annualOther', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629602, '准予扣除的捐赠额(年终奖)', 'annualDonateTax', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629603, '减免税额(年终奖)', 'annualTaxSavings', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629604, '备注(年终奖)', 'annualRemark', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'string');
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845590, 2, 746777981115629577, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 0);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845591, 2, 746777981115629578, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 1);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845592, 2, 746777981115629579, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 2);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845593, 2, 746777981115629580, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 3);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845595, 2, 746777981115629600, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 4);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845596, 2, 746777981115629601, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 5);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845597, 2, 746777981115629602, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 6);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845598, 2, 746777981115629603, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 7);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845599, 2, 746777981115629604, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 8);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845594, 2, 746777981115629581, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 9);
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674894163247, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', 'if({薪资项目.年终奖收入}<=36000){0;}else if({薪资项目.年终奖收入}<=144000){210;}else if({薪资项目.年终奖收入}<=300000){1410;}else if({薪资项目.年终奖收入}<=420000){2660;}else if({薪资项目.年终奖收入}<=660000){4410;}else if({薪资项目.年终奖收入}<=960000){7160;}else{15160;}', 'if(salaryItem_annualIncome<=36000){0;}else if(salaryItem_annualIncome<=144000){210;}else if(salaryItem_annualIncome<=300000){1410;}else if(salaryItem_annualIncome<=420000){2660;}else if(salaryItem_annualIncome<=660000){4410;}else if(salaryItem_annualIncome<=960000){7160;}else{15160;}', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674896933031, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.年终奖收入}*{薪资项目.年终奖税率}-{薪资项目.年终奖速算扣除数}', 'salaryItem_annualIncome*salaryItem_annualTaxRate-salaryItem_annualQuickDeductionFactor', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674897014605, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.年终奖收入}-{薪资项目.年终奖应纳税额}', 'salaryItem_annualIncome-salaryItem_annualTax', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1675043440772, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', 'if({薪资项目.年终奖收入}<=0){0;}else if({薪资项目.年终奖收入}<=36000){0.03;}else if({薪资项目.年终奖收入}<=144000){0.1;}else if({薪资项目.年终奖收入}<=300000){0.2;}else if({薪资项目.年终奖收入}<=420000){0.25;}else if({薪资项目.年终奖收入}<=660000){0.3;}else if({薪资项目.年终奖收入}<=960000){0.35;}else{0.45;}', 'if(salaryItem_annualIncome<=0){0;}else if(salaryItem_annualIncome<=36000){0.03;}else if(salaryItem_annualIncome<=144000){0.1;}else if(salaryItem_annualIncome<=300000){0.2;}else if(salaryItem_annualIncome<=420000){0.25;}else if(salaryItem_annualIncome<=660000){0.3;}else if(salaryItem_annualIncome<=960000){0.35;}else{0.45;}', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674894163265, '年终奖收入', 1674894163247, 'salaryItem_annualIncome', '{薪资项目.年终奖收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933036, '年终奖收入', 1674896933031, 'salaryItem_annualIncome', '{薪资项目.年终奖收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933041, '年终奖税率', 1674896933031, 'salaryItem_annualTaxRate', '{薪资项目.年终奖税率}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933045, '年终奖速算扣除数', 1674896933031, 'salaryItem_annualQuickDeductionFactor', '{薪资项目.年终奖速算扣除数}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674897014622, '年终奖收入', 1674897014605, 'salaryItem_annualIncome', '{薪资项目.年终奖收入}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674897014626, '年终奖应纳税额', 1674897014605, 'salaryItem_annualTax', '{薪资项目.年终奖应纳税额}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1675043440796, '年终奖收入', 1675043440772, 'salaryItem_annualIncome', '{薪资项目.年终奖收入}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'));
/

View File

@ -0,0 +1,47 @@
delete from HtmlLabelIndex where id = 540871 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 540871,'档案管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 540871 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540871 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'档案管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540871 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'file management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540871 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'檔案管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelIndex where id = 540869 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 540869,'字段管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 540869 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540869 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'字段管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540869 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'Field management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 540869 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'字段管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,44 @@
Delete from LeftMenuInfo where id=100125;
/
Delete from LeftMenuConfig where infoid=100125;
/
call LMConfig_U_ByInfoInsert (2,100118,2);
/
call LMInfo_Insert (100125,538004,'','',2,100118,2,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100125;
/
Delete from LeftMenuInfo where id=100185;
/
Delete from LeftMenuConfig where infoid=100185;
/
call LMConfig_U_ByInfoInsert (2,100125,0);
/
call LMInfo_Insert (100185,540871,'','',2,100125,0,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryFile' where id = 100185;
/
Delete from LeftMenuInfo where id=100184;
/
Delete from LeftMenuConfig where infoid=100184;
/
call LMConfig_U_ByInfoInsert (2,100125,-1);
/
call LMInfo_Insert (100184,540869,'','',2,100125,-1,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/fieldManagement' where id = 100184;
/

View File

@ -0,0 +1,8 @@
ALTER TABLE hrsa_scheme_detail ADD payment_cycle NUMBER(11,0) NULL;
/
ALTER TABLE hrsa_scheme_detail ADD account_type NUMBER(11,0) NULL;
/
ALTER TABLE hrsa_scheme_detail ADD cycle_setting VARCHAR2(255) NULL;
/

View File

@ -0,0 +1,23 @@
delete from HtmlLabelIndex where id = 541290 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 541290,'非系统人员管理' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 541290 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 541290 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'非系统人员管理' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 541290 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'Non-system personnel management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 541290 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'非系統人員管理' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,74 @@
ALTER TABLE hrsa_tax_agent_emp ADD employee_type number;
/
ALTER TABLE hrsa_salary_archive ADD employee_type number;
/
ALTER TABLE hrsa_tax_agent_emp_change ADD employee_type number;
/
ALTER TABLE hrsa_salary_acct_emp ADD employee_type number;
/
ALTER TABLE hrsa_salary_send_info ADD employee_type number;
/
CREATE TABLE hrsa_external_employee
(
id NUMBER(38,0) primary key NOT NULL,
username varchar2(200) DEFAULT '',
department_name varchar2(200) DEFAULT '',
department_id NUMBER(38,0) DEFAULT 0,
subcompany_name varchar2(200) DEFAULT '',
subcompany_id NUMBER(38,0) DEFAULT 0,
jobtitle_name varchar2(200) DEFAULT '',
jobtitle_id NUMBER(38,0) DEFAULT 0,
companystartdate varchar2(200) DEFAULT '',
mobile varchar2(20) DEFAULT '',
status varchar2(10) DEFAULT '',
workcode varchar2(200) DEFAULT '',
sex varchar2(10) DEFAULT '',
email varchar2(200) DEFAULT '',
telephone varchar2(200) DEFAULT '',
jobcall varchar2(200) DEFAULT '',
birthday varchar2(200) DEFAULT '',
id_no varchar2(200) DEFAULT '',
bank_card_num varchar2(200) DEFAULT '',
bank_name varchar2(200) DEFAULT '',
delete_type number DEFAULT 0,
creator NUMBER(38,0) DEFAULT 0,
modifier NUMBER(38,0) DEFAULT 0,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
tenant_key varchar2(200) DEFAULT ''
);
/
CREATE TABLE hrsa_salary_sob_ext_range
(
id NUMBER(38,0) primary key NOT NULL,
salary_sob_id NUMBER(38,0) DEFAULT 0,
target_type NUMBER(38,0) DEFAULT 0,
target_id NUMBER(38,0) DEFAULT 0,
creator NUMBER(38,0) DEFAULT 0,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
delete_type number DEFAULT 0,
tenant_key varchar2(200) DEFAULT ''
);
/
CREATE TABLE hrsa_tax_agent_ext_range
(
id NUMBER(38,0) primary key NOT NULL,
tax_agent_id NUMBER(38,0) DEFAULT 0,
target_type NUMBER(38,0) DEFAULT 0,
target_id NUMBER(38,0) DEFAULT 0,
creator NUMBER(38,0) DEFAULT 0,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
delete_type number DEFAULT 0,
tenant_key varchar2(200) DEFAULT ''
);
/

View File

@ -0,0 +1,66 @@
ALTER TABLE hrsa_other_deduction ADD (
private_pension varchar2(255) NULL
);
/
ALTER TABLE hrsa_add_up_situation ADD (
add_up_private_pension varchar2(255) NULL
);
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629605, '个人养老金', 'privatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1680746056549, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629698, '累计个人养老金', 'addUpPrivatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1681201555316, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number');
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1680746056549, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{其他免税扣除.个人养老金}', 'otherDeduction_privatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1680746056577, '个人养老金', 1680746056549, 'otherDeduction_privatePension', '{其他免税扣除.个人养老金}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1681201555316, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"sqlReturnKey\":\"\",\"openDecrypt\":\"0\",\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.个人养老金}+{往期累计情况.累计个人养老金}', 'salaryItem_privatePension+addUpSituation_addUpPrivatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681201555332, '个人养老金', 1681201555316, 'salaryItem_privatePension', '{薪资项目.个人养老金}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681201555338, '累计个人养老金', 1681201555316, 'addUpSituation_addUpPrivatePension', '{往期累计情况.累计个人养老金}', 'number', 'addUpSituation', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845610, 1, 746777981115629605, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 10);
/
INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845611, 1, 746777981115629698, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 11);
/
INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1681265757380, '公式1', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{\"datasource\":{\"datasourceId\":\"\"}}', '{薪资项目.当前累计应税收入合计}-{薪资项目.当前累计专项扣除合计}-{薪资项目.当前累计专项附加扣除合计}-{薪资项目.当前累计其他扣除合计}-{薪资项目.当前累计减除费用}-{薪资项目.当前累计准备扣除的捐赠额}-{薪资项目.累计个人养老金}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation-salaryItem_addUpPrivatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757404, '当前累计准备扣除的捐赠额', 1681265757380, 'salaryItem_addUpAllowedDonation', '{薪资项目.当前累计准备扣除的捐赠额}', 'number', 'salaryItem', 5, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757408, '当前累计减除费用', 1681265757380, 'salaryItem_addUpSubtraction', '{薪资项目.当前累计减除费用}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757413, '当前累计其他扣除合计', 1681265757380, 'salaryItem_addUpOtherDeduction', '{薪资项目.当前累计其他扣除合计}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757417, '当前累计专项附加扣除合计', 1681265757380, 'salaryItem_addUpSpeAddiDeduction', '{薪资项目.当前累计专项附加扣除合计}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757421, '当前累计专项扣除合计', 1681265757380, 'salaryItem_addUpSpecialDeduction', '{薪资项目.当前累计专项扣除合计}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757424, '当前累计应税收入合计', 1681265757380, 'salaryItem_addUpIncome', '{薪资项目.当前累计应税收入合计}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757428, '累计个人养老金', 1681265757380, 'salaryItem_addUpPrivatePension', '{薪资项目.累计个人养老金}', 'number', 'salaryItem', 6, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
/
update hrsa_sys_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额';
/
update hrsa_salary_item set formula_id = 1681265757380 where name = '当前累计应纳税所得额';
/

View File

@ -0,0 +1,2 @@
update hrsa_sys_salary_item set use_in_employee_salary = 1 where code in ('baseSalary','postSalary');
/

View File

@ -0,0 +1,174 @@
create table hrsa_sub_table
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
sub_table_name varchar2(100) not null,
dimension varchar2(20) not null,
start_month varchar2(10),
end_month varchar2(10),
pay_org_string varchar2(500),
pay_agency_string varchar2(500),
sub_company_string varchar2(500),
depart_string varchar2(500),
grade_string varchar2(500),
position_string varchar2(500),
status_string varchar2(500),
employee_type varchar2(500),
employee_string varchar2(500),
payment_type_string varchar2(100)
);
/
create table hrsa_sub_table_item
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
table_id number not null,
item_name varchar2(50) not null,
item_value varchar2(500) not null,
index_value int not null,
total_rule varchar2(500),
count_rule varchar2(500),
unit_type int default 2
);
/
alter table hrsa_sub_table add table_type int;
/
alter table hrsa_sub_table modify table_type default 0;
/
create table hrsa_salary_stats_dim
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
dim_name varchar2(100),
dim_type varchar2(20),
remark varchar2(500),
setting varchar2(2000),
is_default int,
dim_code varchar2(50)
);
/
create table hrsa_salary_stats_report
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
report_name varchar2(100),
dimension varchar2(1000),
tax_agent_setting varchar2(1000),
income_category_setting varchar2(20),
sub_company_setting varchar2(1000),
depart_setting varchar2(1000),
grade_setting varchar2(1000),
position_setting varchar2(1000),
status_setting varchar2(1000),
employee_setting varchar2(1000),
hiredate_setting varchar2(1000),
leavedate_setting varchar2(1000),
salary_start_month date,
salary_end_month date
);
/
create table hrsa_salary_statistics_item
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
item_name varchar2(50),
item_value varchar2(1000),
count_rule varchar2(500),
sum_rule varchar2(500),
avg_rule varchar2(500),
max_rule varchar2(500),
min_rule varchar2(500),
median_rule varchar2(500),
index_value int,
unit_type int,
stat_report_id number
);
/
create table hrsa_charts_setting
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
table_id number not null,
charts_type int not null,
item_values varchar2(500),
item_col_value varchar2(50) not null,
dimension_range int not null,
item_sort_value varchar2(500),
item_col_sort_value varchar2(50),
sort_type int,
sort_num int
);
/
create table hrsa_salary_echarts_setting
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
report_id number not null,
charts_type int not null,
item_values varchar2(500),
item_col_value varchar2(50) not null,
dimension_range int not null,
item_sort_value varchar2(500),
item_col_sort_value varchar2(50),
sort_type int,
sort_num int
);
/
alter table hrsa_salary_stats_dim modify dim_type varchar2(30);
/
alter table hrsa_salary_stats_report modify income_category_setting varchar2(1000);
/
alter table hrsa_salary_stats_report add remark varchar2(100);
/
alter table hrsa_salary_stats_report add second_dimension varchar2(100);
/
alter table hrsa_salary_stats_report add sort_index varchar2(100);
/
alter table hrsa_salary_stats_report add sort_type varchar2(100);
/
alter table hrsa_salary_stats_dim add label_id int;
/

View File

@ -0,0 +1,11 @@
declare
datashowset_id NUMBER;
hrmjobgroups_id NUMBER;
begin
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryItemBrowser', '1', '1', '', 'select * from hrsa_salary_item where delete_type = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, 'н×ÊÏîÄ¿', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0',SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryItemBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, 'Ãû³Æ', 'name', '', 1, 1, SYS_GUID(), NULL);
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, 'Ãû³Æ', 'name', '2', '', 1, SYS_GUID(), '');
end;
/

View File

@ -0,0 +1,23 @@
delete from HtmlLabelIndex where id = 542781 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 542781,'薪酬统计报表' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 542781 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 542781 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'薪酬统计报表' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 542781 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'Salary Statistics Report' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 542781 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'薪酬統計報表' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/

View File

@ -0,0 +1,14 @@
Delete from LeftMenuInfo where id=100187;
/
Delete from LeftMenuConfig where infoid=100187;
/
call LMConfig_U_ByInfoInsert (2,100118,9);
/
call LMInfo_Insert (100187,542781,'','',2,100118,9,18);
/
update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics' where id = 100187;
/

View File

@ -0,0 +1,14 @@
CREATE TABLE hrsa_salary_acct_result_log (
id NUMBER(38,0) NOT NULL,
datasource NUMBER NOT NULL,
salary_acct_record_id NUMBER(38,0) NOT NULL,
salary_acct_result_id NUMBER(38,0) NOT NULL,
salary_acct_emp_id NUMBER(38,0) NOT NULL,
salary_item_id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
operator NUMBER(38,0) NOT NULL,
operate_time DATE NOT NULL,
delete_type NUMBER NOT NULL,
update_time DATE NOT NULL
);
/

View File

@ -0,0 +1,2 @@
alter table HRSA_SALARY_ITEM add SORTED_INDEX number(11) null;
/

View File

@ -0,0 +1,7 @@
ALTER TABLE HRSA_SALARY_TEMPLATE ADD (
SMS_STATUS int NULL
);
/
UPDATE HRSA_SALARY_TEMPLATE SET MSG_STATUS = 1;
/

View File

@ -0,0 +1,2 @@
alter table HRSA_TAX_AGENT add SORTED_INDEX number(11) null;
/

View File

@ -0,0 +1,5 @@
update hrsa_formula set formula = '{薪资项目.本月(次)其他扣除合计}+{往期累计情况.累计其他免税扣除}' , formulaRunScript='salaryItem_otherDeduction+addUpSituation_addUpOtherDeduction' where id = 1651740238860;
/
update hrsa_formula_var set delete_type = 1 where id = 1651740241717;
/

View File

@ -0,0 +1,13 @@
CREATE TABLE hrsa_salary_bill_watermark
(
id NUMBER(38,0) PRIMARY KEY NOT NULL,
watermark_status NUMBER NULL,
watermark_type VARCHAR2(255) NULL,
watermark_setting CLOB NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
creator NUMBER(38,0) NOT NULL,
delete_type NUMBER NOT NULL,
tenant_key VARCHAR2(255)
)
/

View File

@ -0,0 +1,40 @@
alter table hrsa_salary_template
add auto_send_cycle_type NUMBER null;
/
alter table hrsa_salary_template
add auto_send_status NUMBER null;
/
alter table hrsa_salary_template
add auto_send_day_of_month varchar2(200) NULL;
/
alter table hrsa_salary_template
add auto_send_time_of_day varchar2(200) NULL;
/
alter table hrsa_salary_send_info
add bill_read_status NUMBER null;
/
alter table hrsa_salary_send_info
add bill_confirm_status NUMBER null;
/
alter table hrsa_salary_send_info
add send_employee_id NUMBER(38,0) NULL;
/
alter table hrsa_salary_template
add ack_feedback_status NUMBER NULL;
/
alter table hrsa_salary_template
add auto_ack_days NUMBER NULL;
/
alter table hrsa_salary_template
add feedback_url VARCHAR2(500) NULL;
/

View File

@ -0,0 +1,4 @@
alter table hrsa_salary_item
add hide_default NUMBER null;
/

View File

@ -0,0 +1,14 @@
declare
datashowset_id NUMBER;
hrmjobgroups_id NUMBER;
begin
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, '薪酬非系统人员', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryExtEmp', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '姓名', 'username', '', 1, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '手机号', 'mobile', '', 0, 2, SYS_GUID(), NULL);
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '姓名', 'username', '2', '', 1, SYS_GUID(), '');
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '手机号', 'mobile', '2', '', 2, SYS_GUID(), '');
end;
/

View File

@ -0,0 +1,12 @@
alter table hrsa_salary_sob_item
add rounding_mode NUMBER null;
/
alter table hrsa_salary_sob_item
add pattern NUMBER null;
/
alter table hrsa_salary_sob_item
add value_type NUMBER null;
/

View File

@ -0,0 +1,14 @@
CREATE TABLE hrsa_salary_bill_item_name(
id NUMBER(38,0) PRIMARY KEY NOT NULL,
salary_template_id NUMBER(38,0) NOT NULL,
salary_item_id NUMBER(38,0) NOT NULL,
salary_item_show_name VARCHAR2(255) NOT NULL,
salary_bill_type NUMBER NOT NULL,
create_time DATE DEFAULT sysdate,
update_time DATE DEFAULT sysdate,
creator NUMBER(38,0) NOT NULL,
delete_type NUMBER NOT NULL,
tenant_key VARCHAR2(255)
);
/

View File

@ -0,0 +1,48 @@
ALTER Table hrsa_social_archives Add employee_id2 NUMBER(38,0);
/
update hrsa_social_archives a SET a.employee_id2=a.employee_id;
/
alter table hrsa_social_archives drop column employee_id;
/
alter table hrsa_social_archives rename column employee_id2 to employee_id;
/
alter table hrsa_social_archives MODIFY (employee_id not null);
/
ALTER Table hrsa_fund_archives Add employee_id2 NUMBER(38,0);
/
update hrsa_fund_archives a SET a.employee_id2=a.employee_id;
/
alter table hrsa_fund_archives drop column employee_id;
/
alter table hrsa_fund_archives rename column employee_id2 to employee_id;
/
alter table hrsa_fund_archives MODIFY (employee_id not null);
/
ALTER Table hrsa_other_archives Add employee_id2 NUMBER(38,0);
/
update hrsa_other_archives a SET a.employee_id2=a.employee_id;
/
alter table hrsa_other_archives drop column employee_id;
/
alter table hrsa_other_archives rename column employee_id2 to employee_id;
/
alter table hrsa_other_archives MODIFY (employee_id not null);
/
ALTER TABLE hrsa_insurance_base_info ADD employee_type number;
/

View File

@ -0,0 +1,9 @@
update hrsa_salary_sob_item a set rounding_mode = (select rounding_mode from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.rounding_mode is null or a.rounding_mode='');
/
update hrsa_salary_sob_item a set pattern = (select pattern from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.pattern is null or a.pattern='');
/
update hrsa_salary_sob_item a set value_type = (select value_type from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.value_type is null or a.value_type='');
/

View File

@ -0,0 +1,40 @@
create table hrsa_report_push
(
id NUMBER(38,0) primary key ,
create_time DATE default sysdate,
update_time DATE default sysdate,
creator NUMBER(38,0),
delete_type number default 0,
tenant_key varchar2(10),
msg_id NUMBER(38,0),
report_ids varchar2(500),
start_time varchar2(30),
end_time varchar2(30),
push_channel varchar2(30),
email_account varchar2(30),
mark varchar2(100),
push_title varchar2(30),
email_account_id number,
remind NUMBER
);
/
create table hrsa_report_push_detail
(
id NUMBER(38,0) primary key ,
create_time DATE default sysdate,
update_time DATE default sysdate,
creator NUMBER(38,0),
delete_type int default 0,
tenant_key varchar2(10),
msg_id NUMBER(38,0),
employee_id NUMBER(38,0),
push_time varchar2(30),
push_status varchar2(5),
reback_time varchar2(30),
reback_status varchar2(5),
batch_id NUMBER(38,0),
view_status varchar2(10)
);
/

View File

@ -0,0 +1,4 @@
update hrsa_formula set EXTEND_PARAM= '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}'
where id in (1674894163247,1674896933031,1674897014605,1675043440772,1680746056549,1681201555316);
/

View File

@ -0,0 +1,22 @@
update hrsa_sys_salary_item set code = 'addUpHousingLoanInterest' where id = 674853617092214800;
/
update hrsa_salary_item set code = 'addUpHousingLoanInterest' where sys_salary_item_id = 674853617092214800;
/
update hrsa_salary_sob_back_item set salary_item_code = 'addUpHousingLoanInterest' where salary_item_code = 'addUpHousingLoannumbererest';
/
update hrsa_formula set formulaRunScript = 'addUpSituation_addUpHousingLoanInterest' where id = 1651739100651;
/
update hrsa_formula set
formulaRunScript='salaryItem_addUpChildEducation+salaryItem_addUpHousingLoanInterest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly' where id = 1651739411365;
/
update hrsa_formula_var set field_id= 'addUpSituation_addUpHousingLoanInterest' where id = 1651739101122;
/
update hrsa_formula_var set field_id= 'salaryItem_addUpHousingLoanInterest' where id = 1651739411637;
/

View File

@ -0,0 +1,39 @@
CREATE TABLE hrsa_insurance_base_history (
id NUMBER(20,0) NOT NULL,
employee_id NUMBER(20,0) NOT NULL,
payment_organization NUMBER(11,0) NOT NULL,
welfare_type NUMBER(11,0) NOT NULL,
adjust_before_scheme_id NUMBER(11,0) NULL,
adjust_after_scheme_id NUMBER(11,0) NULL,
adjust_before_base_value VARCHAR2(255) NULL,
adjust_after_base_value VARCHAR2(255) NULL,
adjust_welfare_item_id NUMBER(20,0) NOT NULL,
operator NUMBER(20,0) NOT NULL,
operate_time DATE NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
creator NUMBER(20,0) NOT NULL,
delete_type NUMBER(11,0) NOT NULL,
tenant_key VARCHAR2(10) NULL,
PRIMARY KEY (id)
);
/

View File

@ -0,0 +1,27 @@
CREATE TABLE hrsa_expand_field_settings (
id NUMBER(38,0) primary key NOT NULL,
module varchar2(100) NOT NULL ,
module_info varchar2(1000) ,
pk varchar2(100) NOT NULL,
expand_sql varchar2(4000) NOT NULL ,
field_setting varchar2(4000) NOT NULL,
create_time date DEFAULT sysdate,
update_time date DEFAULT sysdate,
creator NUMBER(38,0) NOT NULL ,
delete_type number NOT NULL ,
tenant_key varchar2(10) NOT NULL
);
/
ALTER TABLE hrsa_salary_statistics_item ADD last_rule VARCHAR2(500) NULL;
/
ALTER TABLE hrsa_salary_statistics_item ADD old_rule VARCHAR2(500) NULL;
/
ALTER TABLE hrsa_salary_statistics_item ADD frequent_rule VARCHAR2(500) NULL;
/
ALTER TABLE hrsa_salary_statistics_item ADD tile_rule VARCHAR2(500) NULL;
/

View File

@ -0,0 +1,3 @@
alter table hrsa_salary_stats_report add time_type int;
/

View File

@ -0,0 +1,3 @@
ALTER TABLE hrsa_salary_template ADD sms_setting CLOB NULL;
/

View File

@ -0,0 +1,39 @@
ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL;
/
ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL;
/

View File

@ -0,0 +1,3 @@
alter table hrsa_salary_item add width int null;
/

View File

@ -0,0 +1,8 @@
CREATE TABLE hrsa_elog_version
(
id NUMBER(38,0) primary key NOT NULL,
mainTable varchar2(255),
version NUMBER(38,0)
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add mobile_feedback_url varchar(500);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

View File

@ -0,0 +1,5 @@
ALTER TABLE hrsa_salary_stats_report ADD (
salary_sob_setting varchar2(1000) NULL
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_salary_send_info add first_reading_time date;
/

View File

@ -0,0 +1,13 @@
CREATE TABLE hrsa_acct_result_template (
id NUMBER(38,0) primary key ,
template_name varchar(255),
salary_sob_id NUMBER(38,0) ,
salary_item_ids varchar(4000),
creator NUMBER(38,0),
update_time DATE default sysdate,
create_time DATE default sysdate,
delete_type NUMBER,
tenant_key varchar(20)
);
/

View File

@ -0,0 +1,19 @@
CREATE TABLE hrsa_salary_approval_rule (
id NUMBER(38,0) primary key,
salary_sob_id NUMBER(38,0),
open_approval NUMBER,
approval_group_setting clob,
workflow_url varchar2(500) DEFAULT NULL,
delete_type NUMBER,
create_time DATE default sysdate,
update_time DATE default sysdate,
creator NUMBER(38,0)
);
/
alter table hrsa_salary_acct_record add approval_id varchar2(50);
/
alter table hrsa_salary_acct_record add approval_status varchar2(50);
/

View File

@ -0,0 +1,19 @@
create table hrsa_salary_acct_sob_config
(
id number primary key ,
create_time date,
update_time date,
creator number,
delete_type int default 0,
tenant_key varchar2(10),
salary_acct_record_id number,
basic_config clob,
employee_field_config clob,
item_config clob,
item_group_config clob,
back_item_config clob,
adjust_rule_config clob,
check_rule_config clob
);
/

View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_salary_sob_item ADD item_hide NUMBER(20,0);
/
ALTER TABLE hrsa_salary_sob_item_group ADD item_hide NUMBER(20,0);
/

View File

@ -0,0 +1,12 @@
update hrsa_salary_sob_item set item_hide = 0;
/
update hrsa_salary_sob_item_group set item_hide = 0;
/
UPDATE hrsa_salary_sob_item a SET item_hide = (SELECT b.item_hide FROM hrsa_salary_item_hide b WHERE a.salary_item_id = b.salary_item_id and a.salary_sob_id = b.salary_sob_id and a.delete_type=0 and b.delete_type=0 ) WHERE EXISTS (SELECT 1 FROM hrsa_salary_item_hide b WHERE b.item_hide = a.item_hide);
/
UPDATE hrsa_salary_sob_item_group a SET item_hide = (SELECT b.item_hide FROM hrsa_salary_item_hide b WHERE a.id = b.salary_item_id and a.salary_sob_id = b.salary_sob_id and a.delete_type=0 and b.delete_type=0 ) WHERE EXISTS (SELECT 1 FROM hrsa_salary_item_hide b WHERE b.item_hide = a.item_hide);
/

View File

@ -0,0 +1,3 @@
ALTER TABLE hrsa_salary_acct_emp ADD lock_status NUMBER(11, 0);
/

View File

@ -0,0 +1,27 @@
alter table hrsa_salary_acct_emp add subcompany_name varchar2(200) NULL;
/
alter table hrsa_salary_acct_emp add subcompany_id NUMBER null;
/
alter table hrsa_salary_acct_emp add department_name varchar2(200) NULL;
/
alter table hrsa_salary_acct_emp add department_id NUMBER null;
/
alter table hrsa_salary_acct_emp add jobtitle_name varchar2(200) NULL;
/
alter table hrsa_salary_acct_emp add jobtitle_id NUMBER NULL;
/
alter table hrsa_salary_acct_emp add jobcall varchar2(200) NULL;
/
alter table hrsa_salary_acct_emp add jobcall_id NUMBER NULL;
/
alter table hrsa_salary_acct_emp add status varchar2(200) NULL;
/

View File

@ -0,0 +1,70 @@
update hrsa_salary_acct_emp a
set
(
department_id ,
department_name,
subcompany_id ,
subcompany_name,
jobtitle_id ,
jobtitle_name ,
jobcall_id,
jobcall,
status
)
=
(
select
b.departmentId,
b.departmentName,
b.subcompanyid,
b.subcompanyName,
b.jobtitleId,
b.jobtitleName,
b.jobcallId,
b.jobcall,
b.status from
(
select
e.id as employeeId,
d.departmentname as departmentName,
d.id as departmentId,
sc.SUBCOMPANYNAME as subcompanyName,
sc.id as subcompanyid,
c.jobtitlename as jobtitleName,
c.id as jobtitleId,
e.status as status,
e.jobcall as jobcallId,
job.name as jobcall
from hrmresource e
left join hrmdepartment d on e.departmentid = d.id
left join hrmjobtitles c on e.jobtitle = c.id
left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
left join hrmjobcall job on e.jobcall=job.id
where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
) b
where a.employee_id = b.employeeId
)
where a.delete_type=0 and
exists (select 1 from (
select
e.id as employeeId,
d.departmentname as departmentName,
d.id as departmentId,
sc.SUBCOMPANYNAME as subcompanyName,
sc.id as subcompanyid,
c.jobtitlename as jobtitleName,
c.id as jobtitleId,
e.status as status,
e.jobcall as jobcallId,
job.name as jobcall
from hrmresource e
left join hrmdepartment d on e.departmentid = d.id
left join hrmjobtitles c on e.jobtitle = c.id
left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
left join hrmjobcall job on e.jobcall=job.id
where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
) b
where a.employee_id = b.employeeId
);
/

View File

@ -0,0 +1,9 @@
ALTER TABLE hrsa_salary_item ADD default_value varchar2(255) NULL;
/
ALTER TABLE hrsa_salary_sob_item ADD default_value varchar2(255) NULL;
/
ALTER TABLE hrsa_salary_sob_back_item ADD default_value varchar2(255) NULL;
/

View File

@ -0,0 +1,42 @@
CREATE TABLE hrsa_variable_archive (
id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NULL ,
salary_month DATE NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
creator NUMBER(38,0) NOT NULL,
delete_type int NOT NULL,
tenant_key varchar2(10) NULL,
PRIMARY KEY (id)
);
/
CREATE TABLE hrsa_variable_archive_item (
id NUMBER(38,0) NOT NULL,
employee_id NUMBER(38,0) NOT NULL,
variable_archive_id NUMBER(38,0) NOT NULL,
variable_item_id NUMBER(38,0) NOT NULL,
item_value varchar2(255) NULL ,
create_time DATE NOT NULL ,
update_time DATE NOT NULL,
creator NUMBER(38,0) NOT NULL,
delete_type int NOT NULL ,
tenant_key varchar2(10) NULL,
PRIMARY KEY (id)
);
/
CREATE TABLE hrsa_variable_item (
id NUMBER(38,0) NOT NULL ,
name varchar2(255) NOT NULL ,
code varchar2(255) NOT NULL,
data_type varchar2(20) NULL,
create_time DATE NOT NULL,
update_time DATE NOT NULL,
creator NUMBER(38,0) NOT NULL,
delete_type int NOT NULL,
tenant_key varchar2(10) NULL ,
PRIMARY KEY (id)
);
/

View File

@ -0,0 +1,3 @@
alter table hrsa_variable_archive add tax_agent_id NUMBER(38,0);
/

View File

@ -0,0 +1,10 @@
ALTER TABLE hrsa_tax_agent_manage_range ADD (
target varchar2(4000) NULL
);
/
ALTER TABLE hrsa_salary_sob_range ADD (
target varchar2(4000) NULL
);
/

Some files were not shown because too many files have changed in this diff Show More