From 7f120fc7a05d560db1e47b3ef243fde19a0c56b4 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 28 五月 2024 09:01:19 +0800 Subject: [PATCH] 更改开始上片和暂停接口,选择工程增加信息预览 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 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 4bb7aa3..22f9d8e 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 @@ -9,6 +9,7 @@ import com.mes.pp.entity.request.OptimizeRequest; import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.pp.service.OptimizeProjectService; +import com.mes.uppattenusage.entity.UpPattenUsage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -29,13 +30,14 @@ @Override public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) { - log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ"); + //灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(OptimizeProject::getState,optimizeRequest.getState()) + .or(qw -> qw.eq(OptimizeProject::getState, 200)) .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo()) //.groupBy(OptimizeProject::getProjectNo) ; - log.info("杩斿洖宸ョ▼淇℃伅"); + //杩斿洖宸ョ▼淇℃伅 return this.list(wrapper); } @@ -50,6 +52,17 @@ } + @Override + public boolean overTask(UpPattenUsage sequence, int state) { + if(sequence.getState()==100){ + UpdateWrapper<OptimizeProject> wrapper=new UpdateWrapper<>(); + wrapper.eq("project_no",sequence.getEngineeringId()) + .set("state",state); + boolean updateSuccess = this.update(wrapper); + log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess); + } + return false; + } } -- Gitblit v1.8.0