From be6fb1de960f7af129ab4b5d22025c84ce283f28 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java | 6 ------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 11 ++++++-----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
index 296bbb2..704967a 100644
--- a/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
+++ b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
@@ -2,19 +2,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.mapper.InformationNotificationMapper;
import com.yuanchu.mom.pojo.InformationNotification;
-import com.yuanchu.mom.pojo.InformationNotificationDto;
import com.yuanchu.mom.service.InformationNotificationService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
/**
* <p>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index 5bcd02f..82fe3a8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/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() + "妫�娴�");
--
Gitblit v1.9.3