From 68c638f6107fc3704ebe5f9ac318233b7e117b95 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 06 十二月 2024 14:24:42 +0800 Subject: [PATCH] 还原上片常州版本,去除义乌数据 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 40 +++++++++++----------------------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java index 0cfcb0c..409cfb2 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java @@ -7,7 +7,6 @@ import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.engineering.entity.Engineering; -import com.mes.engineering.mapper.EngineeringMapper; import com.mes.engineering.service.EngineeringService; import com.mes.pp.entity.OptimizeProject; import com.mes.pp.mapper.OptimizeProjectMapper; @@ -45,10 +44,10 @@ //log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering); if(engineering!=null){ LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId()); + wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId()); return this.list(wrapper); - } else { - return null; + }else { + return null; } } @@ -56,10 +55,7 @@ @Override public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) { LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId()); -// .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell()) -// .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove()); - + wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId()); return this.list(wrapper); } @@ -107,25 +103,16 @@ @Override public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) { upPattenUsage.setState(state); - boolean updateSuccess = this.updateById(upPattenUsage); - log.info("鏇存柊鐘舵�亄}", updateSuccess); + boolean updateSuccess=this.updateById(upPattenUsage); + log.info("鏇存柊鐘舵�亄}",updateSuccess); //鏇存柊鐘舵�� } @Override - public UpPattenUsage selectedTaskEngineering(String engineeringId) { - return null; - } - - @Override - public UpPattenUsage selectedEngineering(String engineerId) { - QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>(); - wrapper.eq("engineering_id", engineerId) -// .eq("station_cell", stationCell) -// .eq("film_remove", filmRemove) + public UpPattenUsage selectedEngineering(String engineeringId) { + QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>(); + wrapper.eq("engineering_id",engineeringId) .last("limit 1"); - log.info("鏌ヨ棰勮鍙傛暟"); - log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper)); return this.getOne(wrapper); } @@ -151,14 +138,9 @@ @Override public Boolean updateGlassState(UpPattenUsage upPattenUsage) { UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", upPattenUsage.getId()) - .set("state", upPattenUsage.getState()); + updateWrapper.eq("id",upPattenUsage.getId()) + .set("state",upPattenUsage.getState()); return this.update(updateWrapper); - } - - @Override - public Object Engineering(Engineering request) { - return null; } -- Gitblit v1.8.0