inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -16,10 +16,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -27,6 +24,7 @@
public class ReportServiceImpl implements ReportService {
    private InsOrderMapper insOrderMapper;
    private InsSampleMapper insSampleMapper;
    private InsProductUserMapper insProductUserMapper;
    private InsProductMapper insProductMapper;
    private GetLook getLook;
@@ -217,17 +215,20 @@
        /*获取后一周日期*/
        LocalDate currentDate = LocalDate.now();
        List<LocalDate> weekDays = new ArrayList<>();
        for (int i = 6; i >= 0; i--) {
        for (int i = 6, j = 0; i >= 0; i--, j++) {
            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"));
                    .apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
            List<Map<String, Object>> works = insOrders.stream().map(insOrder -> {
                List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
                HashMap<String, Object> hashMap = new HashMap<>();
                hashMap.put("text", "委托订单" + insOrder.getEntrustCode() + "检测");
                hashMap.put("text", insOrder.getEntrustCode());
                hashMap.put("sample", insSamples.stream().map(InsSample::getSample).collect(Collectors.joining(",")));
                hashMap.put("type", insOrder.getType());
                hashMap.put("state", insOrder.getState());
                User user = userMapper.selectById(insOrder.getCreateUser());
                hashMap.put("name", user.getName());
                return hashMap;