From b080b476448f8ea4e77d4538a11cdfda7443d1b6 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Sat, 14 Sep 2024 21:03:31 +0800
Subject: [PATCH] TASK:mixi;

---
 .../com/mixi/common/tasks/MiTuExportScheduledTask.java |  4 ++--
 src/main/java/com/mixi/model/dto/TaskRuleQuery.java    |  2 ++
 .../mixi/service/impl/SalesIncentivesServiceImpl.java  | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
index b78384f..3625f32 100644
--- a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
+++ b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java
@@ -80,9 +80,9 @@ public class MiTuExportScheduledTask {
 //        WeeklyHeavyStockReport();
 //        QuarterlyProductGroupingReport();
 //        customerTypeAnalysis();
-        getBestSell30Days();
+//        getBestSell30Days();
 //        getData();
-        runDailySalesIncentiveStatisticsForPast30Days();
+//        runDailySalesIncentiveStatisticsForPast30Days();
 //        updateProductStock();
 
     }
diff --git a/src/main/java/com/mixi/model/dto/TaskRuleQuery.java b/src/main/java/com/mixi/model/dto/TaskRuleQuery.java
index 3e977d4..49f0fd8 100644
--- a/src/main/java/com/mixi/model/dto/TaskRuleQuery.java
+++ b/src/main/java/com/mixi/model/dto/TaskRuleQuery.java
@@ -10,4 +10,6 @@ public class TaskRuleQuery extends PageQueryBaseVo {
     private String startTime;
 
     private String endTime;
+
+    private String salesmanName;
 }
diff --git a/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java b/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
index bb676bb..b45f56e 100644
--- a/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
+++ b/src/main/java/com/mixi/service/impl/SalesIncentivesServiceImpl.java
@@ -30,6 +30,7 @@ import org.springframework.util.StringUtils;
 import javax.annotation.Resource;
 import java.sql.*;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
@@ -110,6 +111,15 @@ public class SalesIncentivesServiceImpl extends ServiceImpl<TaskRuleMapper, Task
             queryWrapper.le("create_time", taskRuleQuery.getEndTime());
         }
 
+        if (taskRuleQuery.getStartTime() == null && taskRuleQuery.getEndTime() == null) {
+            LocalDateTime oneMonthAgo = LocalDateTime.now().minusMonths(1);
+            queryWrapper.ge("create_time", oneMonthAgo);
+        }
+
+        if (taskRuleQuery.getSalesmanName() != null) {
+            queryWrapper.eq("salesman_name", taskRuleQuery.getSalesmanName());
+        }
+
         queryWrapper.select("salesman_name, SUM(incentive_num) as incentiveNum")
                 .groupBy("salesman_name")
                 .orderByDesc("SUM(incentive_num)");