From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 18 四月 2024 14:44:11 +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 | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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..4ec8d74 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 @@ -31,10 +31,26 @@ public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) { log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ"); LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(OptimizeProject::getState,optimizeRequest.getState()) - .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo()) - .groupBy(OptimizeProject::getProjectNo); + wrapper.eq(OptimizeProject::getState, optimizeRequest.getState()) + .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()), OptimizeProject::getProjectNo, optimizeRequest.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