From 200560500894834ed3cdb8a4715402d5e195a7cb Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期四, 18 四月 2024 11:21:36 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java index 1e13fdd..e01fd73 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -33,8 +34,24 @@ LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(OptimizeProject::getState,optimizeRequest.getState()) .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo()) - .groupBy(OptimizeProject::getProjectNo); + //.groupBy(OptimizeProject::getProjectNo) + ; log.info("杩斿洖宸ョ▼淇℃伅"); return this.list(wrapper); } + + + @Override + public void insetProject(OptimizeProject glass) { + + } + + @Override + public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) { + log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ"); + + log.info("杩斿洖宸ョ▼淇℃伅"); + return this.baseMapper.saveProject(optimizeRequest); + } + } -- Gitblit v1.8.0