YiWuProject.git

			@@ -4,12 +4,12 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.utils.RedisUtil;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
			import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			import com.mes.tools.DateUtil;
			import com.mes.utils.RedisUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			@@ -42,9 +42,9 @@
			}
			LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.in(CollectionUtils.isNotEmpty(request.getCellList()), EdgGlassTaskInfo::getLine, request.getCellList())
			.in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getStatus, request.getStateList())
			.between(null != request.getBeginDate(), EdgGlassTaskInfo::getTime, request.getBeginDate(), request.getEndDate())
			.orderByDesc(EdgGlassTaskInfo::getTime);
			.in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getState, request.getStateList())
			.between(null != request.getBeginDate(), EdgGlassTaskInfo::getCreateTime, request.getBeginDate(), request.getEndDate())
			.orderByDesc(EdgGlassTaskInfo::getCreateTime);
			return this.list(edgGlassWrapper);
			}

			@@ -68,7 +68,7 @@
			public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
			QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
			.select("line")
			.eq("status", 1)
			.eq("state", 1)
			.groupBy("line");

			return this.list(wrapper);