 钱涛
|
5d3e2928c9
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-13 16:54:46 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
钱涛
|
59f24d3a14
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-09 16:15:21 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
钱涛
|
bb2d2d64e6
|
在线申报接口
|
2023-08-21 19:35:14 +08:00 |
|
钱涛
|
e75d5ab427
|
v1
|
2023-07-20 10:36:29 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
d5977c053b
|
添加删除脚本
|
2023-07-13 09:19:16 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
钱涛
|
f5ce086535
|
上线脚本
|
2023-06-26 15:48:25 +08:00 |
|
钱涛
|
1cdbe4d19d
|
薪酬开关配置
|
2023-06-14 16:26:25 +08:00 |
|
钱涛
|
34046646b3
|
还原脚本
|
2023-06-12 15:17:21 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
5cb6752c4c
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 17:32:17 +08:00 |
|
钱涛
|
a87c344581
|
个人养老金
|
2023-04-13 17:14:58 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
钱涛
|
f0eb9c8994
|
养老金最终版
|
2023-04-12 13:57:13 +08:00 |
|
钱涛
|
671bbc6bfb
|
养老金最终版
|
2023-04-12 10:51:52 +08:00 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
09b2bf54e1
|
暂存
|
2023-04-11 09:22:09 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
79a29df0de
|
暂存
|
2023-03-03 14:40:17 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
钱涛
|
a8fc666e79
|
fix json转换问题
|
2023-03-02 10:12:00 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
258c880543
|
申报表字段缺失
|
2023-02-03 15:14:04 +08:00 |
Harryxzy
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
d72362f7b7
|
档案模板注释
|
2022-10-26 18:05:04 +08:00 |
|
钱涛
|
a2716c4330
|
处理档案重复生成的问题
|
2022-10-19 13:36:31 +08:00 |
|
钱涛
|
4b37775f78
|
档案发薪设置
|
2022-10-18 09:43:58 +08:00 |
|
钱涛
|
919d08a496
|
修复工资单查询
|
2022-09-29 10:28:46 +08:00 |
|
钱涛
|
299bbf1f66
|
达梦适配
|
2022-09-05 15:50:01 +08:00 |
|
钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
钱涛
|
ab87e5cf08
|
劳务申报表列表
|
2022-08-02 10:59:12 +08:00 |
|
钱涛
|
a252d055ab
|
1、核算接口代理
2、获取异常真实信息
|
2022-08-01 14:15:09 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
db31190b9e
|
调整sql配置
|
2022-07-25 15:01:10 +08:00 |
|
钱涛
|
8e69159900
|
薪资档案代码合并
|
2022-07-21 10:51:38 +08:00 |
|
钱涛
|
77ca4c2848
|
Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2022-07-21 09:43:02 +08:00 |
|
钱涛
|
967413827e
|
修改社保个人实际承担方为个人
|
2022-07-20 14:25:01 +08:00 |
|
钱涛
|
a721898d3d
|
薪资档案增加起始发薪和最后发薪
|
2022-07-18 18:08:59 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
317c04a121
|
公式编辑器，防止参数名和字段名呈现一对多的问题
|
2022-06-30 11:10:46 +08:00 |
|
钱涛
|
739414dd04
|
fix
|
2022-06-24 18:41:24 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
3682ebd4f2
|
fix
|
2022-06-24 15:18:00 +08:00 |
|
钱涛
|
f680aa27d9
|
fix
|
2022-06-23 18:05:48 +08:00 |