YiWuProject.git

			@@ -88,7 +88,7 @@
			wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
			.eq("state",2)
			.groupBy("tempering_layout_id,engineer_id")
			.orderByDesc("id");
			.orderByAsc("id");
			return temperingMapper.selectList(wrapper);
			}

			@@ -108,4 +108,23 @@
			return 100;
			}
			}

			@Override
			public List<TemperingGlassInfo> selectGlassInfoById(Integer id)
			{
			List<TemperingGlassInfo> result=null;
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("Top 1 *").in("state",1,0).eq("tempering_layout_id",id);
			TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
			if(glass!=null) {
			QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
			glassinfo.eq("engineer_id", glass.getEngineerId())
			.eq("tempering_layout_id", id)
			.orderByDesc("tempering_layout_id")
			.orderByAsc("tempering_feed_sequence");
			return temperingMapper.selectList(glassinfo);
			// result= temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
			}
			return result;
			}
			}