From 5334a55d0af7d83516fdf82a7d5f8089d776cb26 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 16 Jan 2024 10:01:04 +0800
Subject: [PATCH] 考核评分记录
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml | 4 ++--
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java | 12 ++++++------
src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java | 10 +++++-----
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java | 3 +--
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 9 ++-------
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
index c08c85a..c0e04d2 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -102,19 +102,14 @@
@GetMapping("/listInfo")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入assessmentScore")
- public R<IPage<Map>> listInfo(AssessmentScoreVO assessmentScore, Query query) {
+ public R<IPage<AssessmentScoreVO>> listInfo(AssessmentScoreVO assessmentScore, Query query) {
return R.data(assessmentScoreService.selectAssessmentScoreInfoPage(Condition.getPage(query), assessmentScore));
}
@GetMapping("/listGroupByTask/{type}/{taskId}")
@ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query, AssessmentScoreVO assessmentScore) {
-// QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
-// setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
-// setEntityQueryWrapper.eq("type", type);
-// setEntityQueryWrapper.eq("assessment_task_id",taskId);
-// setEntityQueryWrapper.groupBy("be_id");
-// IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
+
assessmentScore.setType(type);
assessmentScore.setAssessmentTaskId(taskId);
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
index ab51955..7b29466 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
@@ -16,15 +16,15 @@
*/
package org.springblade.modules.assessment.mapper;
-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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+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;
/**
* 考核评分 Mapper 接口
@@ -43,7 +43,7 @@
*/
List<AssessmentScoreVO> selectAssessmentScorePage(IPage page, AssessmentScoreVO assessmentScore);
- List<Map> selectAssessmentScoreInfoPage(IPage page, AssessmentScoreVO assessmentScore);
+ List<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage page, AssessmentScoreVO assessmentScore);
List<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage page, AssessmentScoreVO assessmentScore);
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
index a3bef2c..41981e3 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -23,7 +23,7 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
- <resultMap id="assessmentScoreResultInfoMap" type="java.util.Map">
+ <resultMap id="assessmentScoreResultInfoMap" type="org.springblade.modules.assessment.vo.AssessmentScoreVO">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="assessment_task_id" property="assessmentTaskId"/>
@@ -72,7 +72,7 @@
<if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
</if>
- <if test="assessmentScore.type != null and assessmentScore.type != ''">
+ <if test="assessmentScore.type != null">
and a.type = #{assessmentScore.type}
</if>
<if test="assessmentScore.userName != null and assessmentScore.userName != ''">
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..174e945 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,7 @@
*/
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<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore);
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
index e4d4156..72a5213 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
@@ -28,7 +28,6 @@
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Map;
/**
* 考核评分 服务实现类
@@ -46,7 +45,7 @@
}
@Override
- public IPage<Map> selectAssessmentScoreInfoPage(IPage<Map> page, AssessmentScoreVO assessmentScore) {
+ public IPage<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
return page.setRecords(baseMapper.selectAssessmentScoreInfoPage(page, assessmentScore));
}
--
Gitblit v1.9.3