From 2a9bd8779ebb96f2089885736734d7c6ccaaebaa Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 16 Jan 2024 08:45:51 +0800
Subject: [PATCH] 考核评分记录
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml | 62 +++++++++++++++++++++++++++++++
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java | 3 +
src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java | 3 +
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java | 6 +++
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 13 ++++++
5 files changed, 87 insertions(+), 0 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 8b32c9c..c08c85a 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -93,6 +93,19 @@
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
}
+ /**
+ * 考核评分记录列表
+ * @param assessmentScore
+ * @param query
+ * @return
+ */
+ @GetMapping("/listInfo")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入assessmentScore")
+ public R<IPage<Map>> 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) {
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 d97038e..ab51955 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
@@ -24,6 +24,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 考核评分 Mapper 接口
@@ -42,6 +43,8 @@
*/
List<AssessmentScoreVO> selectAssessmentScorePage(IPage page, AssessmentScoreVO assessmentScore);
+ List<Map> 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 7e90a4b..6676162 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -23,11 +23,73 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <resultMap id="assessmentScoreResultInfoMap" type="java.util.Map">
+ <result column="id" property="id"/>
+ <result column="tenant_id" property="tenantId"/>
+ <result column="assessment_task_id" property="assessmentTaskId"/>
+ <result column="be_id" property="beId"/>
+ <result column="score_user_id" property="scoreUserId"/>
+ <result column="score_val" property="scoreVal"/>
+ <result column="remark" property="remark"/>
+ <result column="type" property="type"/>
+ <result column="range_val" property="rangeVal"/>
+ <result column="weight" property="weight"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </resultMap>
+
<select id="selectAssessmentScorePage" resultMap="assessmentScoreResultMap">
select * from yw_assessment_score where is_deleted = 0
</select>
+ <select id="selectAssessmentScoreInfoPage" resultMap="assessmentScoreResultInfoMap">
+ select a.*,b.name as scoreUserName,c.dept_name AS scoreDeptName , d.post_name AS scorePostName ,
+ <if test="assessmentScore.type != null and assessmentScore.type == 0">
+ bb.`name` as userName,cc.dept_name as deptName,dd.post_name as postName
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 1">
+ ccc.dept_name as deptName
+ </if>
+ from yw_assessment_score a
+ LEFT JOIN blade_user b ON (a.create_user = b.id)
+ LEFT JOIN blade_dept c ON (b.dept_id = c.id)
+ LEFT JOIN blade_post d ON (b.post_id = d.id)
+
+ LEFT JOIN blade_user bb ON (a.be_id = bb.id)
+ LEFT JOIN blade_dept cc ON (bb.dept_id = cc.id)
+ LEFT JOIN blade_post dd ON (bb.post_id = dd.id)
+
+ LEFT JOIN blade_dept ccc ON (a.be_id = ccc.id)
+
+ <where>
+ and a.is_deleted = 0
+ <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
+ and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type != ''">
+ and a.type = #{assessmentScore.type}
+ </if>
+ <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
+ and bb.name like concat('%', #{assessmentScore.userName}, '%')
+ </if>
+ <if test="assessmentScore.scoreUserName != null and assessmentScore.scoreUserName != ''">
+ and b.name like concat('%', #{assessmentScore.scoreUserName}, '%')
+ </if>
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 1">
+ and ccc.dept_name like concat('%', #{assessmentScore.deptName}, '%')
+ </if>
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 0">
+ and cc.dept_name like concat('%', #{assessmentScore.deptName}, '%')
+ </if>
+ </where>
+ </select>
+
<select id="selectAssessmentScoreGroupByBeidPage" resultMap="assessmentScoreResultMap">
select a.id,a.assessment_task_id,a.be_id,a.score_user_id,SUM(a.weight*a.score_val*0.01) as score_val,a.type from yw_assessment_score a
<if test="assessmentScore.type != null and assessmentScore.type == 0">
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 875e19e..3c46760 100644
--- a/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java
+++ b/src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java
@@ -23,6 +23,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
+import java.util.Map;
/**
* 考核评分 服务类
@@ -39,6 +40,8 @@
* @return
*/
IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore);
+
+ IPage<Map> selectAssessmentScoreInfoPage(IPage<Map> 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 5b80374..e4d4156 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,6 +28,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 考核评分 服务实现类
@@ -45,6 +46,11 @@
}
@Override
+ public IPage<Map> selectAssessmentScoreInfoPage(IPage<Map> page, AssessmentScoreVO assessmentScore) {
+ return page.setRecords(baseMapper.selectAssessmentScoreInfoPage(page, assessmentScore));
+ }
+
+ @Override
public IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore) {
return page.setRecords(baseMapper.selectAssessmentScoreGroupByBeidPage(page, assessmentScore));
}
--
Gitblit v1.9.3