Commit Graph

3010 Commits

Author SHA1 Message Date
钱涛 be25234e0e 对比 2024-01-04 15:56:42 +08:00
钱涛 f3fa6c6f32 对比 2024-01-04 15:35:23 +08:00
Harryxzy 9ca420b5e6 fix删除义务人时,没分片 2024-01-04 10:39:41 +08:00
钱涛 482c461ce9 fix作废接口bug 2024-01-03 15:36:53 +08:00
钱涛 fcf0483365 补充申报表未填写状态 2024-01-03 13:47:19 +08:00
钱涛 4150948599 撤销更正申报 2024-01-03 10:40:55 +08:00
Harryxzy 7945c84fbb 薪资项目宽度 2024-01-02 16:37:07 +08:00
Harryxzy fe00f5c0e7 工资单发送action 2024-01-02 14:40:33 +08:00
Harryxzy dbcd6cc0b2 人员信息报送导入,申报状态 2024-01-02 13:46:14 +08:00
Harryxzy 4c233fb168 人员信息报送导入,申报状态 2024-01-02 13:44:57 +08:00
钱涛 4cdd7616d9 申报前清除错误日志 2024-01-02 10:18:25 +08:00
Harryxzy 573fa6b917 Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本 2024-01-02 09:41:42 +08:00
Harryxzy dc3533d753 人员信息报送导入分页 2024-01-02 09:41:30 +08:00
钱涛 ac2046a8e7 新增、删除申报表 2023-12-29 17:24:52 +08:00
钱涛 bca7697d75 取消全年一次性奖金限制 2023-12-29 11:46:00 +08:00
Harryxzy f03c0d0147 薪资项目同步至账套功能,过滤没有权限的账套 2023-12-29 10:27:35 +08:00
钱涛 79ba7c754c 申报反馈 2023-12-28 20:59:13 +08:00
钱涛 7c50e38867 脚本 2023-12-28 19:19:09 +08:00
钱涛 8456692b29 Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 18:49:05 +08:00
钱涛 b1e1aeffd7 Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 18:48:52 +08:00
钱涛 df16be5dd7 导入申报表 2023-12-28 18:45:52 +08:00
钱涛 463e56d2cf 导入申报表 2023-12-28 18:12:38 +08:00
Harryxzy 97f640b39a Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本 2023-12-28 16:44:14 +08:00
Harryxzy 622bd9ceb8 人员信息报送导入 2023-12-28 16:44:01 +08:00
钱涛 4d84164d48 Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 15:49:50 +08:00
钱涛 e2b341b675 Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 15:49:28 +08:00
钱涛 4a2996e211 Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
2023-12-28 15:48:54 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00
钱涛 06fe3144ba 导入模板 2023-12-28 15:37:01 +08:00
钱涛 fefb8264c8 导入功能 2023-12-28 15:36:27 +08:00
钱涛 4e0a5b4b7f 下载内置算税明细 2023-12-28 14:09:34 +08:00
钱涛 2befcfd1f2 pg脚本问题 2023-12-28 11:08:53 +08:00
钱涛 0a16415d9a Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 10:11:55 +08:00
Harryxzy 0f4d92f302 人员信息报送身份中号转为大写 2023-12-28 10:10:08 +08:00
钱涛 8b78ccd43b Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 09:51:34 +08:00
钱涛 1c499ffd94 补充正常工资薪金的申报 2023-12-28 09:39:09 +08:00
钱涛 7e561527ac 补充正常工资薪金的申报 2023-12-27 17:35:16 +08:00
钱涛 13f310e9e4 记录申报表数据来源 2023-12-27 17:33:53 +08:00
Harryxzy 2dc7e7f541 人员信息报送导入 2023-12-27 16:58:47 +08:00
钱涛 14c97d8df9 日志 2023-12-27 14:26:25 +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
Harryxzy 2797745448 人员信息报送-导入 2023-12-26 17:45:06 +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