Commit Graph

4161 Commits

Author SHA1 Message Date
钱涛 458f10d09b 优化考勤引用 2024-06-28 15:42:10 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 77708b96ab 升级1 2024-06-28 14:02:05 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 d267810e5c 处理报表bug 2024-06-27 11:30:35 +08:00
钱涛 68467fbe46 升级作废申报 2024-06-27 11:19:34 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
钱涛 65fcfb8fac 更正申报 2024-06-27 09:30:25 +08:00
钱涛 de257568f1 轮询处理方式
记录接口日志
2024-06-26 14:56:43 +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
钱涛 5cffdbc8e6 更正申报接口 2024-06-25 09:38:20 +08:00
钱涛 325e7609b7 1、欠费查询(下架)
2、获取欠费查询反馈(下架)
2024-06-24 17:07:36 +08:00
钱涛 610c824e69 局端申报状态查询(下架) 2024-06-24 17:05:41 +08:00
钱涛 d0da02119d 企业申报数据明细查询 (下架) 2024-06-24 17:02:53 +08:00
钱涛 bae85b761c 申报内置算税结果查询(下架) 2024-06-24 16:52:42 +08:00
钱涛 90a198bb54 1、作废人员信息(下架)
2、企业人员列表查询(下架)
3、关键信息变更(下架)
2024-06-24 16:32:15 +08:00
钱涛 fda10a06ae 1、企业登记及查询服务升级
2、申报密码校验服务升级
2024-06-24 16:23:32 +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
钱涛 3a17e8c833 Merge branch 'release/个税版本' into feature/在线算税 2024-06-21 13:59:00 +08:00
钱涛 d5dd3093cb 处理冲突 2024-06-21 13:38:44 +08:00
钱涛 02be1b9da4 Merge branch 'release/2.14.4.2406.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
2024-06-21 10:53:59 +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
钱涛 ba49d66b46 在线算税日志 2024-06-20 10:39:40 +08:00
钱涛 0df6169152 在线获取累计专项附加扣除 2024-06-19 17:05:46 +08:00
钱涛 24a979507a 未报送人员列表 2024-06-19 11:37:31 +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
钱涛 d52e146001 在线算税时校验人员是否已报送 2024-06-19 09:53:46 +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
钱涛 af8cce8525 在线算税,个税对应规则 2024-06-17 17:03:48 +08:00