修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 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 != ''">
@@ -90,6 +90,48 @@
        </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">
@@ -101,6 +143,7 @@
        </if>

        <where>
            and a.is_deleted = 0
            <if test="assessmentScore.type != null and assessmentScore.type != ''">
                and a.type = #{assessmentScore.type}
            </if>