From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001 From: xieb <vip_xiaobin810@163.com> Date: Tue, 21 Jan 2025 14:55:39 +0800 Subject: [PATCH] 修复 --- src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java b/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java index 3c46760..7a5575f 100644 --- a/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java +++ b/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java @@ -17,13 +17,13 @@ package org.springblade.modules.assessment.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.modules.assessment.entity.AssessmentScoreEntity; -import org.springblade.modules.assessment.vo.AssessmentScoreVO; -import org.springblade.modules.assessment.excel.AssessmentScoreExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.modules.assessment.entity.AssessmentScoreEntity; +import org.springblade.modules.assessment.excel.AssessmentScoreExcel; +import org.springblade.modules.assessment.vo.AssessmentScoreVO; + import java.util.List; -import java.util.Map; /** * 考核评分 服务类 @@ -41,7 +41,8 @@ */ IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore); - IPage<Map> selectAssessmentScoreInfoPage(IPage<Map> page, AssessmentScoreVO assessmentScore); + IPage<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore); + IPage<AssessmentScoreVO> selectAssessmentScoreInfoV2Page(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore); IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore); -- Gitblit v1.9.3