From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 20 一月 2025 13:41:45 +0800 Subject: [PATCH] zjh20250120 --- ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java index d72358b..f02d8eb 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import java.util.stream.Collectors; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ltkj.common.utils.DateUtils; @@ -156,6 +157,8 @@ public List<TreeSelect> selectProjectTreeList(TjProject tjProject) { LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>(); wq.eq(TjProject::getProStatus,0); + if(StrUtil.isNotBlank(tjProject.getProName()))wq.like(TjProject::getProName,tjProject.getProName()); + if(StrUtil.isNotBlank(tjProject.getProEngName()))wq.like(TjProject::getProEngName,tjProject.getProEngName()); List<TjProject> projects = SpringUtils.getAopProxy(this).list(wq); return buildProjectTreeSelect(projects); } @@ -212,8 +215,8 @@ } @Override - public List<TjProject> getOpenDxTjProjectList() { - return tjProjectMapper.getOpenDxTjProjectList(); + public List<TjProject> getOpenDxTjProjectList(String nr) { + return tjProjectMapper.getOpenDxTjProjectList(nr); } @Override -- Gitblit v1.8.0