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

操作者

This commit is contained in:
钱涛 2022-12-16 10:32:45 +08:00
parent 02f3c164a3
commit 2fbd66ac19
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/action/BatEditSalaryExcelAction.java
View File

@ -35,6 +35,16 @@ public class BatEditSalaryExcelAction implements Action {
this.batSalaryExcelField = batSalaryExcelField;
}
private String operatorField;
public String getOperatorField() {
return operatorField;
}
public void setOperatorField(String operatorField) {
this.operatorField = operatorField;
}
@Override
public String execute(RequestInfo requestInfo) {
try {
@ -60,7 +70,10 @@ public class BatEditSalaryExcelAction implements Action {
.isProcess(true)
.build();
Map<String, Object> map = getSalaryArchiveExcelService(new User()).batchImportEbatch(param);
//操作人
String uid = fieldMap.getOrDefault(operatorField, "1");
Map<String, Object> map = getSalaryArchiveExcelService(new User(Integer.parseInt(uid))).batchImportEbatch(param);
int errorCount = (int) map.get("errorCount");
if (errorCount > 0) {
log.error("批量调薪存在异常 requestId:{} map:{}",requestInfo.getRequestid(), map);

16
src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java
View File

@ -36,6 +36,16 @@ public class CheckBatEditSalaryExcelAction implements Action {
this.batSalaryExcelField = batSalaryExcelField;
}
private String operatorField;
public String getOperatorField() {
return operatorField;
}
public void setOperatorField(String operatorField) {
this.operatorField = operatorField;
}
@Override
public String execute(RequestInfo requestInfo) {
try {
@ -60,10 +70,12 @@ public class CheckBatEditSalaryExcelAction implements Action {
.isProcess(true)
.build();
Map<String, Object> map = getSalaryArchiveExcelService(new User()).batchImportEbatch(param);
//操作人
String uid = fieldMap.getOrDefault(operatorField, "1");
Map<String, Object> map = getSalaryArchiveExcelService(new User(Integer.parseInt(uid))).batchImportEbatch(param);
int errorCount = (int) map.get("errorCount");
if (errorCount > 0) {
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");
StringBuilder message = new StringBuilder("excel中");
for (Map<String, String> comments : excelComments) {

5
src/com/engine/salary/action/CheckEditSalaryAction.java
View File

@ -65,7 +65,10 @@ public class CheckEditSalaryAction implements Action {
SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
.importDatas(importData)
.build();
Map<String, Object> map = getSalaryArchiveWrapper(new User()).checkAdjustmentSalaryArchive(build);
//操作人
String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1");
Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).checkAdjustmentSalaryArchive(build);
List errorNotice = (List) map.get("errorNotice");
if (CollectionUtils.isNotEmpty(errorNotice)) {

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

@ -65,11 +65,14 @@ public class EditSalaryAction implements Action {
SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
.importDatas(importData)
.build();
Map<String, Object> map = getSalaryArchiveWrapper(new User()).adjustmentSalaryArchive(build);
//操作人
String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1");
Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).adjustmentSalaryArchive(build);
List errorNotice = (List) map.get("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");
// StringBuilder message = new StringBuilder("");
// for (Map<String, String> comments : excelComments) {