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> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime, - @RequestParam(required = false) String userName, @RequestParam(required = false) String email) { + @RequestParam(required = false) List 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 designStatistic = designMapper.getDesignStatistic(startTime, endTime, userName, email); + if (!StringUtil.isNullOrEmpty(email)){ + email = email.trim(); + } + List 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 { //返回插入数据后生成的主键 Long insertDesign(Design design); - List getDesignStatistic(String startTime, String endTime, String userName, String email); + List getDesignStatistic(String startTime, String endTime, List 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 @@ and b.create_date not like '%:01' and b.create_date not like '%:02' - - and a.user_name = #{userName} + + and a.id in + + #{id} + - and a.user_email = #{email} + and a.user_email like CONCAT('%', #{email}, '%') GROUP BY b.account_id ORDER BY b.account_id asc) d