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

体检项目bug优化

Browse Source
This commit is contained in:
c-zhangr1
2026-04-30 16:49:39 +08:00
parent 4c993b2a33
commit 773062bdf5
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+11 -1
View File
@@ -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 physicalExaminationStatus) {
String unionId, String unitId, String physicalExaminationStatus, String isAudit) {
List<HealthCheckupUnionConfirm> confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId));
HealthCheckupProject project = healthCheckupProjectService.findOne(projectId);
@@ -133,6 +133,16 @@ public class HealthCheckupListController {
cnd.andEX("hcu.unionId", "=", unionId);
cnd.andEX("hcu.unitId", "=", unitId);
cnd.andEX("hcus.subjectId", "=", subjectId);
if(StringUtils.isNotBlank(isAudit)){
if(isAudit.equals("1")){
cnd.and("hcu.isAudit", "=", "1");
} else if(isAudit.equals("0")){
SqlExpressionGroup group = Cnd.NEW().where();
group.andEX("hcu.isAudit", "=", "0");
group.orIsNull("hcu.isAudit");
cnd.and(group);
}
}
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
}