Merge remote-tracking branch 'origin/master'

value

2024-05-14 be6fb1de960f7af129ab4b5d22025c84ce283f28

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java

@@ -9,14 +9,12 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.ReportService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -219,10 +217,13 @@
        /*获取后一周日期*/
        LocalDate currentDate = LocalDate.now();
        List<LocalDate> weekDays = new ArrayList<>();
        for (int i = 0; i < 7; i++) {
            weekDays.add(currentDate.plusDays(i));
        for (int i = 6; i >= 0; i--) {
            weekDays.add(currentDate.minusDays(i));
            //查询当天需要检测的委托订单
            List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).in(InsOrder::getInsState, insState).apply("DATE(create_time) = CURDATE() + INTERVAL " + i + " DAY"));
            List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
                    .eq(InsOrder::getState, 1)
                    .in(InsOrder::getInsState, insState)
                    .apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY"));
            List<Map<String, Object>> works = insOrders.stream().map(insOrder -> {
                HashMap<String, Object> hashMap = new HashMap<>();
                hashMap.put("text", "委托订单" + insOrder.getEntrustCode() + "检测");