From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 09 十月 2024 15:47:59 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 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 8a5142b..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 @@ -3,6 +3,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.engineering.entity.Engineering; @@ -40,7 +41,7 @@ public List<UpPattenUsage> prioritylist() { //鑾峰彇姝e湪涓婄墖鐨勪换鍔d Engineering engineering= engineeringService.selectInitiate(1); - log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering); + //log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering); if(engineering!=null){ LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId()); @@ -49,6 +50,13 @@ return null; } + } + + @Override + public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) { + LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId()); + return this.list(wrapper); } @Override @@ -117,5 +125,23 @@ return this.getOne(wrapper); } + @Override + //鑾峰彇鏈�鍚庝竴鍧楃幓鐠� + public UpPattenUsage selectSequence(UpPattenUsage upPattenUsage) { + QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>(); + wrapper.eq("engineering_id",upPattenUsage.getEngineeringId()) + .orderByDesc("layout_sequence") + .last("limit 1"); + return this.getOne(wrapper); + } + + @Override + public Boolean updateGlassState(UpPattenUsage upPattenUsage) { + UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",upPattenUsage.getId()) + .set("state",upPattenUsage.getState()); + return this.update(updateWrapper); + } + } -- Gitblit v1.8.0