qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

This commit is contained in:
钱涛 2025-05-20 16:45:46 +08:00
parent bb84021758 81e87ec9ce
commit 79f23e4e5a
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/engine/salary/util/excel/ExcelUtil.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.util.excel; package com.engine.salary.util.excel;
import cn.hutool.core.util.StrUtil;
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO;
import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.SalaryI18nUtil;
@ -139,8 +140,10 @@ public class ExcelUtil {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@ -235,8 +238,10 @@ public class ExcelUtil {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@ -311,8 +316,10 @@ public class ExcelUtil {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
@ -377,8 +384,10 @@ public class ExcelUtil {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));
@ -458,8 +467,10 @@ public class ExcelUtil {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));

45
src/com/engine/salary/util/excel/ExcelUtilPlus.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.util.excel; package com.engine.salary.util.excel;
import cn.hutool.core.util.StrUtil;
import com.engine.salary.component.WeaTableColumnGroup; import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryDateUtil;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@ -191,8 +192,10 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
if (lastRowRed && rowIndex == rowList.size() - 1) { if (lastRowRed && rowIndex == rowList.size() - 1) {
cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex))); cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex)));
@ -200,8 +203,7 @@ public class ExcelUtilPlus {
cell.setCellStyle(numberCellStyleMap.get(patternList.get(cellIndex))); cell.setCellStyle(numberCellStyleMap.get(patternList.get(cellIndex)));
} }
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
double value = o == null ? 0 : ((BigDecimal) o).doubleValue(); cell.setCellValue(((BigDecimal) o).doubleValue());
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));
@ -221,6 +223,7 @@ public class ExcelUtilPlus {
} }
return workbook; return workbook;
} }
public static XSSFWorkbook genWorkbookV2(List<List<Object>> rowList, String sheetName) { public static XSSFWorkbook genWorkbookV2(List<List<Object>> rowList, String sheetName) {
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
@ -281,11 +284,13 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(((BigDecimal) o).doubleValue());
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));
@ -368,8 +373,10 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));
@ -477,11 +484,13 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(((BigDecimal) o).doubleValue());
} else if (o instanceof Boolean) { } else if (o instanceof Boolean) {
cell.setCellType(CellType.BOOLEAN); cell.setCellType(CellType.BOOLEAN);
cell.setCellValue(String.valueOf(o)); cell.setCellValue(String.valueOf(o));
@ -675,8 +684,10 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
if (lastRowRed && rowIndex == rowList.size() - 1) { if (lastRowRed && rowIndex == rowList.size() - 1) {
cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex))); cell.setCellStyle(numberRedCellStyleMap.get(patternList.get(cellIndex)));
@ -840,8 +851,10 @@ public class ExcelUtilPlus {
} }
Object o = infoList.get(cellIndex); Object o = infoList.get(cellIndex);
if (o instanceof String) { if (o instanceof String) {
cell.setCellType(CellType.STRING); if (StrUtil.isNotBlank(String.valueOf(o))) {
cell.setCellValue(String.valueOf(o)); cell.setCellType(CellType.STRING);
cell.setCellValue(String.valueOf(o));
}
} else if (o instanceof BigDecimal) { } else if (o instanceof BigDecimal) {
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue()); cell.setCellValue(o == null ? 0 : ((BigDecimal) o).doubleValue());