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 00603cf5..494f0b2c 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 @@ -287,10 +287,17 @@ public class HealthCheckupListController { excel.setErrInfo("无此用户", i + 1); continue; } + String projectName = checkupProject.getName(); + if(projectName.contains("在职教职工")) { + projectName = "在职教职工"; + } + if(projectName.contains("校聘高知")) { + projectName = "校聘高知"; + } if (healthCheckupUserList.stream().anyMatch(s -> s.getUserId().equals(user.getId()))) { dao.update( HealthCheckupUser.class, - Chain.make("phone",excel.getPhone()), + Chain.make("phone",excel.getPhone()).add("personType",projectName), Cnd.NEW().and(HealthCheckupUser::getUserId,"=",user.getId()) .and(HealthCheckupUser::getProjectId, "=", healthProjectId) ); @@ -314,7 +321,7 @@ public class HealthCheckupListController { newHealthUser.setCard(user.getIdCard()); newHealthUser.setPhone(excel.getPhone()); newHealthUser.setMarriage(user.getMarriage()); - newHealthUser.setPersonType(user.getPersonType()); + newHealthUser.setPersonType(projectName); healthCheckupUsersToAdd.add(newHealthUser); successCount++; } 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 a99d4726..aec1ab5c 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 @@ -97,16 +97,16 @@ public class HealthCheckupProjectServiceImpl extends BaseServiceImpl