From b0c1fc168a8c09cde75cb17ef5a93b19893fd1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 14 Jan 2026 15:14:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- .../impl/SalaryAcctExcelServiceImpl.java | 24 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index 4ca5b1e88..d821d5c46 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=2.12.1.2403.02 +version=2.12.2.2403.02.s openFormulaForcedEditing=false \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index ff4a5ed41..10e671a2f 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -38,6 +38,7 @@ import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum; import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.SQLMapper; import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.service.*; import com.engine.salary.sys.constant.SalarySysConstant; @@ -47,6 +48,7 @@ import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.*; import com.engine.salary.util.db.IdGenerator; +import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtilPlus; @@ -170,6 +172,11 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc return ServiceUtil.getService(UfXzhlbServiceImpl.class, user); } + private SQLMapper getSQLMapper() { + return MapperProxyFactory.getProxy(SQLMapper.class); + } + + @Override public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) { ValidUtil.doValidator(queryParam); @@ -1930,17 +1937,21 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc baseBean.writeLog("批量调薪过滤查看, 查看人：" + param.getSpr() + "，查看时间：" + SalaryDateUtil.getFormatLocalDate(new Date()) + "，层级：" + param.getTxcj()); if (param.getTxcj() == 0) { // 一级 - rs.execute(" SELECT bdxr FROM uf_pltxjzgljmb where dxyjspr= " + param.getSpr()); - baseBean.writeLog("exc sql => SELECT bdxr FROM uf_pltxjzgljmb where dxyjspr= " + param.getSpr()); + String sql = " SELECT bdxr FROM uf_pltxjzgljmb where dxyjspr= " + param.getSpr(); + rs.execute(sql); + baseBean.writeLog("exc sql1 => " + sql); while (rs.next()) { int bdxr = rs.getInt("bdxr"); + String bdxr1 = rs.getString("bdxr"); + baseBean.writeLog("exc sql1 bdxr：" + bdxr +"bdxr1:"+bdxr1); // String gskjywr = rs.getString("gskjywr"); canManageList.add(pltxEmployeeDTO.builder().employee(Long.valueOf(bdxr)).build()); } } else { buildCanManageList(param, fieldList, canManageList); } - baseBean.writeLog("批量调薪过滤查看, 结果" + canManageList.stream().map(pltxEmployeeDTO::getEmployee)); + List bdxrs = canManageList.stream().map(pltxEmployeeDTO::getEmployee).collect(Collectors.toList()); + baseBean.writeLog("批量调薪过滤查看, 结果" + bdxrs); return canManageList; } @@ -1948,8 +1959,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc BaseBean baseBean = new BaseBean(); Integer txcj = param.getTxcj(); RecordSet rs = new RecordSet(); - rs.execute("SELECT bdxr FROM uf_pltxjzgljmb where " + fieldList.get(txcj) + "=" + param.getSpr()); - baseBean.writeLog("exc sql => SELECT bdxr FROM uf_pltxjzgljmb where " + fieldList.get(txcj) + "=" + param.getSpr()); + String sql = "SELECT bdxr FROM uf_pltxjzgljmb where " + fieldList.get(txcj) + "=" + param.getSpr(); + rs.execute(sql); + baseBean.writeLog("exc sql2 => " + sql); // List sprList = new ArrayList<>(); // for (int i = txcj; i > 0 ; i--) { @@ -1984,6 +1996,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc while (rs.next()) { int bdxr = rs.getInt("bdxr"); + String bdxr1 = rs.getString("bdxr"); + baseBean.writeLog("exc sql2 bdxr：" + bdxr +"bdxr1:"+bdxr1); // String gskjywr = rs.getString("gskjywr"); canManageList.add(pltxEmployeeDTO.builder().employee(Long.valueOf(bdxr)).build()); }