From 7be45635cf9524b75ee0fd36a0f5776525def1ae Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Wed, 15 Apr 2026 14:25:40 +0800
Subject: [PATCH] 1

---
 .../HealthCheckupListController.java          | 11 ++++++++--
 .../impl/HealthCheckupProjectServiceImpl.java | 20 +++++++++----------
 2 files changed, 19 insertions(+), 12 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 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<HealthCheck
         dao().clear(HealthCheckupUserCompanion.class, Cnd.where("userSelectionId", "in", userSelectionIds));
 
         manyAddOrRenewUtil.asyncExecuteFastInsert(needInsertSelectionUsers, null);
-        Sql updateSql = Sqls.create("""
-                update health_checkup_user cu
-                left join health_checkup_project p on cu.projectId=p.id
-                left join sys_user u on cu.userId=u.id
-                set cu.phone=if(cu.phone is null,u.mobile,cu.phone),cu.card=u.idCard,cu.marriage=u.marriage
-                    ,cu.personType=(case when p.name like '%在职教职工%' then '在职教职工' when p.name like '%校聘高知%' then '校聘高知保健对象' else '' end)
-                where cu.projectId=@projectId2 and cu.confirmStatus!='1'
-                """);
-        updateSql.setParam("projectId2", healthCheckupProject.getId());
-        dao().execute(updateSql);
+//        Sql updateSql = Sqls.create("""
+//                update health_checkup_user cu
+//                left join health_checkup_project p on cu.projectId=p.id
+//                left join sys_user u on cu.userId=u.id
+//                set cu.phone=if(cu.phone is null,u.mobile,cu.phone),cu.card=u.idCard,cu.marriage=u.marriage
+//                    ,cu.personType=(case when p.name like '%在职教职工%' then '在职教职工' when p.name like '%校聘高知%' then '校聘高知保健对象' else '' end)
+//                where cu.projectId=@projectId2 and cu.confirmStatus!='1'
+//                """);
+//        updateSql.setParam("projectId2", healthCheckupProject.getId());
+//        dao().execute(updateSql);
     }