From 8a774aa3289951b9c9eac1419a312c42dec156f3 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 21 Aug 2024 15:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=20=E6=8C=89=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E6=88=96=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7design=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/controller/ConvenientInquiryController.java    | 7 +++++--
 src/main/java/com/ai/da/mapper/primary/DesignMapper.java | 2 +-
 src/main/resources/mapper/primary/DesignMapper.xml       | 9 ++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
index c1ff0f2d..7953b74a 100644
--- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
+++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
@@ -52,7 +52,7 @@ public class ConvenientInquiryController {
     @ApiOperation("获取指定时间区间内所有用户design的使用情况")
     @GetMapping("/getDesignStatistic")
     public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime,
-                                                                     @RequestParam(required = false) String userName, @RequestParam(required = false) String email) {
+                                                                     @RequestParam(required = false) List<Long> ids, @RequestParam(required = false) String email) {
         Long accountId = UserContext.getUserHolder().getId();
         if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
             if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00";
@@ -61,7 +61,10 @@ public class ConvenientInquiryController {
                 Date date = new Date();
                 endTime = simpleDateFormat.format(date);
             }
-            List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime, userName, email);
+            if (!StringUtil.isNullOrEmpty(email)){
+                email = email.trim();
+            }
+            List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email);
             return Response.success(designStatistic);
         } else {
             return Response.fail("Sorry, you don't have permission");
diff --git a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
index 7db2a609..ece90931 100644
--- a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
@@ -18,5 +18,5 @@ public interface DesignMapper extends CommonMapper<Design> {
     //返回插入数据后生成的主键
     Long insertDesign(Design design);
 
-    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, String userName, String email);
+    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, List<Long> ids, String email);
 }
diff --git a/src/main/resources/mapper/primary/DesignMapper.xml b/src/main/resources/mapper/primary/DesignMapper.xml
index 0c33c320..5d970145 100644
--- a/src/main/resources/mapper/primary/DesignMapper.xml
+++ b/src/main/resources/mapper/primary/DesignMapper.xml
@@ -39,11 +39,14 @@
         </where>
         and b.create_date not like '%:01'
         and b.create_date not like '%:02'
-        <if test="userName != null and userName != '' ">
-            and a.user_name = #{userName}
+        <if test="ids != null and ids.size() > 0">
+            and a.id in
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
         <if test="email != null and email != '' ">
-            and a.user_email = #{email}
+            and a.user_email like CONCAT('%', #{email}, '%')
         </if>
         GROUP BY b.account_id
         ORDER BY b.account_id asc) d