c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、香樟工会讲堂->人员调整：添加代人报表（功能，系统管理员可用）

Browse Source 
2、费用报销管理->费用报销：添加弹窗须知（参数配置：ExpenseDeclaration）
This commit is contained in:
c-zhangr1
2026-04-10 10:27:05 +08:00
parent bcb5b3564e
commit 8c19109326
11 changed files with 404 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/budwk/app/WelfareTest.java
+6 -10
View File
@@ -79,22 +79,18 @@ public class WelfareTest {
List<NutMap> nutMaps = welfareService.listMap(sql);
List<HealthCheckupProjectSubject> healthCheckupProjectSubjects = dao.query(HealthCheckupProjectSubject.class,
Cnd.where(HealthCheckupProjectSubject::getProjectId, "=", "ccdc49e3d63b4a8cb89c0af0687bb1bf"));
Cnd.where(HealthCheckupProjectSubject::getProjectId, "=", "abbb89dec0244392ba2a19394cfc7a0a"));
List<HealthCheckupProjectSubjectMoney> healthCheckupProjectSubjectMoneyList = dao.query(HealthCheckupProjectSubjectMoney.class,
Cnd.where(HealthCheckupProjectSubjectMoney::getProjectId, "=", "ccdc49e3d63b4a8cb89c0af0687bb1bf"));
List<HealthCheckupUser> query = dao.query(HealthCheckupUser.class, Cnd.NEW());
Cnd.where(HealthCheckupProjectSubjectMoney::getProjectId, "=", "abbb89dec0244392ba2a19394cfc7a0a"));
List<PhysicalExamination> physicalExaminationList = ExcelImportUtil.importExcel(new File("C:\\Users\\mayn\\Desktop\\1.xlsx"), PhysicalExamination.class, new ImportParams());
physicalExaminationList = physicalExaminationList.stream()
.filter(e->query.stream().noneMatch(v->e.getLoginName().equals(v.getLoginName())))
.collect(Collectors.toList());
List<HealthCheckupUserSelection> userSelectionList = physicalExaminationList.stream().map(e -> {
List<HealthCheckupUserSelection> userSelectionList = physicalExaminationList.stream().filter(e->StringUtils.isNotBlank(e.getLoginName()))
.map(e -> {
NutMap nutMap = nutMaps.stream().filter(v -> e.getLoginName().equals(v.getString("loginname"))).findFirst().orElse(null);
HealthCheckupUserSelection userSelection = new HealthCheckupUserSelection();
if (ObjectUtil.isNotEmpty(nutMap)) {
userSelection.setSelectUserId(nutMap.getString("id"));
userSelection.setProjectId("ccdc49e3d63b4a8cb89c0af0687bb1bf");
userSelection.setProjectId("abbb89dec0244392ba2a19394cfc7a0a");
HealthCheckupProjectSubject healthCheckupProjectSubject = healthCheckupProjectSubjects.stream()
.filter(v -> e.getHealthExaminationHospital().equals(v.getOptionName()))
.findFirst().orElse(null);
@@ -107,7 +103,7 @@ public class WelfareTest {
List<HealthCheckupProjectSubjectMoney> healthCheckupProjectSubjectMonies = healthCheckupProjectSubjectMoneyList.stream()
.filter(v -> v.getSubjectId().equals(healthCheckupProjectSubject.getId()))
.collect(Collectors.toList());
healthCheckupProjectSubjectMonies = healthCheckupProjectSubjectMoneyList.stream()
healthCheckupProjectSubjectMonies = healthCheckupProjectSubjectMonies.stream()
.filter(v -> v.getMoney().compareTo(e.getMoney()) == 0
&& v.getSettlementMoney().compareTo(e.getSettlementMoney()) == 0)
.collect(Collectors.toList());