Commit Graph

36 Commits

Author SHA1 Message Date
Harryxzy 381c705cf8 人员信息报送、个税申报表日志 2024-03-07 09:29:59 +08:00
钱涛 5a9d45f92b Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/util/page/SalaryPageUtil.java
2024-03-06 15:54:07 +08:00
Harryxzy 093cb34f77 操作日志fix some bugs 2024-02-23 15:11:56 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
钱涛 079b7de258 合并240101 2024-02-21 15:35:08 +08:00
Harryxzy 3dd1c44459 核算时核算校验bug 2024-02-04 10:55:40 +08:00
钱涛 ac2046a8e7 新增、删除申报表 2023-12-29 17:24:52 +08:00
钱涛 13f310e9e4 记录申报表数据来源 2023-12-27 17:33:53 +08:00
钱涛 c581c8d74d 导出申报表明细 2023-12-20 17:21:46 +08:00
钱涛 895da67d46 Merge branch 'release/2.9.8.2311.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/util/SalaryDateUtil.java
2023-11-28 15:09:51 +08:00
钱涛 e0f7ec3256 申报表提示日期优化 2023-11-22 16:37:48 +08:00
钱涛 6059174e7c 往期累计的在线获取 2023-09-06 09:40:50 +08:00
钱涛 0d8606c956 在线申报接口 2023-08-17 19:04:20 +08:00
钱涛 b1817142b0 个税对接,个税申报接口 2023-08-14 20:07:29 +08:00
钱涛 dc63897165 个税对接,个税申报接口 2023-08-11 14:20:14 +08:00
Harryxzy c37750b538 撤回个税申报 2023-06-12 10:40:01 +08:00
钱涛 2c13c138a6 校验每次只能申报一个扣缴义务人 2023-03-07 17:44:21 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +08:00
钱涛 a1cecd4041 申报表日志 2022-09-21 14:58:59 +08:00
钱涛 d62473c356 修复往期累计情况 2022-08-08 17:45:18 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
钱涛 1d90bb148e 修复往期累计导入数量限制 2022-07-13 09:53:11 +08:00
钱涛 7301ee1033 1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
2022-07-06 16:42:13 +08:00
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 6646a2e481 申报表的分权 2022-06-02 18:02:27 +08:00
钱涛 e1b579d480 暂存 2022-05-25 13:10:03 +08:00
钱涛 d2a37df97f 申报表异常 2022-05-09 11:46:49 +08:00
18895359881@163.com bfdb9a33d5 个税申报表接口 2022-04-19 20:58:30 +08:00
18895359881@163.com 6fce8cdf4c 薪酬接口 2022-04-18 18:56:17 +08:00
18895359881@163.com 3e64b1cfde 薪酬接口 2022-04-16 15:33:51 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 87d278448c 暂存税率表接口 2022-03-02 09:54:55 +08:00
钱涛 fb42a5f041 删除接口ids改为json入参 2022-03-01 18:49:22 +08:00