Commit Graph

2103 Commits

Author SHA1 Message Date
Harryxzy d172cb402e 领悦 二开 2025-04-16 14:14:03 +08:00
Harryxzy 59cb927806 2100bug修复 2025-04-16 11:24:58 +08:00
Harryxzy b2e82f7f83 领悦数据库兼容问题修复 2025-04-15 10:08:19 +08:00
Harryxzy 649f8c2432 Merge branch 'release/3.0.2.2504.01' into custom/领悦业务线
# Conflicts:
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
2025-04-10 13:36:23 +08:00
Harryxzy d1fa73d412 领悦3张报表分权修改 2025-04-10 13:35:20 +08:00
Harryxzy 0bcafd3934 修复个税申报 不同税款所属期校验bug 2025-04-09 17:20:48 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
Harryxzy ba2e83447f Merge branch 'release/3.0.1.2503.01' into custom/领悦业务线
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2025-04-08 11:36:34 +08:00
Harryxzy 22db863315 领悦7张报表 2025-04-08 11:33:58 +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
钱涛 3511c18e31 数据推送配置 2025-04-01 15:12:36 +08:00
Harryxzy 985f6a6191 领悦摘要临时修改 2025-03-26 18:03:25 +08:00
Harryxzy 8814c7605e 领悦 修改 2025-03-26 09:20:27 +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
Harryxzy f6b3845a83 领悦薪酬二开 合计增加 2025-03-21 10:39:58 +08:00
Harryxzy db3fab6e85 领悦薪酬二开 2025-03-20 15:31:38 +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
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
Harryxzy 25723af00a 社保福利台账增减人员 2025-03-11 15:18:05 +08:00
Harryxzy 5b66efa3cc 社保福利台账增减人员 2025-03-10 16:47:48 +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
Harryxzy ebec70ddeb 领悦显示调整 2025-03-06 11:39:14 +08:00
钱涛 165a775074 刷新账套和扣缴义务人自关联 2025-03-05 16:42:13 +08:00
Harryxzy ef28618db4 社保福利台账增减人员 2025-03-04 16:48:00 +08:00
Harryxzy ea51212bff 领悦bug修复 2025-02-28 14:03:16 +08:00
钱涛 cb38a3fa9b 浮动薪资权限改进 2025-02-27 17:44:23 +08:00
钱涛 7382345dd5 修复退差人员添加 2025-02-27 15:47:59 +08:00
Harryxzy bf57c66fc1 修复 定薪超过1000日志报错bug 2025-02-26 15:13:39 +08:00
Harryxzy 6119e933d5 领悦 凭证二开 2025-02-21 16:50:16 +08:00
钱涛 2f9822aeef 修复导出社保档案失败问题 2025-02-20 10:53:27 +08:00
Harryxzy 35551d09a5 Merge branch 'release/3.0.0.2502.01' into custom/领悦业务线
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2025-02-19 10:49:43 +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