Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 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)表服务实现类
@@ -53,5 +55,10 @@
        }
        return baseMapper.queryHollowDailyProduction(beginDate, endDate);
    }

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