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/mapper/AssessmentScoreMapper.xml | 139 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 0 deletions(-)
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 3fa78ce..4d980eb 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -6,10 +6,34 @@
<resultMap id="assessmentScoreResultMap" type="org.springblade.modules.assessment.entity.AssessmentScoreEntity">
<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>
+
+ <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"/>
+ <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"/>
@@ -24,6 +48,121 @@
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 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="selectAssessmentScoreInfoV2Page" resultMap="assessmentScoreResultInfoMap">
+ select c.id,a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
+ b.user_name,b.dept_name ,b.post_name,
+
+ <if test="assessmentScore.type != null and assessmentScore.type == 0">
+ c.score_val,c.remark,c.type,a.weight
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 1">
+ d.score_val,d.remark,d.type,a.weight
+ </if>
+ from yw_assessment_set_assessor a
+ LEFT JOIN yw_assessment_set b ON (a.assessment_set_id = b.id)
+ <if test="assessmentScore.type != null and assessmentScore.type == 0">
+ LEFT JOIN yw_assessment_score c ON (a.user_id = c.score_user_id and (b.user_id = c.be_id) and c.is_deleted = 0)
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 1">
+ LEFT JOIN yw_assessment_score d ON (a.user_id = d.score_user_id and (b.dept_id = d.be_id) and d.is_deleted = 0)
+ </if>
+
+ <where>
+ and a.is_deleted = 0
+ <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
+ and b.assessment_task_id = #{assessmentScore.assessmentTaskId}
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 0">
+ and b.user_id is not null
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 1">
+ and b.user_id is null
+ </if>
+ <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
+ and b.user_name like concat('%', #{assessmentScore.userName}, '%')
+ </if>
+ <if test="assessmentScore.scoreUserName != null and assessmentScore.scoreUserName != ''">
+ and a.user_name like concat('%', #{assessmentScore.scoreUserName}, '%')
+ </if>
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
+ and b.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">
+ LEFT JOIN blade_user b on (a.be_id = b.id)
+ left join blade_dept c on b.dept_id = c.id
+ </if>
+ <if test="assessmentScore.type != null and assessmentScore.type == 1">
+ left join blade_dept c on a.be_id = c.id
+ </if>
+
+ <where>
+ and a.is_deleted = 0
+ <if test="assessmentScore.type != null and assessmentScore.type != ''">
+ and a.type = #{assessmentScore.type}
+ </if>
+ <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
+ and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
+ </if>
+ <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
+ and b.name like concat('%', #{assessmentScore.userName},'%')
+ </if>
+ <if test="assessmentScore.deptId != null and assessmentScore.deptId != ''">
+ and c.id = #{assessmentScore.deptId}
+ </if>
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
+ and c.dept_name like concat('%', #{assessmentScore.deptName},'%')
+ </if>
+ </where>
+ group by a.be_id
+ </select>
+
<select id="exportAssessmentScore" resultType="org.springblade.modules.assessment.excel.AssessmentScoreExcel">
SELECT * FROM yw_assessment_score ${ew.customSqlSegment}
--
Gitblit v1.9.3