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

调薪日志

This commit is contained in:
钱涛 2026-03-17 15:38:50 +08:00
parent 61418516af
commit 63f833d9d8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/action/EditSalaryAction.java
View File

@ -87,6 +87,7 @@ public class EditSalaryAction implements Action {
Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).adjustmentSalaryArchive(build); Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).adjustmentSalaryArchive(build);
List errorNotice = (List) map.get("errorNotice"); List errorNotice = (List) map.get("errorNotice");
log.info("EditSalaryAction，tableName ：{}，workflowid：{}，errorNotice：{}",tableName, requestInfo.getWorkflowid(), errorNotice);
if (CollectionUtils.isNotEmpty(errorNotice)) { if (CollectionUtils.isNotEmpty(errorNotice)) {
log.error("调薪存在异常 requestId:{} map:{}", requestInfo.getRequestid(), map); log.error("调薪存在异常 requestId:{} map:{}", requestInfo.getRequestid(), map);
// List<Map<String, String>> excelComments = (List<Map<String, String>>) map.get("errorNotice"); // List<Map<String, String>> excelComments = (List<Map<String, String>>) map.get("errorNotice");

7
src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
View File

@ -40,6 +40,7 @@ import com.engine.salary.util.excel.ExcelParseHelper;
import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelSupport;
import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.excel.ExcelUtilPlus;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
@ -60,6 +61,7 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX;
* @Author: wangxiangzhong * @Author: wangxiangzhong
* @Date: 2021-11-03 10:51 * @Date: 2021-11-03 10:51
*/ */
@Slf4j
public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArchiveExcelService { public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArchiveExcelService {
private SalaryArchiveItemService salaryArchiveItemService(User user) { private SalaryArchiveItemService salaryArchiveItemService(User user) {
@ -573,6 +575,8 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// 错误sheet数据 // 错误sheet数据
List<Map<String, Object>> errorData = new ArrayList<>(); List<Map<String, Object>> errorData = new ArrayList<>();
log.info("processInit1 param:{}", param);
for (int i = 0; i < data.size(); i++) { for (int i = 0; i < data.size(); i++) {
Map<String, Object> map = data.get(i); Map<String, Object> map = data.get(i);
List<String> headers = Lists.newArrayList(); List<String> headers = Lists.newArrayList();
@ -586,6 +590,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
} }
} }
boolean isValidHeader = checkHeaders(importHandleParam, message, headers); boolean isValidHeader = checkHeaders(importHandleParam, message, headers);
log.info("processInit2 checkHeaders:{}", isValidHeader);
if (!isValidHeader) { if (!isValidHeader) {
excelComments.add(message); excelComments.add(message);
Map<String, Object> apidatas = new HashMap<>(); Map<String, Object> apidatas = new HashMap<>();
@ -600,6 +605,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
map.put("index", i + 2); map.put("index", i + 2);
// 3.校验行内容 // 3.校验行内容
boolean isError = SalaryArchiveExcelBO.singleRowCheck(allTodoSalaryArchives, map, headers, effectiveTimeIndex, excelComments, errorCount, importHandleParam, user); boolean isError = SalaryArchiveExcelBO.singleRowCheck(allTodoSalaryArchives, map, headers, effectiveTimeIndex, excelComments, errorCount, importHandleParam, user);
log.info("processInit3 singleRowCheck:{}", isError);
if (isError) { if (isError) {
errorCount += 1; errorCount += 1;
// 添加错误数据 // 添加错误数据
@ -628,6 +634,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// 4.数据入库处理 // 4.数据入库处理
if (param.isAddData()) { if (param.isAddData()) {
handleImportData(importHandleParam); handleImportData(importHandleParam);
log.info("processInit4 handleImportData:{}", importHandleParam);
} }
Map<String, Object> apidatas = new HashMap<>(); Map<String, Object> apidatas = new HashMap<>();