Merge remote-tracking branch 'origin/master'

zhuo

2024-07-23 5ed5f51d479989d5b2149b09c82b6b3ea495b589

 performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java

@@ -2,10 +2,12 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.PerformanceShift;
import org.springframework.data.repository.query.Param;

import java.util.List;
import java.util.Map;

/**
@@ -18,10 +20,22 @@
 */
public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {

    IPage<Map<String, Object>> performanceShiftPage(
    IPage<PerformanceShiftMapDto> performanceShiftPage(
            Page<Object> page,
            @Param("time") String time,
            @Param("userName") String userName,
            @Param("laboratory") String laboratory
    );

    List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
                                                       @Param("userName") String userName,
                                                       @Param("laboratory") String laboratory);

    IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);

    List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);

    List<PerformanceShiftMapDto> performanceShiftList(String time, String userName, String laboratory);

    String seldepLimsId(int depLimsId);
}