Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java

@@ -10,8 +10,13 @@
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
import com.mes.bigstoragecagetask.mapper.BigStorageCageHistoryTaskMapper;
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
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;

/**
 * (BigStorageCageHistoryTask)表服务实现类
@@ -36,8 +41,26 @@
                .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), BigStorageCageHistoryTask::getTaskState, request.getTaskStateList())
                .in(CollectionUtil.isNotEmpty(request.getTaskTypeList()), BigStorageCageHistoryTask::getTaskType, request.getTaskTypeList())
                .between(BigStorageCageHistoryTask::getCreateTime, request.getBeginDate(), request.getEndDate())
                .orderByDesc(BigStorageCageHistoryTask::getCreateTime);
                .orderByAsc(BigStorageCageHistoryTask::getId);
        return this.page(page, wrapper);
    }

    @Override
    public DailyProductionVO queryBigDailyProduction(BigStorageCageHistoryRequest request) {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String beginDate = null;
        String endDate = null;
        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.checkValNotNull(request.getBeginDate())) {
            beginDate = sdf.format(request.getBeginDate());
            endDate = sdf.format(request.getEndDate());
        }
        return baseMapper.queryBigDailyProduction(beginDate, endDate);
    }

    @Override
    public List<RunTime> queryRunTimes(){
        return baseMapper.queryRunTimes();
    }

}