|
@@ -183,21 +183,17 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
LocalDate sunday = now.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
|
|
|
firstDayTime = LocalDateTime.of(monday, LocalTime.of(0,0,0));
|
|
|
lastDayTime = LocalDateTime.of(sunday, LocalTime.of(23,59,59));
|
|
|
- model.setSearchStartTime(firstDayTime);
|
|
|
+ // model.setSearchStartTime(firstDayTime);
|
|
|
model.setSearchEndTime(lastDayTime);
|
|
|
model.setStatus(CheckJobStatusEnum.NOT_EXECUTE.getValue());
|
|
|
- List<CheckJobVO> voList = mapper.selectList(model);
|
|
|
+
|
|
|
List<CheckJobVO> tenList = mapper.selectList(model);
|
|
|
- if (voList.size()<=10){
|
|
|
- tenList = voList;
|
|
|
- }
|
|
|
- tenList = voList.subList(0,10);
|
|
|
// 返回
|
|
|
CheckJobScreenVO vo = new CheckJobScreenVO();
|
|
|
vo.setMonthNum(allVO.getCountNum());
|
|
|
vo.setFinishNum(finishVO.getCountNum());
|
|
|
vo.setWaitNum(allVO.getCountNum() - finishVO.getCountNum());
|
|
|
- vo.setRate(BigDecimalUtil.div(new BigDecimal(vo.getWaitNum()*100) , new BigDecimal(vo.getMonthNum()), 2));
|
|
|
+ vo.setRate(BigDecimalUtil.div(new BigDecimal(vo.getFinishNum()*100) , new BigDecimal(vo.getMonthNum()), 2));
|
|
|
vo.setWeekList(tenList);
|
|
|
return vo;
|
|
|
}
|