Commit Graph

18 Commits

Author SHA1 Message Date
钱涛 f6428be044 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-05-09 16:23:53 +08:00
钱涛 ca75a5f403 fix导出明细 2025-04-29 16:57:33 +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 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 be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +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
钱涛 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 e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
Harryxzy 54823f2fbd 个税申报-在线对比 2024-02-29 18:09:58 +08:00
钱涛 db71ba0e5f fix null 2023-10-12 14:13:25 +08:00
Harryxzy efa818f8b9 核算结果导出数值项excel格式为数值 2023-09-21 13:36:23 +08:00
sy d56e9aff82 薪酬系统,导出excel的title行背景置为灰色 2023-04-23 13:35:17 +08:00
sy 31bf7cfd99 薪酬系统-薪资核算和档案,excel导出行高自适应 2023-03-30 17:26:55 +08:00
sy dc2cb5f448 薪酬系统-薪资核算,薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
sy acc382b835 薪酬系统-薪资核算,核算导出excel格式改造 2023-03-15 10:20:46 +08:00