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

体检

Browse Source
This commit is contained in:
Paidax
2025-06-03 16:19:52 +08:00
parent 5ca64715a8
commit 7decda0510
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+6 -9
View File
@@ -237,11 +237,9 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
u.username AS userName, u.username AS userName,
IFNULL(hcus.sex, u.sex) AS sex, IFNULL(hcus.sex, u.sex) AS sex,
u.birthday, u.birthday,
u.unitname AS unitName, u.unitName,
u.unitcode AS unitCode, u.threeUnitName,
u.marriage, u.unionName,
u.threeUnitName AS threeUnitName,
u.unionname AS unionName,
hcus.idcard AS idCard, hcus.idcard AS idCard,
hcus.mobile, hcus.mobile,
hcps.optionName subjectName, hcps.optionName subjectName,
@@ -249,13 +247,13 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
hcc.campusName hcc.campusName
FROM FROM
`health_checkup_user_selection` hcus `health_checkup_user_selection` hcus
LEFT JOIN `user` u ON u.id = hcus.selectUserId LEFT JOIN `health_checkup_user` u ON u.id = hcus.selectUserId
LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId
LEFT JOIN `health_checkup_campus` hcc ON hcc.id = hcus.campus LEFT JOIN `health_checkup_campus` hcc ON hcc.id = hcus.campus
$condition $condition
""").setParam("projectId", projectId); """).setParam("projectId", projectId);
cnd.and("hcus.projectId", "=", projectId); cnd.and("hcus.projectId", "=", projectId);
cnd.desc("hcus.subjectId"); cnd.asc("u.sort");
}else if("1".equals(isSelected)){ }else if("1".equals(isSelected)){
//查看未选择体检 //查看未选择体检
sql = Sqls.create(""" sql = Sqls.create("""
@@ -277,11 +275,10 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
"""); """);
// cnd.and("aus.groupId","=",project.getActivityGroupId()); // cnd.and("aus.groupId","=",project.getActivityGroupId());
sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )"); sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
cnd.asc("aus.sort");
} }
} }
cnd.andEX("u.unionid", "=", unionId); cnd.andEX("u.unionid", "=", unionId);
cnd.asc("u.unioncode");
cnd.desc("u.threeUnitName");
cnd.groupBy("u.loginname"); cnd.groupBy("u.loginname");
sql.setCondition(cnd); sql.setCondition(cnd);
return listMap(sql); return listMap(sql);