blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2024-07-19 3fff89c7a37d8be5e78c4ef2c24a60c05676575a 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java


@@ -7,6 +7,7 @@


import com.github.yulichang.query.MPJLambdaQueryWrapper;


import com.github.yulichang.toolkit.JoinWrappers;


import com.github.yulichang.wrapper.MPJLambdaWrapper;


import com.mes.common.config.Const;


import com.mes.edgstoragecage.entity.EdgStorageCage;


import com.mes.edgstoragecage.entity.EdgStorageCageDetails;


import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;


@@ -24,6 +25,7 @@


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import javax.print.attribute.standard.MediaSize;


import java.util.ArrayList;


import java.util.List;


import java.util.Map;


@@ -90,7 +92,8 @@


    public List<Map<String, Object>> selectCutTerritory() {


        List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()


                .selectAll(UpPattenUsage.class)


                .eq(UpPattenUsage::getState, 1).or().eq(UpPattenUsage::getState, 0).orderByDesc(UpPattenUsage::getState));


                .orderByDesc(UpPattenUsage::getState)


                .orderByDesc(UpPattenUsage::getId));


        if (!upPattenUsage.isEmpty()) {


            UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);


            List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)


@@ -107,7 +110,8 @@


            for (Map<String, Object> cutTerritory : cutTerritorys) {


                EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()


                        .selectAll(EdgStorageCageDetails.class)


                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id")));


                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))


                        .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));


//                log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);


                if(edgStorageCageDetails!=null){


                    cutTerritory.put("glass_state",edgStorageCageDetails.getState());