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

调薪日志

This commit is contained in:
钱涛 2026-01-14 15:14:18 +08:00
parent 663e8748ae
commit b0c1fc168a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -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

24
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -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<Long> 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<Integer> 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());
}