YiWuProject.git

			@@ -1,15 +1,20 @@
			package com.mes.uppattenusage.service.impl;

			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.pp.entity.OptimizeProject;
			import com.mes.pp.mapper.OptimizeProjectMapper;
			import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.service.UpPattenUsageService;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.Collections;
			import java.util.List;
			import java.util.*;

			/**
			* <p>
			@@ -21,7 +26,10 @@
			*/
			@Service
			@Slf4j
			public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
			public class UpPattenUsageServiceImpl extends MPJBaseServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {

			@Autowired
			OptimizeProjectMapper optimizeProjectMapper;
			@Override
			public List<UpPattenUsage> prioritylist(int state) {
			log.info("将参数传入到查询类里,工程号做非空判断模糊查询");
			@@ -32,14 +40,50 @@
			}

			@Override
			public List<UpPattenUsage> saveUpPattenUsage(String engineeringId) {
			List<UpPattenUsage> list = this.list();
			@DS("pp")
			public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {

			List<OptimizeUpPattenUsage> upPattenUsageList = null;
			if (engineeringId != null) {
			LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(UpPattenUsage::getEngineeringId,engineeringId);
			return this.list(wrapper);
			upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
			.select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
			.leftJoin("optimize_layout b on t.project_no=b.project_no")
			.eq("b.project_no", engineeringId));
			}
			return Collections.emptyList();
			// 创建一个 List 用于保存映射后的实体对象
			List<UpPattenUsage> resultList = new ArrayList<>();

			// 遍历查询结果中的每个 Map 对象
			if (upPattenUsageList != null) {
			for (OptimizeUpPattenUsage map : upPattenUsageList) {
			// 创建一个新的 OptimizeProject 对象
			UpPattenUsage optimizeProject = new UpPattenUsage();
			// 将 Map 中的每个键值对映射到 OptimizeProject 对象的相应字段上
			optimizeProject.setEngineeringId((String) map.getProjectNo());
			optimizeProject.setFilmsId((String) map.getGlassType());
			optimizeProject.setWidth((Double) map.getWidth());
			optimizeProject.setHeight((Double) map.getHeight());
			optimizeProject.setThickness((Double)map.getHeight());
			optimizeProject.setLayoutSequence((Integer) map.getHeatLayoutSort());
			optimizeProject.setState(0);
			// 将映射后的对象添加到结果列表中
			resultList.add(optimizeProject);
			}
			}
			log.info("查询出上片顺序集合保存到实体类{}",resultList);
			return resultList;
			}

			@Override
			public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
			this.saveBatch(upPattenUsage);
			//保存原片使用详情表
			}

			//@Override
			public void selectSaveGlassinfo(String engineeringId) {
			//保存玻璃信息表
			//optimizeProjectMapper.selectJoinList();
			}