From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 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 1934f3d..c2fddfb 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
@@ -304,4 +307,60 @@
return tjProjectMapper.tjCsXmjgcx(map);
}
+ @Override
+ public List<Map<String, Object>> getTjproGzJy(String tjNum, String proId, String gzz, int cgorjyjc) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum",tjNum);
+ map.put("proid",proId);
+ map.put("jgz",gzz);
+ map.put("cgorjyjc",cgorjyjc);
+ return tjProjectMapper.getTjproGzJy(map);
+ }
+
+ @Override
+ public Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ map.put("pname",pname);
+ map.put("pid",pid);
+ map.put("pym",pym);
+ map.put("checktype",checktype);
+ List<List<?>> list = tjProjectMapper.getTjHyBgList(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("list",list);
+ map1.put("total",map.get("total"));
+ return map1;
+ }
+
+ @Override
+ public List<Map<String, Object>> zdysqlcx(String sql) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("aaa",sql);
+ return tjProjectMapper.zdysqlcx(map);
+ }
+
+ @Override
+ public void zdysqlxg(String sql) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("aaa",sql);
+ tjProjectMapper.zdysqlxg(map);
+ }
+
+
+ @Override
+ public List<TjProject> getProListByBblx(String bblx) {
+ return tjProjectMapper.getProListByBblx(bblx);
+ }
+
+ @Override
+ public List<TjProject> getProListByBwwh(String bw) {
+ return tjProjectMapper.getProListByBwwh(bw);
+ }
+
+ @Override
+ public List<TjProject> selectTjProjectListByBz() {
+ return tjProjectMapper.selectTjProjectListByBz();
+ }
+
}
--
Gitblit v1.8.0