lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java
@@ -3,14 +3,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.mdc.service.IEquipmentLogService; import org.jeecg.modules.mdc.subcontrol.service.MdcBigScreenService; import org.jeecg.modules.mdc.subcontrol.vo.AllEquipmentLogVo; import org.jeecg.modules.mdc.subcontrol.vo.LastWeekDataRankingVo; import org.jeecg.modules.mdc.subcontrol.vo.MdcEquipmentOpVo; import org.jeecg.modules.mdc.vo.MdcEquipmentVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
@@ -50,9 +50,9 @@ List<BigDecimal> processingRateList = new ArrayList<>(); List<BigDecimal> shiftRateList = new ArrayList<>(); //获取上周周一日期和周六日期 LocalDate today = LocalDate.now(); LocalDate monday = today.minusDays(7); LocalDate saturday = today.minusDays(1); LocalDate today = LocalDate.now().minusDays(7L); LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); LocalDate saturday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SATURDAY)); List<String> dates = getMiddleDate(monday, saturday); List<String> equipmentIdList = new ArrayList<>(); //根据厂区id获取厂区设备信息
