From ddb5a1ffcbd096aa5ea05089d4ed3d81d75169ae Mon Sep 17 00:00:00 2001 From: zhangrui Date: Thu, 16 Apr 2026 16:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=87=AA=E8=81=98=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthCheckupListController.java | 27 +++---------------- .../HealthCheckupSingleController.java | 5 ++-- .../service/HealthCheckupSingleService.java | 2 +- .../impl/HealthCheckupSingleServiceImpl.java | 15 ++++------- .../template/HealthCheckupImportTemp.java | 3 --- .../healthCheckup/listMange/index.html | 25 ----------------- .../healthCheckup/statisticsSingle/index.html | 10 ------- 7 files changed, 12 insertions(+), 75 deletions(-) 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 becea4da..47661050 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 @@ -99,7 +99,7 @@ public class HealthCheckupListController { @ApiOperation("分页查询") @SaCheckPermission("healthCheckup.list.mange") public Result pageData(PageForm pageForm, String projectId, String subjectId, - String unionId, String unitId, String isEmployed, String physicalExaminationStatus) { + String unionId, String unitId, String physicalExaminationStatus) { List confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId)); HealthCheckupProject project = healthCheckupProjectService.findOne(projectId); @@ -119,8 +119,7 @@ public class HealthCheckupListController { hcus.subjectId, hcu.bz, hcus.receiveAddress, - ca.campusName, - hcu.isEmployed + ca.campusName FROM health_checkup_user hcu LEFT JOIN health_checkup_user_selection hcus ON hcu.userId = hcus.selectUserId @@ -133,7 +132,6 @@ public class HealthCheckupListController { cnd.andEX("hcu.unionId", "=", unionId); cnd.andEX("hcu.unitId", "=", unitId); cnd.andEX("hcus.subjectId", "=", subjectId); - cnd.andEX("hcu.isEmployed", "=", isEmployed); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { @@ -206,7 +204,7 @@ public class HealthCheckupListController { @ApiOperation("体检名单管理员编辑选择记录") @SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员编辑了一条选择记录") @SaCheckPermission("healthCheckup.list.mange") - public Result doEditHealthCheckupData(String subjectId, String campus, String projectId, String userId, String isEmployed, String bz) { + public Result doEditHealthCheckupData(String subjectId, String campus, String projectId, String userId, String bz) { if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),RoleConstant.HEALTH_ADMIN.name())) { return Result.error("您没有操作此按钮的权限"); } @@ -227,12 +225,6 @@ public class HealthCheckupListController { } } - healthCheckupProjectService.dao().update( - HealthCheckupUser.class, - Chain.make("isEmployed", isEmployed), - Cnd.NEW().and("projectId", "=", projectId).and("userId", "=", userId) - ); - //查询用户有没有选择过套餐 HealthCheckupUserSelection userSelection = healthCheckupProjectService.dao().fetch(HealthCheckupUserSelection.class, Cnd.where("projectId", "=", projectId) @@ -301,10 +293,6 @@ public class HealthCheckupListController { excel.setErrInfo("重复数据", i + 1); } - if(StringUtils.isNotBlank(excel.getIsEmployed()) && !(excel.getIsEmployed().contains("是") || excel.getIsEmployed().contains("否"))){ - excel.setErrInfo("是否自聘：值只能为 \'是\' 或 \'否\'", i + 1); - } - View_user user = userList.stream().filter(s -> s.getLoginname().equals(excel.getLoginName())).findFirst().orElse(null); if (user == null) { excel.setErrInfo("无此用户：" + excel.getLoginName(), i + 1); @@ -322,9 +310,6 @@ public class HealthCheckupListController { if(StringUtils.isNotBlank(excel.getPhone())){ chain.add("phone", excel.getPhone()); } - if(StringUtils.isNotBlank(excel.getIsEmployed())) { - chain.add("isEmployed", excel.getIsEmployed()); - } dao.update( HealthCheckupUser.class,chain, Cnd.NEW().and(HealthCheckupUser::getUserId, "=", user.getId()) @@ -351,7 +336,6 @@ public class HealthCheckupListController { newHealthUser.setPhone(excel.getPhone()); newHealthUser.setMarriage(user.getMarriage()); newHealthUser.setPersonType(projectName); - newHealthUser.setIsEmployed(excel.getIsEmployed()); healthCheckupUsersToAdd.add(newHealthUser); successCount++; } @@ -381,7 +365,6 @@ public class HealthCheckupListController { entities.add(new ExcelExportEntity("工号", "loginName", 20)); entities.add(new ExcelExportEntity("姓名", "userName", 20)); entities.add(new ExcelExportEntity("手机号", "phone", 20)); - entities.add(new ExcelExportEntity("是否自聘", "isEmployed", 20)); ExportParams exportParams = new ExportParams(); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, Collections.emptyList()); CommonDownloadUtil.download("参加人员导入模版.xlsx", workbook, response); @@ -604,8 +587,7 @@ public class HealthCheckupListController { hcus.subjectId, hcu.bz, hcus.receiveAddress, - ca.campusName, - hcu.isEmployed + ca.campusName FROM health_checkup_user hcu LEFT JOIN health_checkup_user_selection hcus ON hcu.userId = hcus.selectUserId AND hcus.projectId=@projectId @@ -671,7 +653,6 @@ public class HealthCheckupListController { add(new ExcelExportEntity("选择时间", "selectTime", 50)); add(new ExcelExportEntity("是否确认", "isAudit", 50)); add(new ExcelExportEntity("确认时间", "auditTime", 50)); - add(new ExcelExportEntity("是否自聘", "isEmployed", 50)); add(new ExcelExportEntity("备注", "bz", 50)); }}; 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 684da8ba..eb8bcf20 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 @@ -78,9 +78,8 @@ public class HealthCheckupSingleController { @ApiOperation("首页查询") @SaCheckPermission("healthCheckup.statisticsSingle") public Result pageData(String projectId, - String unionId, - String isEmployed) { - NutMap nutMap = healthCheckupSingleService.pageData(projectId, unionId, isEmployed); + String unionId) { + NutMap nutMap = healthCheckupSingleService.pageData(projectId, unionId); return Result.success(nutMap); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java index 201a4d70..001316b8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java @@ -15,7 +15,7 @@ public interface HealthCheckupSingleService extends BaseService x.getString("unionId").equals(healthCheckup.getString("id")) && x.getString("projectId").equals(projectId) - && x.getString("isEmployed").equals(isEmployed) ) .collect(Collectors.toList()); @@ -80,7 +79,6 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl - - - - - - @@ -191,16 +181,6 @@ layout("/layouts/platform.html"){ :label="item.optionName"> - - - - - - - - - - - -