diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/stats/HallLaborStatsMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/stats/HallLaborStatsMapper.java index d84995396..a6c64a4cb 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/stats/HallLaborStatsMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/stats/HallLaborStatsMapper.java @@ -1,7 +1,12 @@ package com.accompany.admin.mapper.stats; import com.accompany.admin.model.stats.HallLaborStats; +import com.accompany.admin.vo.stats.LaborStatsVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; /** * @author: liaozetao @@ -9,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @description: */ public interface HallLaborStatsMapper extends BaseMapper { + + List getLaborStats(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("erBanNoList") List erBanNoList); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java index a3eaf1706..137dddb12 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java @@ -54,9 +54,7 @@ public class LaborStatsAdminService extends BaseService { List data = new ArrayList<>(); String[] erBanNoArray = erBanNoStr.split(StrUtil.COMMA); Map erBanNoMap = Arrays.stream(erBanNoArray).map(v -> usersService.getUserByErbanNo(Long.valueOf(v))).filter(Objects::nonNull).collect(Collectors.toMap(Users::getErbanNo, Users::getUid, (v1, v2) -> v1)); - List hallLaborStats = hallLaborStatsMapper.selectList(Wrappers.lambdaQuery() - .in(HallLaborStats::getErbanNo, erBanNoArray) - .between(HallLaborStats::getDate, startTime, endTime)); + List hallLaborStats = hallLaborStatsMapper.getLaborStats(startTime, endTime, Arrays.asList(erBanNoArray)); while (DateTimeUtil.compareTime(endTime, dateTime) >= 0) { for (String erBanNo : erBanNoArray) { String dateStr = DateTimeUtil.convertDate(dateTime, DateTimeUtil.DEFAULT_DATE_PATTERN); diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/HallLaborStatsMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/HallLaborStatsMapper.xml index a6ebdd4fa..4d3a8428e 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/HallLaborStatsMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/HallLaborStatsMapper.xml @@ -1,5 +1,13 @@ - + \ No newline at end of file