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

联特报表调整

This commit is contained in:
Harryxzy 2025-08-14 15:17:19 +08:00
parent f491daeea0
commit b2354d00c6
2 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/dto/LtSalaryReportConfigDTO.java
View File

@ -23,4 +23,6 @@ public class LtSalaryReportConfigDTO {
// 数据库字段名
private String field;
private Integer text;
}

40
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -2299,13 +2299,23 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
for (LtSalaryReportConfigDTO dto : reportConfigs) {
BigDecimal val = new BigDecimal("0");
String textVal = "";
if (singleAcctResultMap != null) {
String valStr = Utils.null2String(singleAcctResultMap.getOrDefault(Utils.null2String(dto.getItem()), "0"));
if (dto.getText() == null || !dto.getText().equals(1)) {
if (NumberUtils.isCreatable(valStr)) {
val = new BigDecimal(valStr);
}
} else {
textVal = valStr;
}
}
if (dto.getText() == null || !dto.getText().equals(1)) {
firstSb.append(",").append(val.toPlainString());
} else {
firstSb.append(",'").append(textVal).append("'");
}
}
firstSb.append(")");
rs.execute(firstSb.toString());
@ -2373,13 +2383,22 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
for (LtSalaryReportConfigDTO dto : reportConfigs) {
BigDecimal val = new BigDecimal("0");
String textVal = "";
if (singleAcctResultMap != null) {
String valStr = Utils.null2String(singleAcctResultMap.getOrDefault(Utils.null2String(dto.getItem()), "0"));
if (dto.getText() == null || !dto.getText().equals(1)) {
if (NumberUtils.isCreatable(valStr)) {
val = new BigDecimal(valStr);
}
} else {
textVal = valStr;
}
}
if (dto.getText() == null || !dto.getText().equals(1)) {
sb.append(",").append(val.toPlainString());
} else {
sb.append(",'").append(textVal).append("'");
}
}
sb.append("),");
}
@ -2552,13 +2571,23 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
for (LtSalaryReportConfigDTO dto : reportConfigs) {
BigDecimal val = new BigDecimal("0");
String textVal = "";
if (singleAcctResultMap != null) {
String valStr = Utils.null2String(singleAcctResultMap.getOrDefault(Utils.null2String(dto.getItem()), "0"));
if (dto.getText() == null || !dto.getText().equals(1)) {
if (NumberUtils.isCreatable(valStr)) {
val = new BigDecimal(valStr);
}
} else {
textVal = valStr;
}
}
if (dto.getText() == null || !dto.getText().equals(1)) {
firstSb.append(",").append(val.toPlainString());
} else {
firstSb.append(",'").append(textVal).append("'");
}
}
firstSb.append(")");
rs.execute(firstSb.toString());
@ -2601,13 +2630,24 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
for (LtSalaryReportConfigDTO dto : reportConfigs) {
BigDecimal val = new BigDecimal("0");
String textVal = "";
if (singleAcctResultMap != null) {
String valStr = Utils.null2String(singleAcctResultMap.getOrDefault(Utils.null2String(dto.getItem()), "0"));
if (dto.getText() == null || !dto.getText().equals(1)) {
if (NumberUtils.isCreatable(valStr)) {
val = new BigDecimal(valStr);
}
} else {
textVal = valStr;
}
}
if (dto.getText() == null || !dto.getText().equals(1)) {
sb.append(",").append(val.toPlainString());
} else {
sb.append(",'").append(textVal).append("'");
}
}
sb.append("),");
}