YiWuProject.git

			@@ -24,6 +24,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -66,7 +67,7 @@
			if (edgStorageCageDetails.size() == 1) {
			EdgStorageCageDetails item = edgStorageCageDetails.get(0);
			item.setState(ControlsId);
			baseMapper.update(edgStorageCageDetails.get(0), new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
			baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
			return true;
			}
			// Sql版本
			@@ -89,11 +90,10 @@
			public List<Map<String, Object>> selectCutTerritory() {
			List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
			.selectAll(UpPattenUsage.class)
			.eq(UpPattenUsage::getState, 1));

			.eq(UpPattenUsage::getState, 1).or().eq(UpPattenUsage::getState, 0).orderByDesc(UpPattenUsage::getState));
			if (!upPattenUsage.isEmpty()) {
			UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
			return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
			List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
			.selectAll(OptimizeDetail.class)
			.selectAs(OptimizeLayout::getWidth, "olWidth")
			.selectAs(OptimizeLayout::getWidth, "olHeight")
			@@ -103,6 +103,20 @@
			.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
			.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
			);
			List<Map<String, Object>> ResultcutTerritorys=new ArrayList<>();
			for (Map<String, Object> cutTerritory : cutTerritorys) {
			EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			.selectAll(EdgStorageCageDetails.class)
			.eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id")));
			// log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
			if(edgStorageCageDetails!=null){
			cutTerritory.put("glass_state",edgStorageCageDetails.getState());
			}else{
			cutTerritory.put("glass_state",0);
			}
			ResultcutTerritorys.add(cutTerritory);
			}
			return ResultcutTerritorys;

			// Sql版本
			// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)