Harryxzy
|
fda791624e
|
获取token增加https配置
|
2024-12-19 16:34:32 +08:00 |
 钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +08:00 |
|
Harryxzy
|
9daa406d83
|
优化token接口，避免不配时报错
|
2024-11-28 13:33:03 +08:00 |
|
钱涛
|
199fe67374
|
适配港澳台通行证
|
2024-11-19 16:44:08 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +08:00 |
|
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
Harryxzy
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
钱涛
|
06d6854ff3
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-10-15 14:29:08 +08:00 |
|
Harryxzy
|
310c77a270
|
excel设置列宽 超过255报错
|
2024-10-11 15:14:21 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
钱涛
|
1851457a6f
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/enums/SalaryOnOffEnum.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/SalarySobItemService.java
# src/com/engine/salary/service/TaxAgentService.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-08-23 10:08:08 +08:00 |
|
Harryxzy
|
59820f6aca
|
Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01
|
2024-08-20 14:03:58 +08:00 |
|
Harryxzy
|
2a58b4972b
|
薪资核算导入支持vlookup函数
|
2024-08-20 13:48:31 +08:00 |
|
钱涛
|
9fae93fcd7
|
Merge branch 'feature/导入工具' into release/2.15.1.2407.01
|
2024-08-20 11:40:33 +08:00 |
|
Harryxzy
|
656236367a
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2024-08-16 15:42:50 +08:00 |
|
Harryxzy
|
8742ee7857
|
Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01
|
2024-08-16 15:27:15 +08:00 |
|
钱涛
|
22c99e081d
|
支持Vlookup
|
2024-08-16 14:39:01 +08:00 |
|
钱涛
|
4b9341cc98
|
支持Vlookup
|
2024-08-16 14:13:59 +08:00 |
|
钱涛
|
4b30292c6c
|
支持Vlookup
|
2024-08-16 14:07:16 +08:00 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
48120f8e24
|
导入薪资项目
|
2024-08-07 09:06:09 +08:00 |
|
钱涛
|
e45ee09c7e
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
|
2024-07-16 17:25:37 +08:00 |
|
Harryxzy
|
84ce2821f6
|
1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
|
2024-07-10 14:01:09 +08:00 |
|
钱涛
|
0c22a57f19
|
取消刷新缴款状态
取消线下缴款逻辑
|
2024-07-04 10:32:09 +08:00 |
|
钱涛
|
de257568f1
|
轮询处理方式
记录接口日志
|
2024-06-26 14:56:43 +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 |
|
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 |
|
Harryxzy
|
e249de9a59
|
报表导出单元格格式
|
2024-06-12 16:01:09 +08:00 |
|
钱涛
|
e1e00f4db0
|
在线算税v1
|
2024-06-06 13:51:33 +08:00 |
|
钱涛
|
ec5463c050
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-05-27 10:37:39 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
|
钱涛
|
3dc8f6d57c
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-20 09:56:12 +08:00 |
|
钱涛
|
26d6efd827
|
pdf日志
|
2024-05-17 10:58:38 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
钱涛
|
6b0606f5a4
|
自适应
|
2024-05-07 17:37:02 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
4f391a2159
|
工资单审批
|
2024-04-26 11:24:47 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
6cfeb70f9c
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-12 17:47:40 +08:00 |
|
钱涛
|
23eba4950b
|
处理pdf生成
|
2024-04-11 15:23:23 +08:00 |
|
钱涛
|
6a05269b2d
|
处理LIKE函数
|
2024-04-10 14:20:30 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
Harryxzy
|
5d0b8e7759
|
导出excel单元格格式
|
2024-03-18 14:01:08 +08:00 |
|
钱涛
|
452d7bc57c
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2024-03-12 18:56:12 +08:00 |