From d3e76a8afe548f5f9e51de37f26b3cb8aa7374a1 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 26 五月 2025 11:38:09 +0800 Subject: [PATCH] 大屏样式修改 --- hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java index 39b6143..51a1415 100644 --- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java +++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java @@ -10,10 +10,12 @@ import com.mes.hollowtask.mapper.HollowBigStorageCageHistoryTaskMapper; import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService; import com.mes.largenscreen.entity.DailyProductionVO; +import com.mes.largenscreen.entity.RunTime; import com.mes.tools.DateUtil; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; +import java.util.List; /** * (HollowBigStorageCageHistoryTask)琛ㄦ湇鍔″疄鐜扮被 @@ -38,7 +40,7 @@ .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), HollowBigStorageCageHistoryTask::getTaskState, request.getTaskStateList()) .in(CollectionUtil.isNotEmpty(request.getTaskTypeList()), HollowBigStorageCageHistoryTask::getTaskType, request.getTaskTypeList()) .between(HollowBigStorageCageHistoryTask::getCreateTime, request.getBeginDate(), request.getEndDate()) - .orderByDesc(HollowBigStorageCageHistoryTask::getCreateTime); + .orderByAsc(HollowBigStorageCageHistoryTask::getId); return this.page(page, wrapper); } @@ -53,5 +55,10 @@ } return baseMapper.queryHollowDailyProduction(beginDate, endDate); } + + @Override + public List<RunTime> queryRunTimes(String days){ + return baseMapper.queryRunTimes(days); + } } -- Gitblit v1.8.0