From 44dd454d11a25d11494cf32737df1456cae47bf3 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 24 七月 2024 13:56:29 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java index 9d84131..01b49c4 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java @@ -353,15 +353,15 @@ public boolean TemperingGlass(String temperingLayoutId, String engineerId) { LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); temperingGlassInfoLambdaQueryWrapper - .eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId) - .eq(TemperingGlassInfo::getEngineerId, engineerId); - List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper); - if (temperingGlassInfoList.size() == 0) { - LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId) - .eq(BigStorageCageDetails::getEngineerId, engineerId) - .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL); - List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper); + .eq(TemperingGlassInfo::getState,Const.TEMPERING_NEW); + List<TemperingGlassInfo> temperingGlassInfoList=temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper); + + if(temperingGlassInfoList.size()==0){ + LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>(); + wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId) + .eq(BigStorageCageDetails::getEngineerId,engineerId) + .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL); + List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper); for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList ) { @@ -385,7 +385,7 @@ } @Override - public List<Map<String, Object>> selectTemperingGlass() { + public List<Map<String, Object>> selectTemperingGlass(){ QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>(); wrapper.select("engineer_id,tempering_layout_id,count(*) as count") .groupBy("engineer_id,tempering_layout_id"); -- Gitblit v1.8.0