From dbdf9238c808566a0cef6cd3858f6f3ee2d7bacd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 21 七月 2024 08:22:52 +0800
Subject: [PATCH] 1、大理片笼:选择工程号没有是否旋转字段的值 2、将钢化小片表中电气需要的字段改为int(宽高厚、旋转角度)

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java |  383 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 375 insertions(+), 8 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 1145f00..e592ab2 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
@@ -1,28 +1,395 @@
 package com.mes.bigstorage.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.bigstorage.entity.BigStorageCage;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.BigStorageDTO;
+import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
+import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
 import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
-import com.mes.bigstorage.mapper.BigStorageCageMapper;
 import com.mes.bigstorage.service.BigStorageCageDetailsService;
-import com.mes.uppattenusage.entity.GlassInfo;
-import com.mes.uppattenusage.mapper.GlassInfoMapper;
-import com.mes.uppattenusage.service.GlassInfoService;
+import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
+import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author zhoush
  * @since 2024-03-27
  */
 @Service
-public abstract class BigStorageCageDetailsServiceImpl extends ServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
+public class BigStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
 
+    @Resource
+    private BigStorageCageOutTaskMapper bigStorageCageOutTaskMapper;
+    @Resource
+    private BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
+    @Resource
+    private TemperingGlassInfoMapper temperingGlassInfoMapper;
+    @Resource
+    private BigStorageCageService bigStorageCageService;
+    @Resource
+    private GlassInfoMapper glassInfoMapper;
+
+    @Resource
+    private DamageService damageService;
+
+    @Value("${mes.minCount}")
+    private int minCount;
+
+    @Value("${mes.slotWidth}")
+    private Integer slotWidth;
+
+    @Value("${mes.glassGap}")
+    private Integer glassGap;
+
+    /**
+     * 鏌ヨ杩�/鍑虹墖浠诲姟
+     */
+    @Override
+    public List<BigStorageCageDetails> selectTask(int taskType) {
+        if (taskType == 1) {
+            //杩涚墖浠诲姟鏁版嵁
+            LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+            feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
+            List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+
+            LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
+            feedTaskWrapper
+                    .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+                    .isNotNull(BigStorageCageFeedTask::getTargetSlot);
+            List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
+
+            Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
+                    .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
+            Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+            while (iterator.hasNext()) {
+                BigStorageCageDetails bigStorageCageDetails = iterator.next();
+                BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
+                bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+                if (bigStorageCageDetails.getBigStorageCageFeedTask() == null) {
+                    iterator.remove();
+                }
+            }
+            LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskNoTargetWrapper = new LambdaQueryWrapper<>();
+            feedTaskNoTargetWrapper
+                    .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+                    .isNull(BigStorageCageFeedTask::getTargetSlot);
+            List<BigStorageCageFeedTask> bigStorageCageFeedTaskNoTargetList = bigStorageCageFeedTaskMapper.selectList(feedTaskNoTargetWrapper);
+            for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskNoTargetList
+            ) {
+                BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+                LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+                glassInfoWrapper.eq(GlassInfo::getGlassId, bigStorageCageFeedTask.getGlassId());
+                GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
+                BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+                bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+                bigStorageCageDetailsList.add(bigStorageCageDetails);
+            }
+            return bigStorageCageDetailsList;
+        } else {
+            //鍑虹墖浠诲姟鏁版嵁
+            LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
+            outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
+            List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+
+            LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
+            outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
+            List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
+
+            Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
+                    .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
+            for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+                BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+                bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+            }
+            Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+            while (iterator.hasNext()) {
+                BigStorageCageDetails bigStorageCageDetails = iterator.next();
+                BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+                bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+                if (bigStorageCageDetails.getBigStorageCageOutTask() == null) {
+                    iterator.remove();
+                }
+            }
+            return bigStorageCageDetailsList;
+        }
+    }
+
+    /**
+     * 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
+     */
+    @Override
+    public double selectGetBoard(String plcFeedReqLine) {
+        double carWidth = 5000;
+        LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+        feedWrapper.eq(BigStorageCageDetails::getState, plcFeedReqLine);
+        List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+
+        LambdaQueryWrapper<BigStorageCageFeedTask> bigStorageCageFeedTaskWrapper = new LambdaQueryWrapper<>();
+        bigStorageCageFeedTaskWrapper
+                .eq(BigStorageCageFeedTask::getTaskState, plcFeedReqLine)
+                .eq(BigStorageCageFeedTask::getLine, plcFeedReqLine);
+
+        List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(bigStorageCageFeedTaskWrapper);
+        Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
+                .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
+        for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+            BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
+            bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+        }
+        for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+        ) {
+            if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
+                carWidth = carWidth - bigStorageCageDetails.getWidth() - glassGap;
+            }
+        }
+        return carWidth;
+
+    }
+
+
+    //鏍撻櫎鍑虹墖浠诲姟.鏇存柊鏍煎瓙瀹藉害
+    @Override
+    public void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+        baseMapper.deleteById(bigStorageCageDetails.getId());
+        bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+    }
+
+    //鐞嗙墖绗艰鎯呯牬鎹�
+    @Override
+    public void damageBigStorageCageDetails(String glassId, int status) {
+
+        LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
+        temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
+        TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
+
+        LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
+        bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
+        BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
+
+        if (temperingGlassInfo != null) {
+            if (status == 0) {
+                temperingGlassInfo.setState(Const.TEMPERING_DAMAGE);
+            } else {
+                temperingGlassInfo.setState(Const.TEMPERING_TAKE);
+            }
+            temperingGlassInfoMapper.updateById(temperingGlassInfo);
+        }
+        if (status == 0) {
+            bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
+        } else {
+            bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
+        }
+        baseMapper.updateById(bigStorageCageDetails);
+        bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+        //todo:鎻掑叆鐮存崯鏁版嵁
+        Damage damage = new Damage();
+        damage.setGlassId(bigStorageCageDetails.getGlassId());
+        damage.setWorkingProcedure("鍐峰姞宸�");
+        damage.setRemark("澶х悊鐗囩鐮存崯");
+        damage.setStatus(2);
+        damageService.insertDamage(damage);
+    }
+
+    //鏌ヨ鐜荤拑淇℃伅
+    @Override
+    public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
+        LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+        glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
+        GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
+        BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+        if (glassInfo != null) {
+            BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+            bigStorageCageDetails.setState(1);
+            bigStorageCageDetails.setGap(glassGap);
+            List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+            bigStorageCageDetailsList.add(bigStorageCageDetails);
+            return bigStorageCageDetailsList;
+        }else{
+            return null;
+        }
+
+    }
+
+    //鐞嗙墖绗艰鎯呮坊鍔�
+    @Override
+    public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+        bigStorageCageDetails.setState(100);
+        baseMapper.insert(bigStorageCageDetails);
+        bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+    }
+
+    //鐞嗙墖绗艰鎯呭畬鎴�
+    @Override
+    public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+//        if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
+//            bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
+//            baseMapper.updateById(bigStorageCageDetails);
+//        } else {
+//            bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
+//            baseMapper.updateById(bigStorageCageDetails);
+//            bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+//        }
+    }
+
+    //鎵嬪姩鍑虹墖
+    @Override
+    public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+        bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL);
+        baseMapper.updateById(bigStorageCageDetails);
+    }
+
+    @Override
+    public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
+        BigStorageDTO bigStorageDTO = null;
+        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
+                .selectAll(BigStorageCage.class)
+                .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+                .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+                .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
+                .last("limit 1");
+        if (glassInfo.getTemperingLayoutId() == 0) {
+            wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
+        } else {
+            wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
+        }
+        BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
+        if (null != bigStorageCage) {
+            bigStorageDTO = new BigStorageDTO();
+            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+            bigStorageDTO.setSlot(bigStorageCage.getSlot());
+            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+            return bigStorageDTO;
+        }
+        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+                .eq(BigStorageCage::getRemainWidth, slotWidth)
+                .inSql(BigStorageCage::getDeviceId,
+                        "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
+                .last("limit 1"));
+        if (null != bigStorageCage) {
+            bigStorageDTO = new BigStorageDTO();
+            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+            bigStorageDTO.setSlot(bigStorageCage.getSlot());
+            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+            return bigStorageDTO;
+        }
+
+        //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
+        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+                .eq(BigStorageCage::getRemainWidth, slotWidth)
+                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+                .notInSql(BigStorageCage::getDeviceId,
+                        "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
+                .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+                .orderByAsc(BigStorageCage::getDeviceId)
+                .last("limit 1"));
+        if (null != bigStorageCage) {
+            bigStorageDTO = new BigStorageDTO();
+            bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+            bigStorageDTO.setSlot(bigStorageCage.getSlot());
+            bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+            return bigStorageDTO;
+        }
+        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+                .eq(BigStorageCage::getRemainWidth, slotWidth)
+                .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+                .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+                .orderByAsc(BigStorageCage::getDeviceId)
+                .last("limit 1"));
+        Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+        bigStorageDTO = new BigStorageDTO();
+        bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+        bigStorageDTO.setSlot(bigStorageCage.getSlot());
+        bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+        return bigStorageDTO;
+    }
+
+    @Override
+    public List<TemperingLayoutDTO> temperingIsAll() {
+        return baseMapper.temperingIsAll();
+    }
+
+
+    @Override
+    public TemperingLayoutDTO queryTemperingOccupySlot() {
+        return baseMapper.queryTemperingOccupySlot(minCount);
+    }
+
+    @Override
+    public List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId) {
+        return baseMapper.queryGlassMaxAndMin(engineerId, temperingLayoutId);
+    }
+
+    @Override
+    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);
+
+            for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
+            ) {
+                TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
+                LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
+                glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId,bigStorageCageDetails.getGlassId());
+                GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);
+
+                BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
+                temperingGlassInfo.setAngle((int) glassInfo.getAngle());
+                temperingGlassInfo.setState(Const.TEMPERING_NEW);
+                temperingGlassInfo.setSlot(bigStorageCageDetails.getSlot());
+                temperingGlassInfoMapper.insert(temperingGlassInfo);
+            }
+            return true;
+        }else{
+            return false;
+        }
+
+
+    }
+
+    @Override
+    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");
+        List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
+        return TemperingGlass;
+    }
 }

--
Gitblit v1.8.0