Commit Graph

3889 Commits

Author SHA1 Message Date
钱涛 3e49c412ea Merge branch 'release/个税版本' into release/个税&业务线 2025-05-09 19:47:02 +08:00
钱涛 24e7cbb32e 处理申报人次 2025-05-09 19:46:32 +08:00
钱涛 d296fba3e9 二开,人员报送,刷新不采集税期当月或者之后月份 2025-05-09 19:43:44 +08:00
钱涛 df093e606c 二开,自离账套不参与申报 2025-05-09 17:59:40 +08:00
钱涛 223049c9c5 Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
2025-05-09 16:31:23 +08:00
钱涛 582a370170 Merge branch 'release/个税版本' into release/个税&业务线 2025-05-09 16:29:05 +08:00
钱涛 603d31b095 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-05-09 16:28:56 +08:00
钱涛 f6428be044 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-05-09 16:23:53 +08:00
钱涛 3a843fc41f Merge branch 'release/3.0.2.2504.01' into custom/联特 2025-05-09 16:23:21 +08:00
钱涛 6925e4daea fix冲突 2025-05-09 16:21:17 +08:00
钱涛 aa37e174e9 Merge branch 'release/个税版本' into custom/联特
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-05-09 16:18:18 +08:00
钱涛 8c4fbf7919 拼接错误信息 2025-05-09 11:45:06 +08:00
钱涛 af89a43da7 修复业务线权限 2025-04-30 11:04:18 +08:00
钱涛 ca75a5f403 fix导出明细 2025-04-29 16:57:33 +08:00
钱涛 1a66a1f846 版本 2025-04-29 16:07:51 +08:00
钱涛 cc510db3cc Merge remote-tracking branch 'origin/custom/联特' into custom/联特 2025-04-29 09:20:26 +08:00
钱涛 ecb920de0e 去除验证码 2025-04-29 09:19:44 +08:00
钱涛 23b1fae3a3 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-28 18:15:00 +08:00
钱涛 bc8e80b4e6 增加SUBSTR拦截处理 2025-04-28 18:14:17 +08:00
钱涛 a1af56bbcc 忘记密码 2025-04-28 18:08:29 +08:00
Harryxzy 2bd545964a 联特 季度绩效分段计算 2025-04-28 10:14:11 +08:00
钱涛 c7cadd2b98 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-25 17:40:03 +08:00
Harryxzy 344571997f Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-24 17:50:17 +08:00
Harryxzy 25c8479d53 修复社保福利台账线下对比和核算人数不匹配问题 2025-04-24 17:48:54 +08:00
钱涛 a2ead2346e Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/service/impl/PushServiceImpl.java
2025-04-24 17:36:03 +08:00
钱涛 508012c82b 修复数据推送查询问题 2025-04-24 17:35:22 +08:00
钱涛 efd2eafd1e 修复数据推送分页问题 2025-04-24 16:45:24 +08:00
钱涛 e54b775d69 Merge branch 'release/个税版本' into release/个税&业务线 2025-04-24 16:19:54 +08:00
钱涛 d03c67644a Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-24 16:19:50 +08:00
钱涛 ee3fd8da8e 修复按照扣缴义务人名称检索 2025-04-24 16:19:23 +08:00
钱涛 9b9b47de88 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-04-24 16:08:39 +08:00
钱涛 99f6c43f25 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-24 16:04:13 +08:00
钱涛 22f494fe12 修复按照扣缴义务人名称检索 2025-04-24 16:02:34 +08:00
钱涛 43d35cb81b Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-24 11:07:01 +08:00
钱涛 0bdc48f1c2 修复归档后查看拓扑图 2025-04-24 11:03:13 +08:00
钱涛 35f8368715 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/web/TaxDeclarationController.java
2025-04-24 09:15:35 +08:00
钱涛 ac2143080f Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/web/TaxDeclarationController.java
2025-04-23 18:10:26 +08:00
钱涛 491a746c75 申报表税款所属期检索和申报 2025-04-23 17:45:14 +08:00
钱涛 2fe958f5db Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-23 17:42:08 +08:00
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +08:00
钱涛 47c267ba3b 拓扑图显示非薪资项目数据 2025-04-22 15:45:56 +08:00
钱涛 595fceddaa 拓扑图显示非薪资项目数据 2025-04-22 15:41:11 +08:00
钱涛 0b27d47d30 Merge branch 'release/个税版本' into release/个税&业务线 2025-04-22 15:33:50 +08:00
钱涛 6532bfdd07 拓扑图显示非薪资项目数据 2025-04-22 15:33:28 +08:00
钱涛 06ba416d37 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-21 15:50:17 +08:00
钱涛 6b90c8c45c Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-04-21 15:50:00 +08:00
钱涛 6e6606f3ac Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-21 15:49:39 +08:00
钱涛 552cee8a6f 修复合并计税问题 2025-04-21 15:49:28 +08:00
钱涛 110cec1b33 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-21 14:27:00 +08:00
钱涛 0e93cbab04 t 2025-04-21 10:37:44 +08:00
钱涛 ec2d5f6a36 人员报送非正常自动添加离职日期 2025-04-18 14:28:06 +08:00
Harryxzy 0ed411c532 Merge remote-tracking branch 'origin/custom/联特' into custom/联特 2025-04-17 17:18:31 +08:00
Harryxzy 16945a4176 联特 某些义务人不校验报税 2025-04-17 17:11:04 +08:00
钱涛 4e2ea2017b Merge branch 'release/3.0.2.2504.01' into custom/联特 2025-04-17 17:11:03 +08:00
钱涛 0eafdbfa4c Merge branch 'release/2.19.1.2501.01' into custom/联特 2025-04-17 17:10:51 +08:00
Harryxzy 2e9971c998 联特 税款所属期下下月 2025-04-17 15:48:09 +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
钱涛 c2fde2b3e4 处理冲突 2025-04-14 15:50:51 +08:00
钱涛 709ec2f3ce Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
#	src/com/engine/salary/service/impl/PushServiceImpl.java
2025-04-14 15:50:15 +08:00
钱涛 cca13614e3 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-14 15:46:04 +08:00
Harryxzy f97c49facc 联特 bug修复 2025-04-14 15:37:46 +08:00
Harryxzy 0bcafd3934 修复个税申报 不同税款所属期校验bug 2025-04-09 17:20:48 +08:00
钱涛 be8ede54df Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-09 14:25:43 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
钱涛 47ba860cc6 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-08 16:39:27 +08:00
钱涛 ed15911067 Merge branch 'release/个税版本' into release/个税&业务线 2025-04-08 16:38:45 +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
钱涛 1a4ab02bdc 确认名单转义 2025-03-31 18:23:12 +08:00
钱涛 590046b0a3 Merge branch 'feature/个税云6万扣除名单' into release/个税版本 2025-03-31 17:40:13 +08:00
钱涛 9d03aaffdc Merge branch 'release/个税版本' into release/个税&业务线 2025-03-31 17:18:39 +08:00
钱涛 993cba21bd 增加申报表取值算法 2025-03-31 17:15:01 +08:00
钱涛 6ade625a39 Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2025-03-31 13:31:33 +08:00
钱涛 70eb836906 Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
2025-03-27 17:28:55 +08:00
钱涛 96f88e1eec Merge branch 'release/个税版本' into release/个税&业务线 2025-03-27 17:12:57 +08:00
钱涛 7fe109a1af 修复获取累计专项附加 2025-03-27 17:12:37 +08:00
钱涛 f3dd68792c 修复业务线冲突 2025-03-27 14:44:47 +08:00
钱涛 e25c1f59d2 人员报送,业务线功能 2025-03-27 09:51:44 +08:00
钱涛 b1c1587344 Merge branch 'release/3.0.1.2503.01' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/service/SalaryAcctResultService.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySobWrapper.java
2025-03-26 15:48:02 +08:00
钱涛 c0ef81258b Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/service/OtherDeductionService.java
2025-03-26 15:45:20 +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
钱涛 8a8e591ce3 增加调整原因,技能等级变化 2025-03-21 11:25:10 +08:00
钱涛 66250c2ddc Merge branch 'release/3.0.1.2503.01' into custom/联特 2025-03-21 11:24:46 +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
钱涛 d7702d7cae 扣除名单编辑接口 2025-03-19 16:25:42 +08:00
钱涛 47dbfeb8db 确认名单反馈 2025-03-19 15:26:06 +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
钱涛 660a2718a1 扣减确认和反馈 2025-03-17 18:59:16 +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
钱涛 bad6928f34 删除确认名单 2025-03-14 15:56:28 +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
钱涛 a119e7c7cd 扣除确认接口 2025-03-12 13:55:59 +08:00
Harryxzy 25723af00a 社保福利台账增减人员 2025-03-11 15:18:05 +08:00
钱涛 12bbfeceae 增加扣除名单 2025-03-11 11:15:08 +08:00
钱涛 0eb2b140e9 修改申报反馈数据请求体 2025-03-10 17:46:40 +08:00
Harryxzy 5b66efa3cc 社保福利台账增减人员 2025-03-10 16:47:48 +08:00
Harryxzy 7da3e9262a 社保福利台账增减人员 2025-03-10 16:08:12 +08:00
钱涛 894b9cd1fc 1、扣除名单查询
2、扣除名单确认
2025-03-10 15:31:33 +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 e3dd2ad470 Merge branch 'release/3.0.0.2502.01' into custom/联特 2025-03-05 17:38:53 +08:00
Harryxzy 4776645a3d 联特 分段计算 2025-03-05 17:38:31 +08:00
钱涛 165a775074 刷新账套和扣缴义务人自关联 2025-03-05 16:42:13 +08:00
Harryxzy 671e2dd2da 其他免税扣除导入bug 2025-03-05 15:06:01 +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
钱涛 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
钱涛 a8dc1d4010 Merge branch 'feature/减免附表' into release/个税版本 2025-02-12 15:59:53 +08:00
钱涛 f26d96d56e 处理冲突 2025-02-12 14:16:17 +08:00
钱涛 f3577d3ddd Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
#	src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
#	src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/AddUpDeductionService.java
#	src/com/engine/salary/service/OtherDeductionService.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/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalarySobWrapper.java
2025-02-12 14:00:43 +08:00