From dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 24 十二月 2024 17:03:21 +0800 Subject: [PATCH] 完成截止12.24测试出来的问题 --- performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java index b94f040..a947cdb 100644 --- a/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java +++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java @@ -3,14 +3,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yuanchu.mom.dto.AuxiliaryOriginalHoursDto; -import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto; -import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto; import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -24,13 +20,13 @@ */ public interface AuxiliaryOutputWorkingHoursMapper extends BaseMapper<AuxiliaryOutputWorkingHours> { - IPage<AuxiliaryOutputWorkingHoursDto> selectAuxiliaryOutputWorkingHours(Page page, @Param("ew") QueryWrapper<AuxiliaryOutputWorkingHoursDto> ew, @Param("ids") List<Integer> ids); + IPage<AuxiliaryOutputWorkingHours> selectAuxiliaryOutputWorkingHours(Page page, @Param("ew") QueryWrapper<AuxiliaryOutputWorkingHours> ew, @Param("ids") List<Integer> ids); //鏌ヨ缁熻宸ユ椂瀵煎嚭鏁版嵁 - List<AuxiliaryOutputWorkingHoursDto> selectDataByUser(@Param("ids") List<Integer> ids); + List<AuxiliaryOutputWorkingHours> selectDataByUser(@Param("ids") List<Integer> ids); //鏌ヨ璇ユ湀鐨勪骇閲忓伐鏃� - List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids); + List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids, @Param("type") String type); List<AuxiliaryOutputWorkingHours> selectListByIds(@Param("ids") List<Integer> ids); -- Gitblit v1.9.3