YiWuProject.git

File was renamed from hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
			@@ -1,12 +1,13 @@
			package com.mes.temperingglass.service.impl;

			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingAgoService;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import com.github.yulichang.base.MPJBaseServiceImpl;

			import java.util.List;

			@@ -19,7 +20,8 @@
			* @since 2024-04-07
			*/
			@Service
			public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService {
			@DS("salve_hangzhoumes")
			public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
			@Autowired
			TemperingGlassInfoMapper temperingMapper;

			@@ -55,12 +57,16 @@
			public List<TemperingGlassInfo> selectOverGlass() {
			//获取过旋转台最大的钢化版图id
			QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
			wapper.select("top 1 *").eq("state", 4)
			wapper.select("Top 1 *").eq("state", 4)
			.orderByDesc("tempering_layout_id");
			//根据最大的版图id显示钢化后的版图信息
			TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
			if (glassinfo == null) {
			return null; // 直接返回null，表示没有找到符合条件的记录
			}
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId());

			return temperingMapper.selectList(wrapper);
			}

			@@ -72,4 +78,12 @@
			.orderByAsc("tempering_layout_id");
			return temperingMapper.selectList(wrapper);
			}

			@Override
			public List<TemperingGlassInfo> selectTaskType() {
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("state")
			.groupBy("state");
			return temperingMapper.selectList(wrapper);
			}
			}