diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java index 579b6e89..e1cc57c4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java @@ -85,7 +85,7 @@ public class HealthCheckupListController { @At @ApiOperation("分页查询") @SaCheckPermission("healthCheckup.list.mange") - public Result pageData(PageForm pageForm, String projectId, + public Result pageData(PageForm pageForm, String projectId, String subjectId, String unionId, String unitId,String physicalExaminationStatus) { List confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId)); @@ -118,6 +118,7 @@ public class HealthCheckupListController { cnd.andEX("hcu.projectId", "=", projectId); cnd.andEX("hcu.unionId", "=", unionId); cnd.andEX("hcu.unitId", "=", unitId); + cnd.andEX("hcus.subjectId", "=", subjectId); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId()); @@ -416,4 +417,14 @@ public class HealthCheckupListController { return Result.success(excelImportRes); } + + @At + @ApiOperation("套餐选择器查询") + @SaCheckPermission("healthCheckup.list.mange") + public Result listSubjects(String projectId){ + return Result.success( + dao.query(HealthCheckupProjectSubject.class, + Cnd.NEW().and("projectId","=",projectId)) + ); + } } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java index 050bfba9..5f836f81 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java @@ -156,6 +156,11 @@ public class HealthCheckupSingleController { substring = Integer.parseInt(v.getString("idCard").substring(6, 10)); } v.put("age", thisYear - substring); + if(v.getString("personType").contains("在职教职工")){ + v.put("personType", "在职教职工"); + } else if(v.getString("personType").contains("校聘高知")){ + v.put("personType", "校聘高知保健对象"); + } }); List list2 = list.stream().filter(v -> Strings.isNotBlank(v.getString("unionName"))).collect(Collectors.toList()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java index 66d34d09..fd38175c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java @@ -102,9 +102,9 @@ public class HealthCheckupProjectServiceImpl extends BaseServiceImpl - - - + + + + + + + + @@ -215,6 +226,7 @@ layout("/layouts/platform.html"){ physicalExaminationStatus: '2', }, unions: [], + subjects: [], units: [], projectOptions: [], projectSubjectOptions: [], @@ -322,6 +334,9 @@ layout("/layouts/platform.html"){ } else { this.notifyError(resp.msg) } + this.$set(this.pageForm, "subjectId", "") + await this.listSubjects(); + this.doSearch(); }, async queryCampus() { const resp = await $.get("/platform/healthCheckup/campus/queryCampus") @@ -339,6 +354,17 @@ layout("/layouts/platform.html"){ this.units = await this.$businessTool.listUnit() } }, + async listSubjects() { + const resp = await $.get(loc() + "/listSubjects", { + projectId: this.pageForm.projectId, + unionId: this.pageForm.unionId + }) + if (resp.code === 0) { + this.subjects = resp.data + } else { + this.notifyError(resp.msg) + } + }, openImport() { // importUser diff --git a/src/test/java/com/budwk/app/WelfareTest.java b/src/test/java/com/budwk/app/WelfareTest.java index 98b1ce4f..a9cfc082 100644 --- a/src/test/java/com/budwk/app/WelfareTest.java +++ b/src/test/java/com/budwk/app/WelfareTest.java @@ -19,6 +19,7 @@ import cn.hutool.json.JSONUtil; import com.budwk.app.sys.models.*; import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubject; import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubjectMoney; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUser; import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserSelection; import com.budwk.app.zhgh.welfare.model.WelfareList; import com.budwk.app.zhgh.welfare.model.WelfareProjectSubjectOption; @@ -82,7 +83,12 @@ public class WelfareTest { List healthCheckupProjectSubjectMoneyList = dao.query(HealthCheckupProjectSubjectMoney.class, Cnd.where(HealthCheckupProjectSubjectMoney::getProjectId, "=", "ccdc49e3d63b4a8cb89c0af0687bb1bf")); + List query = dao.query(HealthCheckupUser.class, Cnd.NEW()); + List 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 userSelectionList = physicalExaminationList.stream().map(e -> { NutMap nutMap = nutMaps.stream().filter(v -> e.getLoginName().equals(v.getString("loginname"))).findFirst().orElse(null); HealthCheckupUserSelection userSelection = new HealthCheckupUserSelection();