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

Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02

This commit is contained in:
钱涛 2023-02-09 17:31:42 +08:00
parent 5feed81803 2ff5ff0dce
commit 995689bb1d
5 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
View File

@ -104,8 +104,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
List<Map<String, String>> list = new ArrayList<>();
try {
Map<String, Object> paramsMap = new HashMap<String, Object>();
// paramsMap.put("pageIndex", 1);
// paramsMap.put("pageSize", 500);
paramsMap.put("pageIndex", 1);
paramsMap.put("pageSize", 500);
paramsMap.put("typeselect", "6");
paramsMap.put("fromDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getBeginDate()));
paramsMap.put("toDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getEndDate()));

10
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -244,11 +244,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
// 动态列
if (CollectionUtils.isNotEmpty(listMaps)) {
Map<String, Object> mapColumn = listMaps.get(0);
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
header.add(attendQuoteField.getFieldName());
}
header.add(attendQuoteField.getFieldName());
}
}
@ -264,11 +261,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
row.add(dto.get("jobNum"));
// 动态列
Map<String, Object> mapColumn = listMaps.get(0);
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData"));
}
row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData"));
}
rows.add(row);
}

8
src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
View File

@ -275,10 +275,10 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
getAttendQuoteFieldMapper().updateNameByCode(updates);
}
// 2.删除
if (CollectionUtils.isNotEmpty(deleteCodes)) {
//根据考勤字段编码删除考勤模块字段
biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build());
}
// if (CollectionUtils.isNotEmpty(deleteCodes)) {
// //根据考勤字段编码删除考勤模块字段
// biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build());
// }
// 3.新增
List<AttendQuoteFieldPO> saves = new ArrayList<>();
for (String code : saveCodes) {

11
src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
View File

@ -32,11 +32,11 @@ import java.util.*;
public class AttendQuoteDataWrapper extends Service {
private AttendQuoteDataService getAttendQuoteDataService(User user) {
return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
}
private AttendQuoteFieldService getAttendQuoteFieldService(User user) {
return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
}
/**
@ -82,11 +82,8 @@ public class AttendQuoteDataWrapper extends Service {
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum"));
// 动态列
if (CollectionUtils.isNotEmpty(listMaps)) {
Map<String, Object> map = listMaps.stream().max(Comparator.comparingInt(m -> m.keySet().size())).get();
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
if (map.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData"));
}
columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData"));
}
}
@ -153,7 +150,7 @@ public class AttendQuoteDataWrapper extends Service {
/**
* 获取数据
*/
public Map<String, Object> getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
public Map<String, Object> getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
return getAttendQuoteDataService(user).getData(attendQuoteDataEditParam);
}
}

6
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -264,7 +264,11 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
if (CollectionUtils.isNotEmpty(listAll)) {
listAll.removeIf(a -> a.getId().equals(m.getId()));
}
Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst();
Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream()
.filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()))
.filter(f ->f.getSalaryItemId().equals(m.getSalaryItemId()))
.filter(f->f.getEffectiveTime().before(m.getEffectiveTime()))
.findFirst();
m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : "");
m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason()));