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

考勤列表和导出

This commit is contained in:
钱涛 2023-02-06 16:28:56 +08:00
parent 0fb9fb51a0
commit 2ff5ff0dce
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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, "工号")); header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
// 动态列 // 动态列
if (CollectionUtils.isNotEmpty(listMaps)) { if (CollectionUtils.isNotEmpty(listMaps)) {
Map<String, Object> mapColumn = listMaps.get(0);
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { 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")); row.add(dto.get("jobNum"));
// 动态列 // 动态列
Map<String, Object> mapColumn = listMaps.get(0);
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { 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); 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); getAttendQuoteFieldMapper().updateNameByCode(updates);
} }
// 2.删除 // 2.删除
if (CollectionUtils.isNotEmpty(deleteCodes)) { // if (CollectionUtils.isNotEmpty(deleteCodes)) {
//根据考勤字段编码删除考勤模块字段 // //根据考勤字段编码删除考勤模块字段
biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build()); // biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build());
} // }
// 3.新增 // 3.新增
List<AttendQuoteFieldPO> saves = new ArrayList<>(); List<AttendQuoteFieldPO> saves = new ArrayList<>();
for (String code : saveCodes) { 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 { public class AttendQuoteDataWrapper extends Service {
private AttendQuoteDataService getAttendQuoteDataService(User user) { private AttendQuoteDataService getAttendQuoteDataService(User user) {
return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user); return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
} }
private AttendQuoteFieldService getAttendQuoteFieldService(User 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")); columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum"));
// 动态列 // 动态列
if (CollectionUtils.isNotEmpty(listMaps)) { if (CollectionUtils.isNotEmpty(listMaps)) {
Map<String, Object> map = listMaps.stream().max(Comparator.comparingInt(m -> m.keySet().size())).get();
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { 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); return getAttendQuoteDataService(user).getData(attendQuoteDataEditParam);
} }
} }